[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 18/27] qapi: Move context-free checking to the proper place
From: |
Markus Armbruster |
Subject: |
[PULL 18/27] qapi: Move context-free checking to the proper place |
Date: |
Sat, 28 Sep 2019 20:39:25 +0200 |
QAPISchemaCommand.check() and QAPISchemaEvent().check() check 'data'
is present when 'boxed': true. That's context-free. Move to
check_command() and check_event().
Tweak the error message while there.
check_exprs() & friends now check exactly what qapi-code-gen.txt calls
the second layer of syntax.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
---
scripts/qapi/common.py | 16 ++++++++--------
tests/qapi-schema/event-boxed-empty.err | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
index f22e84c4a8..2e1d8158d6 100644
--- a/scripts/qapi/common.py
+++ b/scripts/qapi/common.py
@@ -768,10 +768,12 @@ def check_type(value, info, source,
def check_command(expr, info):
name = expr['command']
+ args = expr.get('data')
boxed = expr.get('boxed', False)
- check_type(expr.get('data'), info,
- "'data' for command '%s'" % name,
+ if boxed and args is None:
+ raise QAPISemError(info, "'boxed': true requires 'data'")
+ check_type(args, info, "'data' for command '%s'" % name,
allow_dict=not boxed)
check_type(expr.get('returns'), info,
"'returns' for command '%s'" % name,
@@ -780,10 +782,12 @@ def check_command(expr, info):
def check_event(expr, info):
name = expr['event']
+ args = expr.get('data')
boxed = expr.get('boxed', False)
- check_type(expr.get('data'), info,
- "'data' for event '%s'" % name,
+ if boxed and args is None:
+ raise QAPISemError(info, "'boxed': true requires 'data'")
+ check_type(args, info, "'data' for event '%s'" % name,
allow_dict=not boxed)
@@ -1699,8 +1703,6 @@ class QAPISchemaCommand(QAPISchemaEntity):
self.info,
"command's 'data' can take %s only with 'boxed': true"
% self.arg_type.describe())
- elif self.boxed:
- raise QAPISemError(self.info, "use of 'boxed' requires 'data'")
if self._ret_type_name:
self.ret_type = schema.resolve_type(
self._ret_type_name, self.info, "command's 'returns'")
@@ -1748,8 +1750,6 @@ class QAPISchemaEvent(QAPISchemaEntity):
self.info,
"event's 'data' can take %s only with 'boxed': true"
% self.arg_type.describe())
- elif self.boxed:
- raise QAPISemError(self.info, "use of 'boxed' requires 'data'")
def visit(self, visitor):
QAPISchemaEntity.visit(self, visitor)
diff --git a/tests/qapi-schema/event-boxed-empty.err
b/tests/qapi-schema/event-boxed-empty.err
index 9c691b7d97..931c10b036 100644
--- a/tests/qapi-schema/event-boxed-empty.err
+++ b/tests/qapi-schema/event-boxed-empty.err
@@ -1,2 +1,2 @@
tests/qapi-schema/event-boxed-empty.json: In event 'FOO':
-tests/qapi-schema/event-boxed-empty.json:2: use of 'boxed' requires 'data'
+tests/qapi-schema/event-boxed-empty.json:2: 'boxed': true requires 'data'
--
2.21.0
- [PULL 00/27] QAPI patches for 2019-09-28, Markus Armbruster, 2019/09/28
- [PULL 01/27] qmp-dispatch: Use CommandNotFound error for disabled commands, Markus Armbruster, 2019/09/28
- [PULL 02/27] qapi: Tighten QAPISchemaFOO.check() assertions, Markus Armbruster, 2019/09/28
- [PULL 14/27] qapi: Make check_type()'s array case a bit more obvious, Markus Armbruster, 2019/09/28
- [PULL 11/27] qapi: Use check_name_str() where it suffices, Markus Armbruster, 2019/09/28
- [PULL 13/27] qapi: Move check for reserved names out of add_name(), Markus Armbruster, 2019/09/28
- [PULL 10/27] qapi: Improve reporting of invalid name errors, Markus Armbruster, 2019/09/28
- [PULL 27/27] qapi: Improve source file read error handling, Markus Armbruster, 2019/09/28
- [PULL 19/27] qapi: Improve reporting of invalid 'if' errors, Markus Armbruster, 2019/09/28
- [PULL 20/27] qapi: Improve reporting of invalid flags, Markus Armbruster, 2019/09/28
- [PULL 18/27] qapi: Move context-free checking to the proper place,
Markus Armbruster <=
- [PULL 24/27] qapi: Eliminate check_keys(), rename check_known_keys(), Markus Armbruster, 2019/09/28
- [PULL 21/27] qapi: Improve reporting of missing / unknown definition keys, Markus Armbruster, 2019/09/28
- [PULL 23/27] qapi: Improve reporting of invalid 'if' further, Markus Armbruster, 2019/09/28
- [PULL 17/27] qapi: Move context-sensitive checking to the proper place, Markus Armbruster, 2019/09/28
- [PULL 03/27] qapi: Rename .owner to .defined_in, Markus Armbruster, 2019/09/28
- [PULL 04/27] qapi: New QAPISourceInfo, replacing dict, Markus Armbruster, 2019/09/28
- [PULL 16/27] qapi: Inline check_name() into check_union(), Markus Armbruster, 2019/09/28
- [PULL 06/27] qapi: Clean up member name case checking, Markus Armbruster, 2019/09/28
- [PULL 12/27] qapi: Report invalid '*' prefix like any other invalid name, Markus Armbruster, 2019/09/28
- [PULL 25/27] qapi: Improve reporting of missing documentation comment, Markus Armbruster, 2019/09/28