qapi: Fix a misleading parser error message

qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio

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 <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1489582656-31133-48-git-send-email-armbru@redhat.com>

Markus Armbruster 9 years ago 012b126d c2613949

+3 -2

2 changed files

expand all

scripts

qapi.py

tests

qapi-schema

trailing-comma-list.err

+2 -1

scripts/qapi.py

··· 519 519 expr = self.val 520 520 self.accept() 521 521 else: 522 - raise QAPIParseError(self, 'Expected "{", "[" or string') 522 + raise QAPIParseError(self, 'Expected "{", "[", string, ' 523 + 'boolean or "null"') 523 524 return expr 524 525 525 526 def get_doc(self, info):

+1 -1

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

··· 1 - tests/qapi-schema/trailing-comma-list.json:2:36: Expected "{", "[" or string 1 + tests/qapi-schema/trailing-comma-list.json:2:36: Expected "{", "[", string, boolean or "null"