[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/25] qapi/schema: declare type for QAPISchemaArrayType.element_t
From: |
Markus Armbruster |
Subject: |
[PULL 07/25] qapi/schema: declare type for QAPISchemaArrayType.element_type |
Date: |
Wed, 24 Apr 2024 10:16:52 +0200 |
From: John Snow <jsnow@redhat.com>
A QAPISchemaArrayType's element type gets resolved only during .check().
We have QAPISchemaArrayType.__init__() initialize self.element_type =
None, and .check() assign the actual type. Using .element_type before
.check() is wrong, and hopefully crashes due to the value being None.
Works.
However, it makes for awkward typing. With .element_type:
Optional[QAPISchemaType], mypy is of course unable to see that it's None
before .check(), and a QAPISchemaType after. To help it over the hump,
we'd have to assert self.element_type is not None before all the (valid)
uses. The assertion catches invalid uses, but only at run time; mypy
can't flag them.
Instead, declare .element_type in .__init__() as QAPISchemaType
*without* initializing it. Using .element_type before .check() now
certainly crashes, which is an improvement. Mypy still can't flag
invalid uses, but that's okay.
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-8-armbru@redhat.com>
---
scripts/qapi/schema.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py
index 307f8af01a..48f157fb91 100644
--- a/scripts/qapi/schema.py
+++ b/scripts/qapi/schema.py
@@ -381,7 +381,7 @@ def __init__(self, name, info, element_type):
super().__init__(name, info, None)
assert isinstance(element_type, str)
self._element_type_name = element_type
- self.element_type = None
+ self.element_type: QAPISchemaType
def need_has_if_optional(self):
# When FOO is an array, we still need has_FOO to distinguish
--
2.44.0
- [PULL 23/25] qapi/schema: remove unnecessary asserts, (continued)
- [PULL 23/25] qapi/schema: remove unnecessary asserts, Markus Armbruster, 2024/04/24
- [PULL 02/25] qapi/parser: shush up pylint, Markus Armbruster, 2024/04/24
- [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 <=
- [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, 2024/04/24
- [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