[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 18/26] qapi: Improve reporting of invalid 'if' errors
From: |
Markus Armbruster |
Subject: |
[PATCH v2 18/26] qapi: Improve reporting of invalid 'if' errors |
Date: |
Fri, 27 Sep 2019 15:46:31 +0200 |
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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
scripts/qapi/common.py | 4 ++--
tests/qapi-schema/bad-if-empty-list.err | 1 +
tests/qapi-schema/bad-if-empty.err | 1 +
tests/qapi-schema/bad-if-list.err | 1 +
tests/qapi-schema/bad-if.err | 1 +
5 files changed, 6 insertions(+), 2 deletions(-)
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)
diff --git a/tests/qapi-schema/bad-if-empty-list.err
b/tests/qapi-schema/bad-if-empty-list.err
index 75fe6497bc..2218c9279b 100644
--- a/tests/qapi-schema/bad-if-empty-list.err
+++ b/tests/qapi-schema/bad-if-empty-list.err
@@ -1 +1,2 @@
+tests/qapi-schema/bad-if-empty-list.json: In struct 'TestIfStruct':
tests/qapi-schema/bad-if-empty-list.json:2: 'if' condition [] is useless
diff --git a/tests/qapi-schema/bad-if-empty.err
b/tests/qapi-schema/bad-if-empty.err
index 358bdc3e51..a3fdb3009d 100644
--- a/tests/qapi-schema/bad-if-empty.err
+++ b/tests/qapi-schema/bad-if-empty.err
@@ -1 +1,2 @@
+tests/qapi-schema/bad-if-empty.json: In struct 'TestIfStruct':
tests/qapi-schema/bad-if-empty.json:2: 'if' condition '' makes no sense
diff --git a/tests/qapi-schema/bad-if-list.err
b/tests/qapi-schema/bad-if-list.err
index 53af099083..e03bf0fc3a 100644
--- a/tests/qapi-schema/bad-if-list.err
+++ b/tests/qapi-schema/bad-if-list.err
@@ -1 +1,2 @@
+tests/qapi-schema/bad-if-list.json: In struct 'TestIfStruct':
tests/qapi-schema/bad-if-list.json:2: 'if' condition ' ' makes no sense
diff --git a/tests/qapi-schema/bad-if.err b/tests/qapi-schema/bad-if.err
index c2e3f5f44c..190216c109 100644
--- a/tests/qapi-schema/bad-if.err
+++ b/tests/qapi-schema/bad-if.err
@@ -1 +1,2 @@
+tests/qapi-schema/bad-if.json: In struct 'TestIfStruct':
tests/qapi-schema/bad-if.json:2: 'if' condition must be a string or a list of
strings
--
2.21.0
- [PATCH v2 13/26] qapi: Make check_type()'s array case a bit more obvious, (continued)
- [PATCH v2 13/26] qapi: Make check_type()'s array case a bit more obvious, Markus Armbruster, 2019/09/27
- [PATCH v2 19/26] qapi: Improve reporting of invalid flags, Markus Armbruster, 2019/09/27
- [PATCH v2 07/26] qapi: Improve reporting of member name clashes, Markus Armbruster, 2019/09/27
- [PATCH v2 15/26] qapi: Inline check_name() into check_union(), Markus Armbruster, 2019/09/27
- [PATCH v2 11/26] qapi: Report invalid '*' prefix like any other invalid name, Markus Armbruster, 2019/09/27
- [PATCH v2 17/26] qapi: Move context-free checking to the proper place, Markus Armbruster, 2019/09/27
- [PATCH v2 09/26] qapi: Improve reporting of invalid name errors, Markus Armbruster, 2019/09/27
- [PATCH v2 12/26] qapi: Move check for reserved names out of add_name(), Markus Armbruster, 2019/09/27
- [PATCH v2 21/26] qapi: Avoid redundant definition references in error messages, Markus Armbruster, 2019/09/27
- [PATCH v2 04/26] qapi: Prefix frontend errors with an "in definition" line, Markus Armbruster, 2019/09/27
- [PATCH v2 18/26] qapi: Improve reporting of invalid 'if' errors,
Markus Armbruster <=
- [PATCH v2 08/26] qapi: Reorder check_FOO() parameters for consistency, Markus Armbruster, 2019/09/27
- [PATCH v2 05/26] qapi: Clean up member name case checking, Markus Armbruster, 2019/09/27
- [PATCH v2 16/26] qapi: Move context-sensitive checking to the proper place, Markus Armbruster, 2019/09/27
- [PATCH v2 23/26] qapi: Eliminate check_keys(), rename check_known_keys(), Markus Armbruster, 2019/09/27
- [PATCH v2 14/26] qapi: Plumb info to the QAPISchemaMember, Markus Armbruster, 2019/09/27
- [PATCH v2 24/26] qapi: Improve reporting of missing documentation comment, Markus Armbruster, 2019/09/27
- [PATCH v2 20/26] qapi: Improve reporting of missing / unknown definition keys, Markus Armbruster, 2019/09/27
- [PATCH v2 26/26] qapi: Improve source file read error handling, Markus Armbruster, 2019/09/27
- [PATCH v2 06/26] qapi: Change frontend error messages to start with lower case, Markus Armbruster, 2019/09/27