[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 5/7] qapi: Rename QAPISchemaAlternateType.variants to .alternativ
From: |
Markus Armbruster |
Subject: |
[PATCH 5/7] qapi: Rename QAPISchemaAlternateType.variants to .alternatives |
Date: |
Wed, 20 Mar 2024 08:43:13 +0100 |
A previous commit narrowed the type of
QAPISchemaAlternateType.variants from QAPISchemaVariants to
QAPISchemaAlternatives. Rename it to .alternatives.
Same for .__init__() parameter @variants.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
scripts/qapi/schema.py | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py
index c9ff794d0c..9bdbfd52b2 100644
--- a/scripts/qapi/schema.py
+++ b/scripts/qapi/schema.py
@@ -651,25 +651,25 @@ def __init__(
doc: Optional[QAPIDoc],
ifcond: Optional[QAPISchemaIfCond],
features: List[QAPISchemaFeature],
- variants: QAPISchemaAlternatives,
+ alternatives: QAPISchemaAlternatives,
):
super().__init__(name, info, doc, ifcond, features)
- assert variants.tag_member
- variants.set_defined_in(name)
- variants.tag_member.set_defined_in(self.name)
- self.variants = variants
+ assert alternatives.tag_member
+ alternatives.set_defined_in(name)
+ alternatives.tag_member.set_defined_in(self.name)
+ self.alternatives = alternatives
def check(self, schema: QAPISchema) -> None:
super().check(schema)
- self.variants.tag_member.check(schema)
- # Not calling self.variants.check_clash(), because there's nothing
- # to clash with
- self.variants.check(schema, {})
+ self.alternatives.tag_member.check(schema)
+ # Not calling self.alternatives.check_clash(), because there's
+ # nothing to clash with
+ self.alternatives.check(schema, {})
# Alternate branch names have no relation to the tag enum values;
# so we have to check for potential name collisions ourselves.
seen: Dict[str, QAPISchemaMember] = {}
types_seen: Dict[str, str] = {}
- for v in self.variants.variants:
+ for v in self.alternatives.variants:
v.check_clash(self.info, seen)
qtype = v.type.alternate_qtype()
if not qtype:
@@ -700,7 +700,7 @@ def check(self, schema: QAPISchema) -> None:
def connect_doc(self, doc: Optional[QAPIDoc] = None) -> None:
super().connect_doc(doc)
doc = doc or self.doc
- for v in self.variants.variants:
+ for v in self.alternatives.variants:
v.connect_doc(doc)
def c_type(self) -> str:
@@ -712,7 +712,8 @@ def json_type(self) -> str:
def visit(self, visitor: QAPISchemaVisitor) -> None:
super().visit(visitor)
visitor.visit_alternate_type(
- self.name, self.info, self.ifcond, self.features, self.variants)
+ self.name, self.info, self.ifcond, self.features,
+ self.alternatives)
class QAPISchemaVariants:
--
2.44.0
- [PATCH 0/7] qapi: Refactor QAPISchemaVariants, Markus Armbruster, 2024/03/20
- [PATCH 3/7] qapi: Rename visitor parameter @variants to @alternatives, Markus Armbruster, 2024/03/20
- [PATCH 1/7] qapi: New QAPISchemaBranches, QAPISchemaAlternatives, Markus Armbruster, 2024/03/20
- [PATCH 2/7] qapi: Rename visitor parameter @variants to @branches, Markus Armbruster, 2024/03/20
- [PATCH 5/7] qapi: Rename QAPISchemaAlternateType.variants to .alternatives,
Markus Armbruster <=
- [PATCH 7/7] qapi: Simplify QAPISchemaVariants @tag_member, Markus Armbruster, 2024/03/20
- [PATCH 4/7] qapi: Rename QAPISchemaObjectType.variants to .branches, Markus Armbruster, 2024/03/20
- [PATCH 6/7] qapi: Move conditional code from QAPISchemaVariants to its subtypes, Markus Armbruster, 2024/03/20