From patchwork Tue Aug 14 16:27:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 177390 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6E0B92C0081 for ; Wed, 15 Aug 2012 03:17:21 +1000 (EST) Received: from localhost ([::1]:39686 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1K0H-00034I-Kk for incoming@patchwork.ozlabs.org; Tue, 14 Aug 2012 12:30:01 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=mUzPa0p5dxFg7mXVRkXQlbuqNsmndSLuStzTJ1nKbFI=; b=EtDjoezLBkyxyZL5qf3wbQ7BMoLaPnwoX4wCEZqzQJIZkD0U++srwE5B7cFq4181Ys aW2EKa4b/g36ZSPlx4laYgzb2qWoUh45u7mtb5pKEvDcSmKscgF1wrkQmQrP80Pemc+l 4PJzptit5vS9Z+1zPFNw4f42AskL8AvbHfvSt3yFw0z1/lSpAyu2Z/Zr6OXek9lWV7OG eUe9WWwpvFzAF2HdFAsB6gPe1GsH9UEh0KJ67AfwEP6gcUXerDJ12uWAdOQHd7cbpGug vahTauyDVuEXRYg+qsA8SjAYy1EthLo0/VZXVz8RVtOswV124V+0xALKq1ULf17wDgfW K7aw== Received: by 10.50.213.104 with SMTP id nr8mr12621411igc.25.1344961714362; Tue, 14 Aug 2012 09:28:34 -0700 (PDT) Received: from loki.morrigu.org (cpe-72-179-62-111.austin.res.rr.com. [72.179.62.111]) by mx.google.com with ESMTPS id ul4sm11903203igb.15.2012.08.14.09.28.33 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 14 Aug 2012 09:28:33 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 14 Aug 2012 11:27:17 -0500 Message-Id: <1344961646-21194-12-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 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> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.173 Cc: blauwirbel@gmail.com, aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 11/20] qapi: qapi.py, make json parser more robust X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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)