motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-01 22:42:13 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qapi: Rename visitor parameter @variants to @alternatives

Browse source 
A previous commit narrowed the type of .visit_alternate_type()
parameter @variants from QAPISchemaVariants to QAPISchemaAlternatives.
Rename it to @alternatives.

One of them passes @alternatives to helper function
gen_visit_alternate().  Rename its @variants parameter to
@alternatives as well.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2024-03-16 07:43:36 +01:00
parent d1da8af897
commit 41d0ad1d04
6 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/sphinx/qapidoc.py
View file

@ -318,7 +318,8 @@ class QAPISchemaGenRSTVisitor(QAPISchemaVisitor):
+ self._nodes_for_sections(doc) + self._nodes_for_sections(doc)
+ self._nodes_for_if_section(ifcond)) + self._nodes_for_if_section(ifcond))
def visit_alternate_type(self, name, info, ifcond, features, variants): def visit_alternate_type(self, name, info, ifcond, features,
alternatives):
doc = self._cur_doc doc = self._cur_doc
self._add_doc('Alternate', self._add_doc('Alternate',
self._nodes_for_members(doc, 'Members') self._nodes_for_members(doc, 'Members')

4
scripts/qapi/introspect.py
View file

@ -348,12 +348,12 @@ const QLitObject %(c_name)s = %(c_string)s;
def visit_alternate_type(self, name: str, info: Optional[QAPISourceInfo], def visit_alternate_type(self, name: str, info: Optional[QAPISourceInfo],
ifcond: QAPISchemaIfCond, ifcond: QAPISchemaIfCond,
features: List[QAPISchemaFeature], features: List[QAPISchemaFeature],
variants: QAPISchemaAlternatives) -> None: alternatives: QAPISchemaAlternatives) -> None:
self._gen_tree( self._gen_tree(
name, 'alternate', name, 'alternate',
{'members': [Annotated({'type': self._use_type(m.type)}, {'members': [Annotated({'type': self._use_type(m.type)},
m.ifcond) m.ifcond)
for m in variants.variants]}, for m in alternatives.variants]},
ifcond, features ifcond, features
) )

2
scripts/qapi/schema.py
View file

@ -236,7 +236,7 @@ class QAPISchemaVisitor:
info: Optional[QAPISourceInfo], info: Optional[QAPISourceInfo],
ifcond: QAPISchemaIfCond, ifcond: QAPISchemaIfCond,
features: List[QAPISchemaFeature], features: List[QAPISchemaFeature],
variants: QAPISchemaAlternatives, alternatives: QAPISchemaAlternatives,
) -> None: ) -> None:
pass pass

4
scripts/qapi/types.py
View file

@ -371,11 +371,11 @@ class QAPISchemaGenTypeVisitor(QAPISchemaModularCVisitor):
info: Optional[QAPISourceInfo], info: Optional[QAPISourceInfo],
ifcond: QAPISchemaIfCond, ifcond: QAPISchemaIfCond,
features: List[QAPISchemaFeature], features: List[QAPISchemaFeature],
variants: QAPISchemaAlternatives) -> None: alternatives: QAPISchemaAlternatives) -> None:
with ifcontext(ifcond, self._genh): with ifcontext(ifcond, self._genh):
self._genh.preamble_add(gen_fwd_object_or_array(name)) self._genh.preamble_add(gen_fwd_object_or_array(name))
self._genh.add(gen_object(name, ifcond, None, self._genh.add(gen_object(name, ifcond, None,
[variants.tag_member], variants)) [alternatives.tag_member], alternatives))
with ifcontext(ifcond, self._genh, self._genc): with ifcontext(ifcond, self._genh, self._genc):
self._gen_type_cleanup(name) self._gen_type_cleanup(name)

9
scripts/qapi/visit.py
View file

@ -223,7 +223,8 @@ bool visit_type_%(c_name)s(Visitor *v, const char *name,
c_name=c_name(name)) c_name=c_name(name))
def gen_visit_alternate(name: str, variants: QAPISchemaAlternatives) -> str: def gen_visit_alternate(name: str,
alternatives: QAPISchemaAlternatives) -> str:
ret = mcgen(''' ret = mcgen('''
bool visit_type_%(c_name)s(Visitor *v, const char *name, bool visit_type_%(c_name)s(Visitor *v, const char *name,
@ -245,7 +246,7 @@ bool visit_type_%(c_name)s(Visitor *v, const char *name,
''', ''',
c_name=c_name(name)) c_name=c_name(name))
for var in variants.variants: for var in alternatives.variants:
ret += var.ifcond.gen_if() ret += var.ifcond.gen_if()
ret += mcgen(''' ret += mcgen('''
case %(case)s: case %(case)s:
@ -414,10 +415,10 @@ class QAPISchemaGenVisitVisitor(QAPISchemaModularCVisitor):
info: Optional[QAPISourceInfo], info: Optional[QAPISourceInfo],
ifcond: QAPISchemaIfCond, ifcond: QAPISchemaIfCond,
features: List[QAPISchemaFeature], features: List[QAPISchemaFeature],
variants: QAPISchemaAlternatives) -> None: alternatives: QAPISchemaAlternatives) -> None:
with ifcontext(ifcond, self._genh, self._genc): with ifcontext(ifcond, self._genh, self._genc):
self._genh.add(gen_visit_decl(name)) self._genh.add(gen_visit_decl(name))
self._genc.add(gen_visit_alternate(name, variants)) self._genc.add(gen_visit_alternate(name, alternatives))
def gen_visit(schema: QAPISchema, def gen_visit(schema: QAPISchema,

5
tests/qapi-schema/test-qapi.py
View file

@ -61,9 +61,10 @@ class QAPISchemaTestVisitor(QAPISchemaVisitor):
self._print_if(ifcond) self._print_if(ifcond)
self._print_features(features) self._print_features(features)
def visit_alternate_type(self, name, info, ifcond, features, variants): def visit_alternate_type(self, name, info, ifcond, features,
alternatives):
print('alternate %s' % name) print('alternate %s' % name)
self._print_variants(variants) self._print_variants(alternatives)
self._print_if(ifcond) self._print_if(ifcond)
self._print_features(features) self._print_features(features)