With the previous commit, we have two different locations for
detecting member name clashes - one at parse time, and another
at schema check() time. Consolidate the checks into a single
place, which is also in line with our TODO to eventually defer
all of the parse time semantic checking into the newer schema
code. The check_member_clash() function is no longer needed.
The wording of the error messages has changed, but should still
convey enough information to not be termed a regression.
Signed-off-by: Eric Blake <ebl...@redhat.com>
---
scripts/qapi.py | 45 ++++++++++-----------------
tests/qapi-schema/flat-union-branch-clash.err | 2 +-
tests/qapi-schema/flat-union-cycle.err | 2 +-
tests/qapi-schema/struct-base-clash-deep.err | 2 +-
tests/qapi-schema/struct-base-clash.err | 2 +-
5 files changed, 21 insertions(+), 32 deletions(-)
diff --git a/scripts/qapi.py b/scripts/qapi.py
index 0a0ac90..f5f1c60 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -499,21 +499,6 @@ def check_type(expr_info, source, value, allow_array=False,
'enum'])
-def check_member_clash(expr_info, base_name, data, source=""):
- base = find_struct(base_name)
- assert base
- base_members = base['data']
- for key in data.keys():
- if key.startswith('*'):
- key = key[1:]
- if key in base_members or "*" + key in base_members:
- raise QAPIExprError(expr_info,
- "Member name '%s'%s clashes with base '%s'"
- % (key, source, base_name))
- if base.get('base'):
- check_member_clash(expr_info, base['base'], data, source)
-
-
def check_command(expr, expr_info):
name = expr['command']
@@ -592,15 +577,9 @@ def check_union(expr, expr_info):
for (key, value) in members.items():
check_name(expr_info, "Member of union '%s'" % name, key)
- # Each value must name a known type; furthermore, in flat unions,
- # branches must be a struct with no overlapping member names
+ # Each value must name a known type
check_type(expr_info, "Member '%s' of union '%s'" % (key, name),
value, allow_array=not base, allow_metas=allow_metas)
- if base:
- branch_struct = find_struct(value)
- assert branch_struct
- check_member_clash(expr_info, base, branch_struct['data'],
- " of branch '%s'" % key)
# If the discriminator names an enum type, then all members
# of 'data' must also be members of the enum type.
@@ -684,8 +663,6 @@ def check_struct(expr, expr_info):
allow_dict=True, allow_optional=True)
check_type(expr_info, "'base' for struct '%s'" % name, expr.get('base'),
allow_metas=['struct'])
- if expr.get('base'):
- check_member_clash(expr_info, expr['base'], expr['data'])
def check_keys(expr_elem, meta, required, optional=[]):
@@ -999,7 +976,7 @@ class QAPISchemaObjectTypeMember(object):
self.optional = optional
self._owner = owner
- def check(self, schema, info, all_members, seen):
+ def check(self, schema, info, all_members, seen, flat=False):
if self.c_name() in seen:
raise QAPIExprError(info,
"%s collides with %s"
@@ -1007,6 +984,17 @@ class QAPISchemaObjectTypeMember(object):
seen[self.c_name()].describe()))
self.type = schema.lookup_type(self._type_name)
assert self.type
+ if flat:
+ self.type.check(schema)
+ assert isinstance(self.type.members, list)
+ assert not self.type.variants # not implemented
+ for m in self.type.members:
+ if m.c_name() in seen:
+ raise QAPIExprError(info,
+ "Member '%s' of branch '%s' collides "
+ "with %s"
+ % (m.name, self.name,
+ seen[m.c_name()].describe()))
all_members.append(self)
seen[self.c_name()] = self
@@ -1042,15 +1030,16 @@ class QAPISchemaObjectTypeVariants(object):
assert isinstance(self.tag_member.type, QAPISchemaEnumType)
for v in self.variants:
vseen = dict(seen)
- v.check(schema, info, self.tag_member.type, vseen)
+ v.check(schema, info, self.tag_member.type, vseen,
+ self.tag_name is not None)
class QAPISchemaObjectTypeVariant(QAPISchemaObjectTypeMember):
def __init__(self, name, typ, owner):
QAPISchemaObjectTypeMember.__init__(self, name, typ, False, owner)
- def check(self, schema, info, tag_type, seen):
- QAPISchemaObjectTypeMember.check(self, schema, info, [], seen)
+ def check(self, schema, info, tag_type, seen, flat):
+ QAPISchemaObjectTypeMember.check(self, schema, info, [], seen, flat)
assert self.name in tag_type.values
def describe(self):
diff --git a/tests/qapi-schema/flat-union-branch-clash.err
b/tests/qapi-schema/flat-union-branch-clash.err
index f112766..e220ea4 100644
--- a/tests/qapi-schema/flat-union-branch-clash.err
+++ b/tests/qapi-schema/flat-union-branch-clash.err
@@ -1 +1 @@
-tests/qapi-schema/flat-union-branch-clash.json:10: Member name 'name' of
branch 'value1' clashes with base 'Base'
+tests/qapi-schema/flat-union-branch-clash.json:10: Member 'name' of branch
'value1' collides with 'name' (member of Base)
diff --git a/tests/qapi-schema/flat-union-cycle.err
b/tests/qapi-schema/flat-union-cycle.err
index 152c6f0..5b431d7 100644
--- a/tests/qapi-schema/flat-union-cycle.err
+++ b/tests/qapi-schema/flat-union-cycle.err
@@ -1 +1 @@
-tests/qapi-schema/flat-union-cycle.json:5: Member name 'switch' of branch
'loop' clashes with base 'Base'
+tests/qapi-schema/flat-union-cycle.json:5: Member 'switch' of branch 'loop'
collides with 'switch' (member of Base)
diff --git a/tests/qapi-schema/struct-base-clash-deep.err
b/tests/qapi-schema/struct-base-clash-deep.err
index e3e9f8d..280fa03 100644
--- a/tests/qapi-schema/struct-base-clash-deep.err
+++ b/tests/qapi-schema/struct-base-clash-deep.err
@@ -1 +1 @@
-tests/qapi-schema/struct-base-clash-deep.json:7: Member name 'name' clashes
with base 'Base'
+tests/qapi-schema/struct-base-clash-deep.json:7: 'name' (member of Sub)
collides with 'name' (member of Base)
diff --git a/tests/qapi-schema/struct-base-clash.err
b/tests/qapi-schema/struct-base-clash.err
index 3ac37fb..2d5ceb0 100644
--- a/tests/qapi-schema/struct-base-clash.err
+++ b/tests/qapi-schema/struct-base-clash.err
@@ -1 +1 @@
-tests/qapi-schema/struct-base-clash.json:4: Member name 'name' clashes with
base 'Base'
+tests/qapi-schema/struct-base-clash.json:4: 'name' (member of Sub) collides
with 'name' (member of Base)
--
2.4.3
