@@ -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)
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(-)