[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 40/47] qapi/introspect.py: Unify return type of _make_tree()
From: |
John Snow |
Subject: |
[PATCH v3 40/47] qapi/introspect.py: Unify return type of _make_tree() |
Date: |
Thu, 24 Sep 2020 20:28:53 -0400 |
Returning a *something* or a Tuple of *something* is hard to accurately
type. Let's just always return a tuple for structural consistency.
Instances of the 'TreeNode' type can be replaced with the slightly more
specific 'AnnotatedNode' type.
Signed-off-by: John Snow <jsnow@redhat.com>
---
scripts/qapi/introspect.py | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py
index 08b3783ba7..54bc75393c 100644
--- a/scripts/qapi/introspect.py
+++ b/scripts/qapi/introspect.py
@@ -52,14 +52,12 @@
def _make_tree(obj: Union[_DObject, str], ifcond: List[str],
extra: Optional[Extra] = None
- ) -> Union[TreeNode, AnnotatedNode]:
+ ) -> AnnotatedNode:
if extra is None:
extra = {}
if ifcond:
extra['if'] = ifcond
- if extra:
- return (obj, extra)
- return obj
+ return (obj, extra)
def _tree_to_qlit(obj: TreeNode,
@@ -127,7 +125,7 @@ def __init__(self, prefix: str, unmask: bool):
' * QAPI/QMP schema introspection', __doc__)
self._unmask = unmask
self._schema: Optional[QAPISchema] = None
- self._trees: List[TreeNode] = []
+ self._trees: List[AnnotatedNode] = []
self._used_types: List[QAPISchemaType] = []
self._name_map: Dict[str, str] = {}
self._genc.add(mcgen('''
@@ -194,7 +192,8 @@ def _use_type(self, typ: QAPISchemaType) -> str:
@classmethod
def _gen_features(cls,
- features: List[QAPISchemaFeature]) -> List[TreeNode]:
+ features: List[QAPISchemaFeature]
+ ) -> List[AnnotatedNode]:
return [_make_tree(f.name, f.ifcond) for f in features]
def _gen_tree(self, name: str, mtype: str, obj: _DObject,
@@ -214,7 +213,7 @@ def _gen_tree(self, name: str, mtype: str, obj: _DObject,
self._trees.append(_make_tree(obj, ifcond, extra))
def _gen_member(self,
- member: QAPISchemaObjectTypeMember) -> TreeNode:
+ member: QAPISchemaObjectTypeMember) -> AnnotatedNode:
obj: _DObject = {
'name': member.name,
'type': self._use_type(member.type)
@@ -230,7 +229,7 @@ def _gen_variants(self, tag_name: str,
return {'tag': tag_name,
'variants': [self._gen_variant(v) for v in variants]}
- def _gen_variant(self, variant: QAPISchemaVariant) -> TreeNode:
+ def _gen_variant(self, variant: QAPISchemaVariant) -> AnnotatedNode:
obj: _DObject = {
'case': variant.name,
'type': self._use_type(variant.type)
--
2.26.2
- [PATCH v3 34/47] qapi/gen.py: Remove unused parameter, (continued)
- [PATCH v3 34/47] qapi/gen.py: Remove unused parameter, John Snow, 2020/09/24
- [PATCH v3 18/47] qapi/common.py: Replace one-letter 'c' variable, John Snow, 2020/09/24
- [PATCH v3 30/47] qapi/source.py: delint with pylint, John Snow, 2020/09/24
- [PATCH v3 37/47] qapi/introspect.py: assert obj is a dict when features are given, John Snow, 2020/09/24
- [PATCH v3 45/47] qapi/visit.py: assert tag_member contains a QAPISchemaEnumType, John Snow, 2020/09/24
- [PATCH v3 31/47] qapi/gen.py: Fix edge-case of _is_user_module, John Snow, 2020/09/24
- [PATCH v3 39/47] qapi/introspect.py: add _gen_features helper, John Snow, 2020/09/24
- [PATCH v3 47/47] qapi/visit.py: add type hint annotations, John Snow, 2020/09/24
- [PATCH v3 42/47] qapi/introspect.py: create a typed 'Node' data structure, John Snow, 2020/09/24
- [PATCH v3 40/47] qapi/introspect.py: Unify return type of _make_tree(),
John Snow <=
- [PATCH v3 32/47] qapi/gen.py: add type hint annotations, John Snow, 2020/09/24
- [PATCH v3 38/47] qapi/instrospect.py: add preliminary type hint annotations, John Snow, 2020/09/24
- [PATCH v3 44/47] qapi/types.py: remove one-letter variables, John Snow, 2020/09/24
- [PATCH v3 46/47] qapi/visit.py: remove unused parameters from gen_visit_object, John Snow, 2020/09/24
- Re: [PATCH v3 00/47] qapi: static typing conversion, pt1, John Snow, 2020/09/28