From 0e92a19b8c3b269dee377b76898c8bd7cadc1273 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 24 Feb 2021 11:14:42 +0100 Subject: qapi: Fix parse errors for removal of null from schema language 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 Message-Id: <20210224101442.1837475-1-armbru@redhat.com> Reviewed-by: Eric Blake Reviewed-by: John Snow --- scripts/qapi/parser.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts/qapi/parser.py') diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py index e7b9d670ad..116afe549a 100644 --- a/scripts/qapi/parser.py +++ b/scripts/qapi/parser.py @@ -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): -- cgit v1.2.3