From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46583) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SxKxV-0006BL-W5 for qemu-devel@nongnu.org; Fri, 03 Aug 2012 12:42:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SxKxK-0002S3-JZ for qemu-devel@nongnu.org; Fri, 03 Aug 2012 12:42:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48098) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SxKxK-0002Rp-Aa for qemu-devel@nongnu.org; Fri, 03 Aug 2012 12:42:30 -0400 From: Luiz Capitulino Date: Fri, 3 Aug 2012 13:42:55 -0300 Message-Id: <1344012178-21084-2-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1344012178-21084-1-git-send-email-lcapitulino@redhat.com> References: <1344012178-21084-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 1/4] qapi: qapi.py: allow the "'" character to be escaped List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@us.ibm.com Cc: qemu-devel@nongnu.org, Markus Armbruster 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 Signed-off-by: Luiz Capitulino --- scripts/qapi.py | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 8082af3..d3b8b4d 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -13,18 +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 = '' - while data[0] != "'": - string += data[0] + esc = False + while True: + 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): -- 1.7.11.2.249.g31c7954.dirty