From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: richard.henderson@linaro.org, John Snow <jsnow@redhat.com>
Subject: [PULL 12/25] qapi: Assert built-in types exist
Date: Wed, 24 Apr 2024 10:16:57 +0200 [thread overview]
Message-ID: <20240424081710.2907748-13-armbru@redhat.com> (raw)
In-Reply-To: <20240424081710.2907748-1-armbru@redhat.com>
QAPISchema.lookup_type('FOO') returns a QAPISchemaType when type 'FOO'
exists, else None. It won't return None for built-in types like
'int'.
Since mypy can't see that, it'll complain that we assign the
Optional[QAPISchemaType] returned by .lookup_type() to QAPISchemaType
variables.
Add assertions to help it over the hump.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240315152301.3621858-13-armbru@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
---
scripts/qapi/introspect.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py
index 67c7d89aae..4679b1bc2c 100644
--- a/scripts/qapi/introspect.py
+++ b/scripts/qapi/introspect.py
@@ -227,10 +227,14 @@ def _use_type(self, typ: QAPISchemaType) -> str:
# Map the various integer types to plain int
if typ.json_type() == 'int':
- typ = self._schema.lookup_type('int')
+ type_int = self._schema.lookup_type('int')
+ assert type_int
+ typ = type_int
elif (isinstance(typ, QAPISchemaArrayType) and
typ.element_type.json_type() == 'int'):
- typ = self._schema.lookup_type('intList')
+ type_intList = self._schema.lookup_type('intList')
+ assert type_intList
+ typ = type_intList
# Add type to work queue if new
if typ not in self._used_types:
self._used_types.append(typ)
--
2.44.0
next prev parent reply other threads:[~2024-04-24 8:18 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-24 8:16 [PULL 00/25] QAPI patches patches for 2024-04-24 Markus Armbruster
2024-04-24 8:16 ` [PULL 01/25] qapi/parser: fix typo - self.returns.info => self.errors.info Markus Armbruster
2024-04-24 8:16 ` [PULL 02/25] qapi/parser: shush up pylint Markus Armbruster
2024-04-24 8:16 ` [PULL 03/25] qapi: sort pylint suppressions Markus Armbruster
2024-04-24 8:16 ` [PULL 04/25] qapi/schema: add " Markus Armbruster
2024-04-24 8:16 ` [PULL 05/25] qapi: create QAPISchemaDefinition Markus Armbruster
2024-04-24 8:16 ` [PULL 06/25] qapi/schema: declare type for QAPISchemaObjectTypeMember.type Markus Armbruster
2024-04-24 8:16 ` [PULL 07/25] qapi/schema: declare type for QAPISchemaArrayType.element_type Markus Armbruster
2024-04-24 8:16 ` [PULL 08/25] qapi/schema: make c_type() and json_type() abstract methods Markus Armbruster
2024-04-24 8:16 ` [PULL 09/25] qapi/schema: adjust type narrowing for mypy's benefit Markus Armbruster
2024-04-24 8:16 ` [PULL 10/25] qapi/schema: add type narrowing to lookup_type() Markus Armbruster
2024-04-24 8:16 ` [PULL 11/25] qapi/schema: assert resolve_type has 'info' and 'what' args on error Markus Armbruster
2024-04-24 8:16 ` Markus Armbruster [this message]
2024-04-24 8:16 ` [PULL 13/25] qapi/schema: fix QAPISchemaArrayType.check's call to resolve_type Markus Armbruster
2024-04-24 8:16 ` [PULL 14/25] qapi/schema: assert info is present when necessary Markus Armbruster
2024-04-24 8:17 ` [PULL 15/25] qapi/schema: add _check_complete flag Markus Armbruster
2024-04-24 8:17 ` [PULL 16/25] qapi/schema: Don't initialize "members" with `None` Markus Armbruster
2024-04-24 8:17 ` [PULL 17/25] qapi/schema: fix typing for QAPISchemaVariants.tag_member Markus Armbruster
2024-04-24 8:17 ` [PULL 18/25] qapi/schema: assert inner type of QAPISchemaVariants in check_clash() Markus Armbruster
2024-04-24 8:17 ` [PULL 19/25] qapi/parser: demote QAPIExpression to Dict[str, Any] Markus Armbruster
2024-04-24 8:17 ` [PULL 20/25] qapi/parser.py: assert member.info is present in connect_member Markus Armbruster
2024-04-24 8:17 ` [PULL 21/25] qapi/schema: add type hints Markus Armbruster
2024-04-24 8:17 ` [PULL 22/25] qapi/schema: turn on mypy strictness Markus Armbruster
2024-04-24 8:17 ` [PULL 23/25] qapi/schema: remove unnecessary asserts Markus Armbruster
2024-04-24 8:17 ` [PULL 24/25] qapi: Tighten check whether implicit object type already exists Markus Armbruster
2024-04-24 8:17 ` [PULL 25/25] qapi: Dumb down QAPISchema.lookup_entity() Markus Armbruster
2024-04-24 18:47 ` [PULL 00/25] QAPI patches patches for 2024-04-24 Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240424081710.2907748-13-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=jsnow@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).