[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/14] qapi: Improve error message for unexpected array types
From: |
Markus Armbruster |
Subject: |
[PATCH 05/14] qapi: Improve error message for unexpected array types |
Date: |
Thu, 16 Mar 2023 08:13:16 +0100 |
We reject array types in certain places with "cannot be an array".
Deleting this check improves the error message to "should be a type
name" or "should be an object or type name", depending on context, so
do that.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
scripts/qapi/expr.py | 6 ------
tests/qapi-schema/bad-data.err | 2 +-
tests/qapi-schema/union-array-branch.err | 2 +-
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py
index bc04bf34c2..5abeaa19dd 100644
--- a/scripts/qapi/expr.py
+++ b/scripts/qapi/expr.py
@@ -341,9 +341,6 @@ def check_type_name(value: Optional[object],
if isinstance(value, str):
return
- if isinstance(value, list):
- raise QAPISemError(info, "%s cannot be an array" % source)
-
raise QAPISemError(info, "%s should be a type name" % source)
@@ -392,9 +389,6 @@ def check_type_name_or_implicit(value: Optional[object],
if isinstance(value, str):
return
- if isinstance(value, list):
- raise QAPISemError(info, "%s cannot be an array" % source)
-
if not isinstance(value, dict):
raise QAPISemError(info,
"%s should be an object or type name" % source)
diff --git a/tests/qapi-schema/bad-data.err b/tests/qapi-schema/bad-data.err
index 7991c8898d..a987df4108 100644
--- a/tests/qapi-schema/bad-data.err
+++ b/tests/qapi-schema/bad-data.err
@@ -1,2 +1,2 @@
bad-data.json: In command 'oops':
-bad-data.json:2: 'data' cannot be an array
+bad-data.json:2: 'data' should be an object or type name
diff --git a/tests/qapi-schema/union-array-branch.err
b/tests/qapi-schema/union-array-branch.err
index 5db9c17481..2aa146261a 100644
--- a/tests/qapi-schema/union-array-branch.err
+++ b/tests/qapi-schema/union-array-branch.err
@@ -1,2 +1,2 @@
union-array-branch.json: In union 'TestUnion':
-union-array-branch.json:8: 'data' member 'value1' cannot be an array
+union-array-branch.json:8: 'data' member 'value1' should be a type name
--
2.39.2
[PATCH 05/14] qapi: Improve error message for unexpected array types,
Markus Armbruster <=
[PATCH 02/14] qapi/schema: Use super(), Markus Armbruster, 2023/03/16
[PATCH 01/14] qapi: Fix error message format regression, Markus Armbruster, 2023/03/16
[PATCH 08/14] qapi: Fix to reject 'data': 'mumble' in struct, Markus Armbruster, 2023/03/16
[PATCH 12/14] tests/qapi-schema: Cover optional conditional struct member, Markus Armbruster, 2023/03/16