diff options
| -rw-r--r-- | scripts/qapi.py | 3 | ||||
| -rw-r--r-- | tests/qapi-schema/comments.err | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/comments.exit | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/comments.out | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/scripts/qapi.py b/scripts/qapi.py index f64b7b26f8..0ebea945bb 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 4a82b26d0f..e69de29bb2 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 d00491fd7e..573541ac97 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 e69de29bb2..e3bd904453 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'] +[] |