From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:43893) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1Jyv-0000gs-J5 for qemu-devel@nongnu.org; Tue, 14 Aug 2012 12:28:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1Jys-0006Rc-UN for qemu-devel@nongnu.org; Tue, 14 Aug 2012 12:28:37 -0400 Received: from mail-gh0-f173.google.com ([209.85.160.173]:52838) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1Jys-0006Ne-PX for qemu-devel@nongnu.org; Tue, 14 Aug 2012 12:28:34 -0400 Received: by mail-gh0-f173.google.com with SMTP id r17so662832ghr.4 for ; Tue, 14 Aug 2012 09:28:34 -0700 (PDT) Sender: fluxion From: Michael Roth Date: Tue, 14 Aug 2012 11:27:17 -0500 Message-Id: <1344961646-21194-12-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1344961646-21194-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1344961646-21194-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 11/20] qapi: qapi.py, make json parser more robust List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, aliguori@us.ibm.com Currently the QAPI JSON parser expects a very particular style of code indentation, the major one being that terminating curly/square brackets are not on placed on a seperate line. This is incompatible with most pretty-print formats, so make it a little more robust by supporting these cases. Signed-off-by: Michael Roth --- scripts/qapi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index a347203..47cd672 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -81,7 +81,7 @@ def parse_schema(fp): if line.startswith('#') or line == '\n': continue - if line.startswith(' '): + if line[0] in ['}', ']', ' ', '\t']: expr += line elif expr: expr_eval = evaluate(expr) -- 1.7.9.5