[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 18/25] qapi/schema: assert inner type of QAPISchemaVariants in che
From: |
Markus Armbruster |
Subject: |
[PULL 18/25] qapi/schema: assert inner type of QAPISchemaVariants in check_clash() |
Date: |
Wed, 24 Apr 2024 10:17:03 +0200 |
From: John Snow <jsnow@redhat.com>
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>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240315152301.3621858-19-armbru@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 9c138badb0..177bfa0d11 100644
--- a/scripts/qapi/schema.py
+++ b/scripts/qapi/schema.py
@@ -716,7 +716,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.44.0
- [PULL 15/25] qapi/schema: add _check_complete flag, (continued)
- [PULL 15/25] qapi/schema: add _check_complete flag, Markus Armbruster, 2024/04/24
- [PULL 17/25] qapi/schema: fix typing for QAPISchemaVariants.tag_member, Markus Armbruster, 2024/04/24
- [PULL 03/25] qapi: sort pylint suppressions, Markus Armbruster, 2024/04/24
- [PULL 06/25] qapi/schema: declare type for QAPISchemaObjectTypeMember.type, Markus Armbruster, 2024/04/24
- [PULL 20/25] qapi/parser.py: assert member.info is present in connect_member, Markus Armbruster, 2024/04/24
- [PULL 25/25] qapi: Dumb down QAPISchema.lookup_entity(), Markus Armbruster, 2024/04/24
- [PULL 04/25] qapi/schema: add pylint suppressions, Markus Armbruster, 2024/04/24
- [PULL 12/25] qapi: Assert built-in types exist, Markus Armbruster, 2024/04/24
- [PULL 07/25] qapi/schema: declare type for QAPISchemaArrayType.element_type, Markus Armbruster, 2024/04/24
- [PULL 05/25] qapi: create QAPISchemaDefinition, Markus Armbruster, 2024/04/24
- [PULL 18/25] qapi/schema: assert inner type of QAPISchemaVariants in check_clash(),
Markus Armbruster <=
- [PULL 08/25] qapi/schema: make c_type() and json_type() abstract methods, Markus Armbruster, 2024/04/24
- [PULL 21/25] qapi/schema: add type hints, Markus Armbruster, 2024/04/24
- [PULL 11/25] qapi/schema: assert resolve_type has 'info' and 'what' args on error, Markus Armbruster, 2024/04/24
- [PULL 19/25] qapi/parser: demote QAPIExpression to Dict[str, Any], Markus Armbruster, 2024/04/24
- [PULL 24/25] qapi: Tighten check whether implicit object type already exists, Markus Armbruster, 2024/04/24
- Re: [PULL 00/25] QAPI patches patches for 2024-04-24, Richard Henderson, 2024/04/24