From patchwork Thu Jul 26 17:09:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: fixup! qapi: qapi.py: allow the "'" character be escaped From: Markus Armbruster X-Patchwork-Id: 173471 Message-Id: <87boj2o3eu.fsf_-_@blackfin.pond.sub.org> To: Luiz Capitulino Cc: Peter Maydell , aliguori@us.ibm.com, pbonzini@redhat.com, qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com Date: Thu, 26 Jul 2012 19:09:13 +0200 Support escaping the escape character, and make more robust (don't die for '', handle ' without matching '. Signed-off-by: Markus Armbruster Reviewed-by: Peter Maydell --- Luiz made me do this. Fixes up his 07/11. Generates identical qmp-commands.h qapi-types.h qapi-visit.h qapi-errors.h tests/test-qapi-types.h tests/test-qapi-visit.h tests/test-qmp-commands.h qapi-generated/qga-qapi-types.h qapi-generated/qga-qapi-visit.h qapi-generated/qga-qmp-commands.h scripts/qapi.py | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 9aa518f..169ea78 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -13,20 +13,29 @@ from ordereddict import OrderedDict def tokenize(data): while len(data): - if data[0] in ['{', '}', ':', ',', '[', ']']: - yield data[0] - data = data[1:] - elif data[0] in ' \n': - data = data[1:] - elif data[0] == "'": - data = data[1:] + ch = data[0] + data = data[1:] + if ch in ['{', '}', ':', ',', '[', ']']: + yield ch + elif ch in ' \n': + None + elif ch == "'": string = '' + esc = False while True: - if data[0] == "'" and string[len(string)-1] != "\\": - break - string += data[0] + if (data == ''): + raise Exception("Mismatched quotes") + ch = data[0] data = data[1:] - data = data[1:] + if esc: + string += ch + esc = False + elif ch == "\\": + esc = True + elif ch == "'": + break + else: + string += ch yield string def parse(tokens):