[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.9 47/47] qapi: Fix a misleading parser error m
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH for-2.9 47/47] qapi: Fix a misleading parser error message |
Date: |
Mon, 13 Mar 2017 07:18:47 +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>
---
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 a4bf1ea..1dc33c9 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -514,7 +514,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
- Re: [Qemu-devel] [PATCH for-2.9 25/47] qapi2texi: Include member type in generated documentation, (continued)
- [Qemu-devel] [PATCH for-2.9 15/47] qapi: Conjure up QAPIDoc.ArgSection for undocumented members, Markus Armbruster, 2017/03/13
- [Qemu-devel] [PATCH for-2.9 16/47] qapi2texi: Convert to QAPISchemaVisitor, Markus Armbruster, 2017/03/13
- [Qemu-devel] [PATCH for-2.9 30/47] tests/qapi-schema: Improve doc / expression mismatch coverage, Markus Armbruster, 2017/03/13
- [Qemu-devel] [PATCH for-2.9 47/47] qapi: Fix a misleading parser error message,
Markus Armbruster <=
- [Qemu-devel] [PATCH for-2.9 32/47] qapi: Move detection of doc / expression name mismatch, Markus Armbruster, 2017/03/13
- [Qemu-devel] [PATCH for-2.9 40/47] qapi: Simplify what gets stored in enum_types, Markus Armbruster, 2017/03/13
- [Qemu-devel] [PATCH for-2.9 33/47] qapi: Improve error message on @NAME: in free-form doc, Markus Armbruster, 2017/03/13
- [Qemu-devel] [PATCH for-2.9 43/47] qapi: struct_types is a list used like a dict, make it one, Markus Armbruster, 2017/03/13