[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/40] qapi: Simplify QAPISchemaObjectTypeVariants.ch
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 10/40] qapi: Simplify QAPISchemaObjectTypeVariants.check() |
Date: |
Thu, 17 Dec 2015 09:33:15 +0100 |
Reduce the ugly flat union / simple union conditional by doing just
the essential work here, namely setting self.tag_member.
Move the rest to callers.
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
[rebase to earlier changes that moved tag_member.check() of
alternate types, and tweak commit title and wording]
Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
---
scripts/qapi.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/scripts/qapi.py b/scripts/qapi.py
index 2a73b2b..c6cb17b 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -988,9 +988,10 @@ class QAPISchemaObjectType(QAPISchemaType):
for m in self.local_members:
m.check(schema)
m.check_clash(seen)
+ self.members = seen.values()
if self.variants:
self.variants.check(schema, seen)
- self.members = seen.values()
+ assert self.variants.tag_member in self.members
def is_implicit(self):
# See QAPISchema._make_implicit_object_type()
@@ -1050,10 +1051,8 @@ class QAPISchemaObjectTypeVariants(object):
self.variants = variants
def check(self, schema, seen):
- if self.tag_name: # flat union
+ if not self.tag_member: # flat union
self.tag_member = seen[self.tag_name]
- if seen:
- assert self.tag_member in seen.itervalues()
assert isinstance(self.tag_member.type, QAPISchemaEnumType)
for v in self.variants:
v.check(schema, self.tag_member.type)
--
2.4.3
- [Qemu-devel] [PULL 00/40] QAPI patches for 2015-12-17, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 09/40] qapi: Factor out QAPISchemaObjectTypeMember.check_clash(), Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 02/40] qapi-types: Consolidate gen_struct() and gen_union(), Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 05/40] qapi: Simplify QAPISchemaObjectTypeMember.check(), Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 07/40] qapi: Fix up commit 7618b91's clash sanity checking change, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 06/40] qapi: Clean up after previous commit, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 10/40] qapi: Simplify QAPISchemaObjectTypeVariants.check(),
Markus Armbruster <=
- [Qemu-devel] [PULL 04/40] qapi: Drop obsolete tag value collision assertions, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 03/40] qapi-types: Simplify gen_struct_field[s], Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 12/40] qapi: Factor out QAPISchemaObjectType.check_clash(), Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 01/40] qapi: Track simple union tag in object.local_members, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 17/40] qapi: Fix c_name() munging, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 19/40] blkdebug: Merge hand-rolled and qapi BlkdebugEvent enum, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 18/40] qapi: Remove dead visitor code, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 24/40] cpu: Convert CpuInfo into flat union, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 25/40] qapi: Add alias for ErrorClass, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 32/40] qapi: Inline _make_implicit_tag(), Markus Armbruster, 2015/12/17