From 62f27589f8549d6cf1f7fe21ed55ce6f2f705450 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 8 Sep 2021 06:54:28 +0200 Subject: [PATCH] qapi: Fix bogus error for 'if': { 'not': '' } MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Markus Armbruster Message-Id: <20210908045428.2689093-6-armbru@redhat.com> Reviewed-by: Marc-André Lureau [check_infix()'s type hint fixed] --- scripts/qapi/expr.py | 21 +++++++++++++-------- tests/qapi-schema/bad-if-not.err | 2 +- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py index b62f0a3640..90bde501b0 100644 --- a/scripts/qapi/expr.py +++ b/scripts/qapi/expr.py @@ -293,17 +293,22 @@ def check_if(expr: _JSONObject, info: QAPISourceInfo, source: str) -> None: info, "'if' condition of %s has conflicting keys" % source) - oper, operands = next(iter(cond.items())) + if 'not' in cond: + _check_if(cond['not']) + elif 'all' in cond: + _check_infix('all', cond['all']) + else: + _check_infix('any', cond['any']) + + def _check_infix(operator: str, operands: object) -> None: + if not isinstance(operands, list): + raise QAPISemError( + info, + "'%s' condition of %s must be an array" + % (operator, source)) if not operands: raise QAPISemError( info, "'if' condition [] of %s is useless" % source) - - if oper == "not": - _check_if(operands) - return - if oper in ("all", "any") and not isinstance(operands, list): - raise QAPISemError( - info, "'%s' condition of %s must be an array" % (oper, source)) for operand in operands: _check_if(operand) diff --git a/tests/qapi-schema/bad-if-not.err b/tests/qapi-schema/bad-if-not.err index b3acdd679a..b33f5e16b8 100644 --- a/tests/qapi-schema/bad-if-not.err +++ b/tests/qapi-schema/bad-if-not.err @@ -1,2 +1,2 @@ bad-if-not.json: In struct 'TestIfStruct': -bad-if-not.json:2: 'if' condition [] of struct is useless +bad-if-not.json:2: 'if' condition '' of struct is not a valid identifier