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

diff --git a/7f/bc205bbd89e1246bef8d070f284640c5869f1b b/7f/bc205bbd89e1246bef8d070f284640c5869f1b
new file mode 100644 (file)
index 0000000..8ecf8e6
--- /dev/null
+++ b/7f/bc205bbd89e1246bef8d070f284640c5869f1b
@@ -0,0 +1,115 @@
+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 C355A431FD9\r
+       for <notmuch@notmuchmail.org>; Mon,  7 Oct 2013 15:33:37 -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 pQo5jkoNx0sv for <notmuch@notmuchmail.org>;\r
+       Mon,  7 Oct 2013 15:33:33 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-4.mit.edu (dmz-mailsec-scanner-4.mit.edu\r
+       [18.9.25.15])\r
+       by olra.theworths.org (Postfix) with ESMTP id DB1F9431FB6\r
+       for <notmuch@notmuchmail.org>; Mon,  7 Oct 2013 15:33:29 -0700 (PDT)\r
+X-AuditID: 1209190f-b7fa08e0000009c6-84-525336b7331f\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+       by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 1C.4B.02502.7B633525; Mon,  7 Oct 2013 18:33:27 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+       by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id r97MXPLE024732; \r
+       Mon, 7 Oct 2013 18:33:26 -0400\r
+Received: from drake.dyndns.org (26-4-172.dynamic.csail.mit.edu [18.26.4.172])\r
+       (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 r97MXNWt028498\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Mon, 7 Oct 2013 18:33:25 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1VTJMh-0006bh-Iw; Mon, 07 Oct 2013 18:33:23 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 01/11] schemata: Disambiguate non-terminal names\r
+Date: Mon,  7 Oct 2013 18:33:11 -0400\r
+Message-Id: <1381185201-25197-2-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.8.4.rc3\r
+In-Reply-To: <1381185201-25197-1-git-send-email-amdragon@mit.edu>\r
+References: <1381185201-25197-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsUixG6nrrvdLDjIYNZdTYvrN2cyOzB6PFt1\r
+       izmAMYrLJiU1J7MstUjfLoEr4+6ylIIfHBV7b3WzNTBOYe9i5OSQEDCRuH37CyuELSZx4d56\r
+       ti5GLg4hgX2MEivnLGaHcDYwSsxvvsgI4Rxmktg37xMrhDOXUeL8i8fMIP1sAhoS2/YvZwSx\r
+       RQSkJXbenQ1UxMHBLKAm8adLBSQsLOAgsWH5LiYQm0VAVWLG3q8sIDYvUPzVl5tsEGcoSSw8\r
+       tQ3sJE4BR4klGy+CxYWAaubuX8Q6gZF/ASPDKkbZlNwq3dzEzJzi1GTd4uTEvLzUIl0TvdzM\r
+       Er3UlNJNjKCg4ZTk38H47aDSIUYBDkYlHt6Mo0FBQqyJZcWVuYcYJTmYlER5z5gGBwnxJeWn\r
+       VGYkFmfEF5XmpBYfYpTgYFYS4RUwAsrxpiRWVqUW5cOkpDlYlMR5b3LYBwkJpCeWpGanphak\r
+       FsFkZTg4lCR4w0CGChalpqdWpGXmlCCkmTg4QYbzAA1PBqnhLS5IzC3OTIfIn2JUlBLnnQ2S\r
+       EABJZJTmwfXCovoVozjQK8K8W0GqeIAJAa77FdBgJqDBuuyBIINLEhFSUg2MjDPrVgq+/8mm\r
+       7Tf3F6+I6yELhlvnMoVqd/rfW53BXzT9gsvhY98PNSktbg6fu+j7thqPm7yCyofvm0wJ/pxU\r
+       3PrP4Xv7E8MlMmbrPFfEv/rZkrBEMuTk1PPqX8MmNh3o88gRc7p0eKe5vWiEqvFOk2MJ7XO/\r
+       /96UcuxJbNEKsxOR50vuWd2/qcRSnJFoqMVcVJwIANEG9QLFAgAA\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: Mon, 07 Oct 2013 22:33:38 -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