Commit 012b126d authored by Markus Armbruster's avatar Markus Armbruster
Browse files

qapi: Fix a misleading parser error message 



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 e53188ad.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-Id: <1489582656-31133-48-git-send-email-armbru@redhat.com>
parent c2613949

scripts/qapi.py

+2 −1
Original line number Diff line number Diff line
@@ -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):

tests/qapi-schema/trailing-comma-list.err

+1 −1
Original line number Diff line number Diff line 
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"