[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 9/9] qapi.py: Permit comments starting anywhere o
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 9/9] qapi.py: Permit comments starting anywhere on the line |
Date: |
Sat, 27 Jul 2013 17:42:01 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
scripts/qapi.py | 3 +--
tests/qapi-schema/comments.err | 1 -
tests/qapi-schema/comments.exit | 2 +-
tests/qapi-schema/comments.out | 3 +++
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/scripts/qapi.py b/scripts/qapi.py
index f64b7b2..0ebea94 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -68,13 +68,12 @@ class QAPISchema:
def accept(self):
while True:
- bol = self.cursor == 0 or self.src[self.cursor-1] == '\n'
self.tok = self.src[self.cursor]
self.pos = self.cursor
self.cursor += 1
self.val = None
- if self.tok == '#' and bol:
+ if self.tok == '#':
self.cursor = self.src.find('\n', self.cursor)
elif self.tok in ['{', '}', ':', ',', '[', ']']:
return
diff --git a/tests/qapi-schema/comments.err b/tests/qapi-schema/comments.err
index 4a82b26..e69de29 100644
--- a/tests/qapi-schema/comments.err
+++ b/tests/qapi-schema/comments.err
@@ -1 +0,0 @@
-<stdin>:2:33: Stray "#"
diff --git a/tests/qapi-schema/comments.exit b/tests/qapi-schema/comments.exit
index d00491f..573541a 100644
--- a/tests/qapi-schema/comments.exit
+++ b/tests/qapi-schema/comments.exit
@@ -1 +1 @@
-1
+0
diff --git a/tests/qapi-schema/comments.out b/tests/qapi-schema/comments.out
index e69de29..e3bd904 100644
--- a/tests/qapi-schema/comments.out
+++ b/tests/qapi-schema/comments.out
@@ -0,0 +1,3 @@
+[OrderedDict([('enum', 'Status'), ('data', ['good', 'bad', 'ugly'])])]
+['Status']
+[]
--
1.7.11.7
- [Qemu-devel] [PATCH v2 0/9] Our QAPI parser is a hack, replace it, Markus Armbruster, 2013/07/27
- [Qemu-devel] [PATCH v2 7/9] qapi.py: Fix diagnosing non-objects at a schema's top-level, Markus Armbruster, 2013/07/27
- [Qemu-devel] [PATCH v2 8/9] qapi.py: Rename expr_eval to expr in parse_schema(), Markus Armbruster, 2013/07/27
- [Qemu-devel] [PATCH v2 3/9] qapi.py: Restructure lexer and parser, Markus Armbruster, 2013/07/27
- [Qemu-devel] [PATCH v2 9/9] qapi.py: Permit comments starting anywhere on the line,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 2/9] tests: Use qapi-schema-test.json as schema parser test, Markus Armbruster, 2013/07/27
- [Qemu-devel] [PATCH v2 5/9] qapi.py: Reject invalid characters in schema file, Markus Armbruster, 2013/07/27
- [Qemu-devel] [PATCH v2 1/9] tests: QAPI schema parser tests, Markus Armbruster, 2013/07/27
- [Qemu-devel] [PATCH v2 6/9] qapi.py: Fix schema parser to check syntax systematically, Markus Armbruster, 2013/07/27
- [Qemu-devel] [PATCH v2 4/9] qapi.py: Decent syntax error reporting, Markus Armbruster, 2013/07/27
- Re: [Qemu-devel] [PATCH v2 0/9] Our QAPI parser is a hack, replace it, Anthony Liguori, 2013/07/29