[Qemu-devel] [PATCH v8.5 1/4] qapi: Drop all_members parameter from check()

[Eric Blake]

The implementation of QAPISchemaObjectTypeMember.check() always
adds the member currently being checked to both the all_members
and seen parameters. However, the three callers of this method
pass in the following parameters:

QAPISchemaObjectType.check():
  - all_members contains all non-variant members seen to date,
  for use in populating self.members
  - seen contains all non-variant members seen to date, for
  use in checking for collisions

QAPISchemaObjectTypeVariant.check():
  - all_members is a throwaway empty list
  - seen is a throwaway dictionary created as a copy by
  QAPISchemaObjectVariants.check() (since the members of
  one variant cannot collide with those from another), for
  use in checking for collisions (technically, we no longer
  need to check for collisions between tag values and QMP
  key names, but that's a cleanup for another patch)

QAPISchemaAlternateType.check():
  - all_members is a throwaway empty list
  - seen is a throwaway empty dict

Therefore, in the one case where we care about all_members
after seen has been populated, we know that it contains the
same members as seen.values(); changing seen to be an
OrderedDict() is sufficient to pick up this information with
one less parameter being passed around.

Signed-off-by: Eric Blake <address@hidden>
---
v9: new patch, split off from v8 7/17
---
 scripts/qapi.py | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/scripts/qapi.py b/scripts/qapi.py
index 6b6ba5f..fff4adb 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -972,28 +972,26 @@ class QAPISchemaObjectType(QAPISchemaType):
         self.variants = variants
         self.members = None

+    # Finish construction, and validate that all members are usable
     def check(self, schema):
         assert self.members is not False        # not running in cycles
         if self.members:
             return
         self.members = False                    # mark as being checked
+        seen = OrderedDict()
         if self._base_name:
             self.base = schema.lookup_type(self._base_name)
             assert isinstance(self.base, QAPISchemaObjectType)
             assert not self.base.variants       # not implemented
             self.base.check(schema)
-            members = list(self.base.members)
-        else:
-            members = []
-        seen = {}
-        for m in members:
-            assert c_name(m.name) not in seen
-            seen[m.name] = m
+            for m in self.base.members:
+                assert c_name(m.name) not in seen
+                seen[m.name] = m
         for m in self.local_members:
-            m.check(schema, members, seen)
+            m.check(schema, seen)
         if self.variants:
-            self.variants.check(schema, members, seen)
-        self.members = members
+            self.variants.check(schema, seen)
+        self.members = seen.values()

     def is_implicit(self):
         # See QAPISchema._make_implicit_object_type()
@@ -1027,11 +1025,10 @@ class QAPISchemaObjectTypeMember(object):
         self.type = None
         self.optional = optional

-    def check(self, schema, all_members, seen):
+    def check(self, schema, seen):
         assert self.name not in seen
         self.type = schema.lookup_type(self._type_name)
         assert self.type
-        all_members.append(self)
         seen[self.name] = self


@@ -1050,7 +1047,7 @@ class QAPISchemaObjectTypeVariants(object):
         self.tag_member = tag_member
         self.variants = variants

-    def check(self, schema, members, seen):
+    def check(self, schema, seen):
         if self.tag_name:    # flat union
             self.tag_member = seen[self.tag_name]
             assert self.tag_member
@@ -1067,7 +1064,7 @@ class 
QAPISchemaObjectTypeVariant(QAPISchemaObjectTypeMember):
         QAPISchemaObjectTypeMember.__init__(self, name, typ, False)

     def check(self, schema, tag_type, seen):
-        QAPISchemaObjectTypeMember.check(self, schema, [], seen)
+        QAPISchemaObjectTypeMember.check(self, schema, seen)
         assert self.name in tag_type.values

     # This function exists to support ugly simple union special cases
@@ -1090,8 +1087,8 @@ class QAPISchemaAlternateType(QAPISchemaType):

     def check(self, schema):
         seen = {}
-        self.variants.tag_member.check(schema, [], seen)
-        self.variants.check(schema, [], seen)
+        self.variants.tag_member.check(schema, seen)
+        self.variants.check(schema, seen)

     def json_type(self):
         return 'value'
-- 
2.4.3