qapi: Rename visitor parameter @variants to @alternatives

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

View file

@ -223,7 +223,8 @@ bool visit_type_%(c_name)s(Visitor *v, const char *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('''
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))
for var in variants.variants:
for var in alternatives.variants:
ret += var.ifcond.gen_if()
ret += mcgen('''
case %(case)s:
@ -414,10 +415,10 @@ class QAPISchemaGenVisitVisitor(QAPISchemaModularCVisitor):
info: Optional[QAPISourceInfo],
ifcond: QAPISchemaIfCond,
features: List[QAPISchemaFeature],
variants: QAPISchemaAlternatives) -> None:
alternatives: QAPISchemaAlternatives) -> None:
with ifcontext(ifcond, self._genh, self._genc):
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,