[PATCH v8 0/3] notmuch-search: Structured Output Formatters

diff --git a/f6/7966c03d61e794697c402d38ec9270cc5ea3b7 b/f6/7966c03d61e794697c402d38ec9270cc5ea3b7
new file mode 100644 (file)
index 0000000..00cfe93
--- /dev/null
+++ b/f6/7966c03d61e794697c402d38ec9270cc5ea3b7
@@ -0,0 +1,101 @@
+Return-Path: <craven@gmx.net>\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 5F126431FC2\r
+       for <notmuch@notmuchmail.org>; Mon, 23 Jul 2012 03:38:27 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.001\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.001 tagged_above=-999 required=5\r
+       tests=[FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001]\r
+       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 aRn3L2cOB2XY for <notmuch@notmuchmail.org>;\r
+       Mon, 23 Jul 2012 03:38:25 -0700 (PDT)\r
+Received: from mailout-de.gmx.net (mailout-de.gmx.net [213.165.64.23])\r
+       by olra.theworths.org (Postfix) with SMTP id 30DEC431FC4\r
+       for <notmuch@notmuchmail.org>; Mon, 23 Jul 2012 03:38:22 -0700 (PDT)\r
+Received: (qmail invoked by alias); 23 Jul 2012 10:38:16 -0000\r
+Received: from gw.arelion.cust.net.lagis.at (EHLO dodekanex.arelion.at)\r
+       [83.164.197.182]\r
+       by mail.gmx.net (mp031) with SMTP; 23 Jul 2012 12:38:16 +0200\r
+X-Authenticated: #201305\r
+X-Provags-ID: V01U2FsdGVkX18W3nk9VzAWOkyRZ7d2BH0dr/pOH/nDBARUmc1+LB\r
+       SUC1rmGoyyXjs4\r
+Received: by dodekanex.arelion.at (Postfix, from userid 1000)\r
+       id 91B323034D3; Mon, 23 Jul 2012 12:39:50 +0200 (CEST)\r
+From: craven@gmx.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v8 0/3] notmuch-search: Structured Output Formatters\r
+Date: Mon, 23 Jul 2012 12:39:43 +0200\r
+Message-Id: <1343039986-2732-1-git-send-email-craven@gmx.net>\r
+X-Mailer: git-send-email 1.7.11.2\r
+X-Y-GMX-Trusted: 0\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, 23 Jul 2012 10:38:27 -0000\r
+\r
+From: <craven@gmx.net>\r
+\r
+Currently there is no easy way to add support for different structured\r
+formatters (like JSON). For example, adding support for S-Expressions\r
+would result in code duplication.\r
+\r
+This patch series amends the situation by introducing structured\r
+formatters, which allow different implementations of structures like\r
+lists, maps, strings and numbers.\r
+\r
+The new code in sprinter.h and sprinter-json.c can be used instead of\r
+the current ad-hoc output in all parts of notmuch, a patch for\r
+notmuch-search.c is included.\r
+\r
+In a later patch, all other parts of notmuch should be adapted to the\r
+structured formatters, and the creation of formatters should be\r
+centralised (to make adding new formatters easier).\r
+\r
+A "structured" formatter is provided for notmuch-search that prints the\r
+current text format. This removes almost all the special-casing from\r
+notmuch-search.c.\r
+\r
+Changes versus v7 of this patch:\r
+- added {} around "else" blocks (as mentioned in\r
+  id:20120722160843.GC31834@mit.edu)\r
+- added fallback to INTERNAL_ERROR (which should never be called) in\r
+  notmuch-search.c if format is unknown (as mentioned in\r
+  id:m2r4s694ly.fsf@guru.guru-group.fi).\r
+\r
+Summary: \r
+\r
+Peter Feigl (3):\r
+  Add support for structured output formatters.\r
+  Add structured output formatter for JSON and plain text (but don't\r
+    use them yet).\r
+  Use the structured formatters in notmuch-search.c.\r
+\r
+ Makefile.local   |   2 +\r
+ notmuch-search.c | 304 ++++++++++++++---------------------------------\r
+ sprinter-json.c  | 187 +++++++++++++++++++++++++++++\r
+ sprinter-text.c  | 126 ++++++++++++++++++++\r
+ sprinter.h       |  68 +++++++++++\r
+ test/json        |  34 +++---\r
+ 6 files changed, 489 insertions(+), 232 deletions(-)\r
+ create mode 100644 sprinter-json.c\r
+ create mode 100644 sprinter-text.c\r
+ create mode 100644 sprinter.h\r
+\r
+-- \r
+1.7.11.2\r
+\r