From patchwork Fri Oct 12 21:10:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v4,14/26] qapi: qapi.py, make json parser more robust Date: Fri, 12 Oct 2012 11:10:56 -0000 From: Michael Roth X-Patchwork-Id: 191240 Message-Id: <1350076268-18461-15-git-send-email-mdroth@linux.vnet.ibm.com> To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, aliguori@us.ibm.com, blauwirbel@gmail.com, pbonzini@redhat.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. Also add support for parsing numerical fields. Currently they are ignored. QIDL will make use of both of these changes with the schemas it generates. Reviewed-by: Paolo Bonzini Signed-off-by: Michael Roth --- scripts/qapi.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 555d823..333f375 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -37,6 +37,12 @@ def tokenize(data): else: string += ch yield string + elif ch.isdigit(): + number = ch + while data[0].isdigit(): + number += data[0] + data = data[1:] + yield number def parse(tokens): if tokens[0] == '{': @@ -81,7 +87,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)