[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 32/34] qapi/visit.py: assert tag_member contains a QAPISchemaEnumT
From: |
Markus Armbruster |
Subject: |
[PULL 32/34] qapi/visit.py: assert tag_member contains a QAPISchemaEnumType |
Date: |
Sat, 10 Oct 2020 11:55:02 +0200 |
From: John Snow <jsnow@redhat.com>
This is true by design, but not presently able to be expressed in the
type system. An assertion helps mypy understand our constraints.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Cleber Rosa <crosa@redhat.com>
Message-Id: <20201009161558.107041-35-jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
scripts/qapi/visit.py | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/scripts/qapi/visit.py b/scripts/qapi/visit.py
index 708f72c4a1..e00f2a09d7 100644
--- a/scripts/qapi/visit.py
+++ b/scripts/qapi/visit.py
@@ -22,7 +22,7 @@ from .common import (
mcgen,
)
from .gen import QAPISchemaModularCVisitor, ifcontext
-from .schema import QAPISchemaObjectType
+from .schema import QAPISchemaEnumType, QAPISchemaObjectType
def gen_visit_decl(name, scalar=False):
@@ -84,15 +84,17 @@ bool visit_type_%(c_name)s_members(Visitor *v, %(c_name)s
*obj, Error **errp)
ret += gen_endif(memb.ifcond)
if variants:
+ tag_member = variants.tag_member
+ assert isinstance(tag_member.type, QAPISchemaEnumType)
+
ret += mcgen('''
switch (obj->%(c_name)s) {
''',
- c_name=c_name(variants.tag_member.name))
+ c_name=c_name(tag_member.name))
for var in variants.variants:
- case_str = c_enum_const(variants.tag_member.type.name,
- var.name,
- variants.tag_member.type.prefix)
+ case_str = c_enum_const(tag_member.type.name, var.name,
+ tag_member.type.prefix)
ret += gen_if(var.ifcond)
if var.type.name == 'q_empty':
# valid variant and nothing to do
--
2.26.2
- [PULL 23/34] qapi/source.py: add type hint annotations, (continued)
- [PULL 23/34] qapi/source.py: add type hint annotations, Markus Armbruster, 2020/10/10
- [PULL 25/34] qapi/gen: Make _is_user_module() return bool, Markus Armbruster, 2020/10/10
- [PULL 29/34] qapi/gen.py: delint with pylint, Markus Armbruster, 2020/10/10
- [PULL 16/34] qapi/common.py: Convert comments into docstrings, and elaborate, Markus Armbruster, 2020/10/10
- [PULL 22/34] qapi/commands.py: add type hint annotations, Markus Armbruster, 2020/10/10
- [PULL 30/34] qapi/types.py: add type hint annotations, Markus Armbruster, 2020/10/10
- [PULL 26/34] qapi/gen.py: add type hint annotations, Markus Armbruster, 2020/10/10
- [PULL 33/34] qapi/visit.py: remove unused parameters from gen_visit_object, Markus Armbruster, 2020/10/10
- [PULL 34/34] qapi/visit.py: add type hint annotations, Markus Armbruster, 2020/10/10
- [PULL 09/34] qapi: add pylintrc, Markus Armbruster, 2020/10/10
- [PULL 32/34] qapi/visit.py: assert tag_member contains a QAPISchemaEnumType,
Markus Armbruster <=
- [PULL 19/34] qapi/events.py: add type hint annotations, Markus Armbruster, 2020/10/10
- [PULL 31/34] qapi/types.py: remove one-letter variables, Markus Armbruster, 2020/10/10
- Re: [PULL 00/34] QAPI patches patches for 2020-10-10, Peter Maydell, 2020/10/12
- Re: [PULL 00/34] QAPI patches patches for 2020-10-10, Philippe Mathieu-Daudé, 2020/10/18