[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 06/13] qapi/introspect.py: replace 'extra' dict with 'comment'
From: |
John Snow |
Subject: |
[PATCH v3 06/13] qapi/introspect.py: replace 'extra' dict with 'comment' argument |
Date: |
Wed, 16 Dec 2020 20:53:36 -0500 |
This is only used to pass in a dictionary with a comment already set, so
skip the runaround and just accept the comment.
This works because _tree_to_qlit() treats 'if': None; 'comment': None
exactly like absent 'if'; 'comment'.
Signed-off-by: John Snow <jsnow@redhat.com>
---
scripts/qapi/introspect.py | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py
index d3fbf694ad2..0aa3b77109f 100644
--- a/scripts/qapi/introspect.py
+++ b/scripts/qapi/introspect.py
@@ -10,6 +10,8 @@
See the COPYING file in the top-level directory.
"""
+from typing import Optional
+
from .common import (
c_name,
gen_endif,
@@ -24,11 +26,11 @@
)
-def _make_tree(obj, ifcond, extra=None):
- if extra is None:
- extra = {}
- if ifcond:
- extra['if'] = ifcond
+def _make_tree(obj, ifcond, comment=None):
+ extra = {
+ 'if': ifcond,
+ 'comment': comment,
+ }
return (obj, extra)
@@ -174,18 +176,18 @@ def _gen_features(features):
return [_make_tree(f.name, f.ifcond) for f in features]
def _gen_tree(self, name, mtype, obj, ifcond, features):
- extra = 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):
obj = {'name': member.name, 'type': self._use_type(member.type)}
--
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 <=
- [PATCH v3 04/13] qapi/introspect.py: guard against ifcond/comment misuse, John Snow, 2020/12/16
- [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