[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/40] qapi: Factor out QAPISchemaObjectTypeMember.ch
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 09/40] qapi: Factor out QAPISchemaObjectTypeMember.check_clash() |
Date: |
Thu, 17 Dec 2015 09:33:14 +0100 |
While there, stick in a TODO change key of seen from QAPI name to C
name. Can't do it right away, because it would fail the assertion for
tests/qapi-schema/args-has-clash.json.
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
---
scripts/qapi.py | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/scripts/qapi.py b/scripts/qapi.py
index 44d08c1..2a73b2b 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -984,12 +984,10 @@ class QAPISchemaObjectType(QAPISchemaType):
assert not self.base.variants # not implemented
self.base.check(schema)
for m in self.base.members:
- assert m.name not in seen
- seen[m.name] = m
+ m.check_clash(seen)
for m in self.local_members:
m.check(schema)
- assert m.name not in seen
- seen[m.name] = m
+ m.check_clash(seen)
if self.variants:
self.variants.check(schema, seen)
self.members = seen.values()
@@ -1030,6 +1028,11 @@ class QAPISchemaObjectTypeMember(object):
self.type = schema.lookup_type(self._type_name)
assert self.type
+ def check_clash(self, seen):
+ # TODO change key of seen from QAPI name to C name
+ assert self.name not in seen
+ seen[self.name] = self
+
class QAPISchemaObjectTypeVariants(object):
def __init__(self, tag_name, tag_member, variants):
--
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 <=
- [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, 2015/12/17
- [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