[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 03/19] qapi/introspect.py: use _make_tree for features nodes
From: |
John Snow |
Subject: |
[PATCH v6 03/19] qapi/introspect.py: use _make_tree for features nodes |
Date: |
Mon, 15 Feb 2021 21:17:53 -0500 |
At present, we open-code this in _make_tree itself; but if the structure
of the tree changes, this is brittle. Use an explicit recursive call to
_make_tree when appropriate to help keep the interior node typing
consistent.
A consequence of doing this is that the 'ifcond' key of the features
dict will be omitted when ifcond is false-ish, just like it is omitted
in top-level calls to _make_tree. This also increases consistency in our
handling of this property.
Signed-off-by: John Snow <jsnow@redhat.com>
---
scripts/qapi/introspect.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py
index 43ab4be1f77..3295a15c98e 100644
--- a/scripts/qapi/introspect.py
+++ b/scripts/qapi/introspect.py
@@ -30,7 +30,9 @@ def _make_tree(obj, ifcond, features, extra=None):
if ifcond:
extra['if'] = ifcond
if features:
- obj['features'] = [(f.name, {'if': f.ifcond}) for f in features]
+ obj['features'] = [
+ _make_tree(f.name, f.ifcond, None) for f in features
+ ]
if extra:
return (obj, extra)
return obj
--
2.29.2
- [PATCH v6 00/19] qapi: static typing conversion, pt2, John Snow, 2021/02/15
- [PATCH v6 03/19] qapi/introspect.py: use _make_tree for features nodes,
John Snow <=
- [PATCH v6 06/19] qapi/introspect.py: Unify return type of _make_tree(), John Snow, 2021/02/15
- [PATCH v6 08/19] qapi/introspect.py: Always define all 'extra' dict keys, John Snow, 2021/02/15
- [PATCH v6 05/19] qapi/introspect.py: guard against ifcond/comment misuse, John Snow, 2021/02/15
- [PATCH v6 09/19] qapi/introspect.py: Introduce preliminary tree typing, John Snow, 2021/02/15
- [PATCH v6 13/19] qapi/introspect.py: remove _gen_variants helper, John Snow, 2021/02/15
- [PATCH v6 04/19] qapi/introspect.py: add _gen_features helper, John Snow, 2021/02/15
- [PATCH v6 12/19] qapi/introspect.py: improve readability of _tree_to_qlit, John Snow, 2021/02/15
- [PATCH v6 11/19] qapi/introspect.py: improve _tree_to_qlit error message, John Snow, 2021/02/15
- [PATCH v6 14/19] qapi/introspect.py: add type hint annotations, John Snow, 2021/02/15