[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 02/15] qapi/introspect.py: use _make_tree for features nodes
From: |
John Snow |
Subject: |
[PATCH v5 02/15] qapi/introspect.py: use _make_tree for features nodes |
Date: |
Wed, 3 Feb 2021 19:31:54 -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 v5 00/15] qapi: static typing conversion, pt2, John Snow, 2021/02/03
- [PATCH v5 01/15] qapi/introspect.py: assert schema is not None, John Snow, 2021/02/03
- [PATCH v5 02/15] qapi/introspect.py: use _make_tree for features nodes,
John Snow <=
- [PATCH v5 03/15] qapi/introspect.py: add _gen_features helper, John Snow, 2021/02/03
- [PATCH v5 04/15] qapi/introspect.py: guard against ifcond/comment misuse, John Snow, 2021/02/03
- [PATCH v5 07/15] qapi/introspect.py: Always define all 'extra' dict keys, John Snow, 2021/02/03
- [PATCH v5 06/15] qapi/introspect.py: replace 'extra' dict with 'comment' argument, John Snow, 2021/02/03
- [PATCH v5 05/15] qapi/introspect.py: Unify return type of _make_tree(), John Snow, 2021/02/03
- [PATCH v5 10/15] qapi/introspect.py: improve _tree_to_qlit error message, John Snow, 2021/02/03
- [PATCH v5 09/15] qapi/introspect.py: create a typed 'Annotated' data strutcure, John Snow, 2021/02/03
- [PATCH v5 11/15] qapi/introspect.py: improve readability of _tree_to_qlit, John Snow, 2021/02/03