From 576f0b8a53ab12d6ca46ec8f89ec0901d80d0ad8 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 27 Sep 2019 15:46:31 +0200 Subject: qapi: Improve reporting of invalid 'if' errors Move check_if() from check_keys() to check_exprs() and call it later, so its error messages gain an "in definition" line. Checking values in a function named check_keys() is unclean anyway. The original sin was commit 0545f6b887 "qapi: Better error messages for bad expressions", which checks the value of key 'name'. More sinning in commit 2cbf09925a "qapi: More rigorous checking for type safety bypass", commit c818408e44 "qapi: Implement boxed types for commands/events", and commit 967c885108 "qapi: add 'if' to top-level expressions". This commit does penance for the latter. The next commits will do penance for the others. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Message-Id: <20190927134639.4284-19-armbru@redhat.com> --- scripts/qapi/common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/qapi/common.py') diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py index 2e1d8158d6..8f96974f85 100644 --- a/scripts/qapi/common.py +++ b/scripts/qapi/common.py @@ -925,8 +925,6 @@ def check_keys(expr, info, meta, required, optional=[]): raise QAPISemError(info, "'%s' of %s '%s' should only use true value" % (key, meta, name)) - if key == 'if': - check_if(expr, info) def normalize_enum(expr): @@ -1028,6 +1026,8 @@ def check_exprs(exprs): else: assert False, 'unexpected meta type' + check_if(expr, info) + if doc: doc.check_expr(expr) -- cgit v1.2.3-59-g8ed1b