OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qapi: Fix parse errors for removal of null from schema language

Browse Source 
Commit 9d55380b5a "qapi: Remove null from schema language" (v4.2.0)
neglected to update two error messages.  Do that now.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210224101442.1837475-1-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
This commit is contained in:
Markus Armbruster 2021-02-24 11:14:42 +01:00
parent a0e61807a3
commit 0e92a19b8c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/qapi/parser.py
View File

@ -236,9 +236,9 @@ class QAPISchemaParser:
if self.tok == ']':
self.accept()
return expr
if self.tok not in "{['tfn":
if self.tok not in "{['tf":
raise QAPIParseError(
self, "expected '{', '[', ']', string, boolean or 'null'")
self, "expected '{', '[', ']', string, or boolean")
while True:
expr.append(self.get_expr(True))
if self.tok == ']':
@ -257,12 +257,12 @@ class QAPISchemaParser:
elif self.tok == '[':
self.accept()
expr = self.get_values()
elif self.tok in "'tfn":
elif self.tok in "'tf":
expr = self.val
self.accept()
else:
raise QAPIParseError(
self, "expected '{', '[', string, boolean or 'null'")
self, "expected '{', '[', string, or boolean")
return expr
def get_doc(self, info):

2
tests/qapi-schema/leading-comma-list.err
View File

@ -1 +1 @@
leading-comma-list.json:2:13: expected '{', '[', ']', string, boolean or 'null'
leading-comma-list.json:2:13: expected '{', '[', ']', string, or boolean

2
tests/qapi-schema/trailing-comma-list.err
View File

@ -1 +1 @@
trailing-comma-list.json:2:36: expected '{', '[', string, boolean or 'null'
trailing-comma-list.json:2:36: expected '{', '[', string, or boolean