[PATCH v2 01/11] schemata: Disambiguate non-terminal names

diff --git a/36/3dd9e4a0cbffe07d986ccd2e63a2222e02a850 b/36/3dd9e4a0cbffe07d986ccd2e63a2222e02a850
new file mode 100644 (file)
index 0000000..c7c3866
--- /dev/null
+++ b/36/3dd9e4a0cbffe07d986ccd2e63a2222e02a850
@@ -0,0 +1,116 @@
+Return-Path: <amdragon@mit.edu>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id E7CB9421178\r
+       for <notmuch@notmuchmail.org>; Thu, 24 Oct 2013 08:19:54 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id SP7S6ayBnwF4 for <notmuch@notmuchmail.org>;\r
+       Thu, 24 Oct 2013 08:19:50 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-5.mit.edu (dmz-mailsec-scanner-5.mit.edu\r
+       [18.7.68.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 57CB6429E51\r
+       for <notmuch@notmuchmail.org>; Thu, 24 Oct 2013 08:19:27 -0700 (PDT)\r
+X-AuditID: 12074422-b7f5a8e000000a34-07-52693a7ffb12\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 30.66.02612.F7A39625; Thu, 24 Oct 2013 11:19:27 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+       by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id r9OFJFK4012679; \r
+       Thu, 24 Oct 2013 11:19:15 -0400\r
+Received: from drake.dyndns.org\r
+       (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [216.15.114.40]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r9OFJCv4012908\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Thu, 24 Oct 2013 11:19:14 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1VZMgq-0006dj-La; Thu, 24 Oct 2013 11:19:12 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 01/11] schemata: Disambiguate non-terminal names\r
+Date: Thu, 24 Oct 2013 11:19:01 -0400\r
+Message-Id: <1382627951-25252-2-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.8.4.rc3\r
+In-Reply-To: <1382627951-25252-1-git-send-email-amdragon@mit.edu>\r
+References: <1382627951-25252-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFjrCIsWRmVeSWpSXmKPExsUixCmqrFtvlRlksGI+l0XTdGeL1XN5LK7f\r
+       nMnswOyxc9Zddo9b91+zezxbdYs5gDmKyyYlNSezLLVI3y6BK+PuspSCHxwVe291szUwTmHv\r
+       YuTkkBAwkZh99TMLhC0mceHeerYuRi4OIYF9jBItJxczQzgbGSUeLXsHlbnDJPHg+HZWCGcu\r
+       o8T9xsuMIP1sAhoS2/YvB7NFBKQldt6dzQpiMwtESxy5PIMNxBYWcJbo7/0NZHNwsAioSszs\r
+       KwIJ8wo4SKzq/cQMcYaSxMJT28BaOQUcJX6+vgY2Ugio5tfvMywTGPkXMDKsYpRNya3SzU3M\r
+       zClOTdYtTk7My0st0jXVy80s0UtNKd3ECAosdhelHYw/DyodYhTgYFTi4dX4kB4kxJpYVlyZ\r
+       e4hRkoNJSZT3nmlmkBBfUn5KZUZicUZ8UWlOavEhRgkOZiUR3ml6QDnelMTKqtSifJiUNAeL\r
+       kjjvLQ77ICGB9MSS1OzU1ILUIpisDAeHkgSvvyVQo2BRanpqRVpmTglCmomDE2Q4D9DwdJAa\r
+       3uKCxNzizHSI/ClGRSlx3iSQhABIIqM0D64XFvmvGMWBXhHmLQep4gEmDbjuV0CDmYAGT1mS\r
+       BjK4JBEhJdXAyDf/wnsd6x+RM0Piv/74rXpux9EnPPZzFLKWLPcUUfN4295oKmgWsZD3zE37\r
+       W5cL30ScKlxbxH/E9PIyH6/NWy/xeinZvJle+8KlzFroaFn2j0OtjK99Zx/K+il54XbaiYoN\r
+       k28LGb/9u+n5TI2X3OuZvNV7M16yFJ66L+I8R9Pv7/qybUfDKpVYijMSDbWYi4oTAQ2CeWzX        AgAA\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 24 Oct 2013 15:19:55 -0000\r
+\r
+Previously, the show schema and the search schema used different\r
+"thread" non-terminals.  While these schemata don't interact, this is\r
+still confusing, so rename search's "thread" to "thread_summary".  To\r
+further limit confusion, prefix all top-level search non-terminals now\r
+begin with "search_".\r
+---\r
+ devel/schemata | 12 ++++++------\r
+ 1 file changed, 6 insertions(+), 6 deletions(-)\r
+\r
+diff --git a/devel/schemata b/devel/schemata\r
+index 2405756..cdd0e43 100644\r
+--- a/devel/schemata\r
++++ b/devel/schemata\r
+@@ -122,21 +122,21 @@ notmuch search schema\r
+ ---------------------\r
+ \r
+ # --output=summary\r
+-summary = [thread*]\r
++search_summary = [thread_summary*]\r
+ \r
+ # --output=threads\r
+-threads = [threadid*]\r
++search_threads = [threadid*]\r
+ \r
+ # --output=messages\r
+-messages = [messageid*]\r
++search_messages = [messageid*]\r
+ \r
+ # --output=files\r
+-files = [string*]\r
++search_files = [string*]\r
+ \r
+ # --output=tags\r
+-tags = [string*]\r
++search_tags = [string*]\r
+ \r
+-thread = {\r
++thread_summary = {\r
+     thread:         threadid,\r
+     timestamp:      unix_time,\r
+     date_relative:  string,   # user-friendly timestamp\r
+-- \r
+1.8.4.rc3\r
+\r