[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 08/11] qapi/introspect.py: replace 'extra' dict with 'comment'
From: |
John Snow |
Subject: |
[PATCH v2 08/11] qapi/introspect.py: replace 'extra' dict with 'comment' argument |
Date: |
Mon, 26 Oct 2020 15:42:48 -0400 |
This is only used to pass in a dictionary with a comment already set, so
skip the runaround and just accept the comment.
Signed-off-by: John Snow <jsnow@redhat.com>
---
scripts/qapi/introspect.py | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py
index ef469b6c06e..a0978cb3adb 100644
--- a/scripts/qapi/introspect.py
+++ b/scripts/qapi/introspect.py
@@ -76,12 +76,11 @@
def _make_tree(obj: Union[_DObject, str], ifcond: List[str],
- extra: Optional[Annotations] = None
- ) -> Annotated:
- if extra is None:
- extra = {}
- if ifcond:
- extra['if'] = ifcond
+ comment: Optional[str] = None) -> Annotated:
+ extra: Annotations = {
+ 'if': ifcond,
+ 'comment': comment,
+ }
return (obj, extra)
@@ -228,18 +227,18 @@ def _gen_features(cls,
def _gen_tree(self, name: str, mtype: str, obj: _DObject,
ifcond: List[str],
features: Optional[List[QAPISchemaFeature]]) -> None:
- extra: Optional[Annotations] = None
+ comment: Optional[str] = None
if mtype not in ('command', 'event', 'builtin', 'array'):
if not self._unmask:
# Output a comment to make it easy to map masked names
# back to the source when reading the generated output.
- extra = {'comment': '"%s" = %s' % (self._name(name), name)}
+ comment = f'"{self._name(name)}" = {name}'
name = self._name(name)
obj['name'] = name
obj['meta-type'] = mtype
if features:
obj['features'] = self._gen_features(features)
- self._trees.append(_make_tree(obj, ifcond, extra))
+ self._trees.append(_make_tree(obj, ifcond, comment))
def _gen_member(self,
member: QAPISchemaObjectTypeMember) -> Annotated:
--
2.26.2
- [PATCH v2 00/11] qapi: static typing conversion, pt2, John Snow, 2020/10/26
- [PATCH v2 02/11] [DO-NOT-MERGE] docs/sphinx: change default role to "any", John Snow, 2020/10/26
- [PATCH v2 11/11] qapi/introspect.py: Add docstring to _tree_to_qlit, John Snow, 2020/10/26
- [PATCH v2 04/11] qapi/introspect.py: add assertions and casts, John Snow, 2020/10/26
- [PATCH v2 03/11] [DO-NOT-MERGE] docs: enable sphinx-autodoc for scripts/qapi, John Snow, 2020/10/26
- [PATCH v2 06/11] qapi/introspect.py: add _gen_features helper, John Snow, 2020/10/26
- [PATCH v2 08/11] qapi/introspect.py: replace 'extra' dict with 'comment' argument,
John Snow <=
- [PATCH v2 07/11] qapi/introspect.py: Unify return type of _make_tree(), John Snow, 2020/10/26
- [PATCH v2 10/11] qapi/introspect.py: improve readability of _tree_to_qlit, John Snow, 2020/10/26
- [PATCH v2 01/11] [DO-NOT-MERGE] docs: replace single backtick (`) with double-backtick (``), John Snow, 2020/10/26
- [PATCH v2 09/11] qapi/introspect.py: create a typed 'Annotated' data strutcure, John Snow, 2020/10/26
- [PATCH v2 05/11] qapi/introspect.py: add preliminary type hint annotations, John Snow, 2020/10/26