[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for 2.9 49/49] qapi: Fix a misleading parser error me
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL for 2.9 49/49] qapi: Fix a misleading parser error message |
Date: |
Thu, 16 Mar 2017 07:28:05 +0100 |
When choking on a token where an expression is expected, we report
'Expected "{", "[" or string'. Close, but no cigar. Fix it to
Expected '"{", "[", string, boolean or "null"'.
Missed in commit e53188a.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
---
scripts/qapi.py | 3 ++-
tests/qapi-schema/trailing-comma-list.err | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/scripts/qapi.py b/scripts/qapi.py
index d19300d..e88c047 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -519,7 +519,8 @@ class QAPISchemaParser(object):
expr = self.val
self.accept()
else:
- raise QAPIParseError(self, 'Expected "{", "[" or string')
+ raise QAPIParseError(self, 'Expected "{", "[", string, '
+ 'boolean or "null"')
return expr
def get_doc(self, info):
diff --git a/tests/qapi-schema/trailing-comma-list.err
b/tests/qapi-schema/trailing-comma-list.err
index 24c24b0..212e14a 100644
--- a/tests/qapi-schema/trailing-comma-list.err
+++ b/tests/qapi-schema/trailing-comma-list.err
@@ -1 +1 @@
-tests/qapi-schema/trailing-comma-list.json:2:36: Expected "{", "[" or string
+tests/qapi-schema/trailing-comma-list.json:2:36: Expected "{", "[", string,
boolean or "null"
--
2.7.4
- [Qemu-devel] [PULL for 2.9 36/49] qapi: Move empty doc section checking to doc parser, (continued)
- [Qemu-devel] [PULL for 2.9 36/49] qapi: Move empty doc section checking to doc parser, Markus Armbruster, 2017/03/16
- [Qemu-devel] [PULL for 2.9 42/49] qapi: Simplify what gets stored in enum_types, Markus Armbruster, 2017/03/16
- [Qemu-devel] [PULL for 2.9 34/49] qapi: Move detection of doc / expression name mismatch, Markus Armbruster, 2017/03/16
- [Qemu-devel] [PULL for 2.9 46/49] qapi: union_types is a list used like a dict, make it one, Markus Armbruster, 2017/03/16
- [Qemu-devel] [PULL for 2.9 45/49] qapi: struct_types is a list used like a dict, make it one, Markus Armbruster, 2017/03/16
- [Qemu-devel] [PULL for 2.9 38/49] tests/qapi-schema: Improve coverage of bogus member docs, Markus Armbruster, 2017/03/16
- [Qemu-devel] [PULL for 2.9 16/49] qapi: Prepare for requiring more complete documentation, Markus Armbruster, 2017/03/16
- [Qemu-devel] [PULL for 2.9 44/49] qapi: enum_types is a list used like a dict, make it one, Markus Armbruster, 2017/03/16
- [Qemu-devel] [PULL for 2.9 43/49] qapi: Factor add_name() calls out of the meta conditional, Markus Armbruster, 2017/03/16
- [Qemu-devel] [PULL for 2.9 28/49] qapi2texi: Generate reference to base type members, Markus Armbruster, 2017/03/16
- [Qemu-devel] [PULL for 2.9 49/49] qapi: Fix a misleading parser error message,
Markus Armbruster <=
- [Qemu-devel] [PULL for 2.9 47/49] qapi: Drop unused .check_clash() parameter schema, Markus Armbruster, 2017/03/16
- [Qemu-devel] [PULL for 2.9 37/49] tests/qapi-schema: Rename doc-bad-args to doc-bad-command-arg, Markus Armbruster, 2017/03/16
- [Qemu-devel] [PULL for 2.9 05/49] qapi: Back out doc comments added just to please qapi.py, Markus Armbruster, 2017/03/16
- [Qemu-devel] [PULL for 2.9 19/49] qapi: The #optional tag is redundant, drop, Markus Armbruster, 2017/03/16
- Re: [Qemu-devel] [PULL for 2.9 00/49] QAPI patches for 2017-03-16, Peter Maydell, 2017/03/16