[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 16/20] qapi/schema: assert inner type of QAPISchemaVariants in
From: |
John Snow |
Subject: |
[PATCH v3 16/20] qapi/schema: assert inner type of QAPISchemaVariants in check_clash() |
Date: |
Thu, 1 Feb 2024 17:42:42 -0500 |
QAPISchemaVariant's "variants" field is typed as
List[QAPISchemaVariant], where the typing for QAPISchemaVariant allows
its type field to be any QAPISchemaType.
However, QAPISchemaVariant expects that all of its variants contain the
narrower QAPISchemaObjectType. This relationship is enforced at runtime
in QAPISchemaVariants.check(). This relationship is not embedded in the
type system though, so QAPISchemaVariants.check_clash() needs to
re-assert this property in order to call
QAPISchemaVariant.type.check_clash().
Signed-off-by: John Snow <jsnow@redhat.com>
---
scripts/qapi/schema.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py
index 7508e3a4fa6..4d153b216c0 100644
--- a/scripts/qapi/schema.py
+++ b/scripts/qapi/schema.py
@@ -723,7 +723,10 @@ def check(self, schema, seen):
def check_clash(self, info, seen):
for v in self.variants:
# Reset seen map for each variant, since qapi names from one
- # branch do not affect another branch
+ # branch do not affect another branch.
+ #
+ # v.type's typing is enforced in check() above.
+ assert isinstance(v.type, QAPISchemaObjectType)
v.type.check_clash(info, dict(seen))
--
2.43.0
- [PATCH v3 04/20] qapi/schema: declare type for QAPISchemaObjectTypeMember.type, (continued)
- [PATCH v3 04/20] qapi/schema: declare type for QAPISchemaObjectTypeMember.type, John Snow, 2024/02/01
- [PATCH v3 07/20] qapi/schema: adjust type narrowing for mypy's benefit, John Snow, 2024/02/01
- [PATCH v3 06/20] qapi/schema: make c_type() and json_type() abstract methods, John Snow, 2024/02/01
- [PATCH v3 12/20] qapi/schema: assert info is present when necessary, John Snow, 2024/02/01
- [PATCH v3 13/20] qapi/schema: split "checked" field into "checking" and "checked", John Snow, 2024/02/01
- [PATCH v3 01/20] qapi: sort pylint suppressions, John Snow, 2024/02/01
- [PATCH v3 14/20] qapi/schema: Don't initialize "members" with `None`, John Snow, 2024/02/01
- [PATCH v3 02/20] qapi/schema: add pylint suppressions, John Snow, 2024/02/01
- [PATCH v3 16/20] qapi/schema: assert inner type of QAPISchemaVariants in check_clash(),
John Snow <=
- [PATCH v3 17/20] qapi/parser: demote QAPIExpression to Dict[str, Any], John Snow, 2024/02/01
- [PATCH v3 19/20] qapi/schema: turn on mypy strictness, John Snow, 2024/02/01
- [PATCH v3 20/20] qapi/schema: remove unnecessary asserts, John Snow, 2024/02/01
- [PATCH v3 05/20] qapi/schema: declare type for QAPISchemaArrayType.element_type, John Snow, 2024/02/01
- [PATCH v3 18/20] qapi/schema: add type hints, John Snow, 2024/02/01
- [PATCH v3 15/20] qapi/schema: fix typing for QAPISchemaVariants.tag_member, John Snow, 2024/02/01
- [PATCH v3 11/20] qapi/schema: fix QAPISchemaArrayType.check's call to resolve_type, John Snow, 2024/02/01
- [PATCH v3 08/20] qapi/schema: add type narrowing to lookup_type(), John Snow, 2024/02/01