[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 04/13] qapi/introspect.py: guard against ifcond/comment misuse
From: |
John Snow |
Subject: |
[PATCH v3 04/13] qapi/introspect.py: guard against ifcond/comment misuse |
Date: |
Wed, 16 Dec 2020 20:53:34 -0500 |
_tree_to_qlit is called recursively on dict values alone; at such a
point in generating output it is too late to apply an ifcond. Similarly,
comments do not necessarily have a "tidy" place they can be printed in
such a circumstance.
Forbid this usage.
Signed-off-by: John Snow <jsnow@redhat.com>
---
scripts/qapi/introspect.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py
index 4749f65ea3c..ccdf4f1c0d0 100644
--- a/scripts/qapi/introspect.py
+++ b/scripts/qapi/introspect.py
@@ -43,6 +43,12 @@ def indent(level):
ifobj, extra = obj
ifcond = extra.get('if')
comment = extra.get('comment')
+
+ # NB: _tree_to_qlit is called recursively on the values of a key:value
+ # pair; those values can't be decorated with comments or conditionals.
+ msg = "dict values cannot have attached comments or if-conditionals."
+ assert not suppress_first_indent, msg
+
ret = ''
if comment:
ret += indent(level) + '/* %s */\n' % comment
--
2.26.2
- [PATCH v3 00/13] qapi: static typing conversion, pt2, John Snow, 2020/12/16
- [PATCH v3 03/13] qapi/introspect.py: add _gen_features helper, John Snow, 2020/12/16
- [PATCH v3 01/13] qapi/introspect.py: assert schema is not None, John Snow, 2020/12/16
- [PATCH v3 02/13] qapi/introspect.py: use _make_tree for features nodes, John Snow, 2020/12/16
- [PATCH v3 06/13] qapi/introspect.py: replace 'extra' dict with 'comment' argument, John Snow, 2020/12/16
- [PATCH v3 04/13] qapi/introspect.py: guard against ifcond/comment misuse,
John Snow <=
- [PATCH v3 05/13] qapi/introspect.py: Unify return type of _make_tree(), John Snow, 2020/12/16
- [PATCH v3 08/13] qapi/introspect.py: create a typed 'Annotated' data strutcure, John Snow, 2020/12/16
- [PATCH v3 09/13] qapi/introspect.py: improve _tree_to_qlit error message, John Snow, 2020/12/16
- [PATCH v3 10/13] qapi/introspect.py: improve readability of _tree_to_qlit, John Snow, 2020/12/16
- [PATCH v3 11/13] qapi/introspect.py: add type hint annotations, John Snow, 2020/12/16
- [PATCH v3 12/13] qapi/instrospect.py: add introspect.json dummy types, John Snow, 2020/12/16
- [PATCH v3 13/13] qapi/introspect.py: Add docstring to _tree_to_qlit, John Snow, 2020/12/16
- [PATCH v3 07/13] qapi/introspect.py: Introduce preliminary tree typing, John Snow, 2020/12/16