falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qapi: Create simple union type member earlier 

For simple unions, we were creating the implicit 'type' tag
member during the QAPISchemaObjectTypeVariants constructor.
This is different from every other implicit QAPISchemaEntity
object, which get created by QAPISchema methods.  Hoist the
creation to the caller (renaming _make_tag_enum() to
_make_implicit_tag()), and pass the entity rather than the
string name, so that we have the nice property that no
entities are created as a side effect within a different
entity.  A later patch will then have an easier time of
associating location info with each entity creation.

No change to generated code.

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1444710158-8723-10-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Eric Blake 2015-10-12 22:22:29 -06:00 committed by Markus Armbruster
parent 9f08c8ec73
commit 46292ba75c
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
scripts/qapi.py
View File

@ -1010,18 +1010,18 @@ class QAPISchemaObjectTypeMember(object):
class QAPISchemaObjectTypeVariants(object): class QAPISchemaObjectTypeVariants(object):
def __init__(self, tag_name, tag_enum, variants): def __init__(self, tag_name, tag_member, variants):
assert tag_name is None or isinstance(tag_name, str) # Flat unions pass tag_name but not tag_member.
assert tag_enum is None or isinstance(tag_enum, str) # Simple unions and alternates pass tag_member but not tag_name.
# After check(), tag_member is always set, and tag_name remains
# a reliable witness of being used by a flat union.
assert bool(tag_member) != bool(tag_name)
assert (isinstance(tag_name, str) or
isinstance(tag_member, QAPISchemaObjectTypeMember))
for v in variants: for v in variants:
assert isinstance(v, QAPISchemaObjectTypeVariant) assert isinstance(v, QAPISchemaObjectTypeVariant)
self.tag_name = tag_name self.tag_name = tag_name
if tag_name: self.tag_member = tag_member
assert not tag_enum
self.tag_member = None
else:
self.tag_member = QAPISchemaObjectTypeMember('type', tag_enum,
False)
self.variants = variants self.variants = variants
def check(self, schema, members, seen): def check(self, schema, members, seen):
@ -1231,28 +1231,29 @@ class QAPISchema(object):
[self._make_member('data', typ)]) [self._make_member('data', typ)])
return QAPISchemaObjectTypeVariant(case, typ) return QAPISchemaObjectTypeVariant(case, typ)
def _make_tag_enum(self, type_name, variants): def _make_implicit_tag(self, type_name, variants):
return self._make_implicit_enum_type(type_name, typ = self._make_implicit_enum_type(type_name,
[v.name for v in variants]) [v.name for v in variants])
return QAPISchemaObjectTypeMember('type', typ, False)
def _def_union_type(self, expr, info): def _def_union_type(self, expr, info):
name = expr['union'] name = expr['union']
data = expr['data'] data = expr['data']
base = expr.get('base') base = expr.get('base')
tag_name = expr.get('discriminator') tag_name = expr.get('discriminator')
tag_enum = None tag_member = None
if tag_name: if tag_name:
variants = [self._make_variant(key, value) variants = [self._make_variant(key, value)
for (key, value) in data.iteritems()] for (key, value) in data.iteritems()]
else: else:
variants = [self._make_simple_variant(key, value) variants = [self._make_simple_variant(key, value)
for (key, value) in data.iteritems()] for (key, value) in data.iteritems()]
tag_enum = self._make_tag_enum(name, variants) tag_member = self._make_implicit_tag(name, variants)
self._def_entity( self._def_entity(
QAPISchemaObjectType(name, info, base, QAPISchemaObjectType(name, info, base,
self._make_members(OrderedDict()), self._make_members(OrderedDict()),
QAPISchemaObjectTypeVariants(tag_name, QAPISchemaObjectTypeVariants(tag_name,
tag_enum, tag_member,
variants))) variants)))
def _def_alternate_type(self, expr, info): def _def_alternate_type(self, expr, info):
@ -1260,11 +1261,11 @@ class QAPISchema(object):
data = expr['data'] data = expr['data']
variants = [self._make_variant(key, value) variants = [self._make_variant(key, value)
for (key, value) in data.iteritems()] for (key, value) in data.iteritems()]
tag_enum = self._make_tag_enum(name, variants) tag_member = self._make_implicit_tag(name, variants)
self._def_entity( self._def_entity(
QAPISchemaAlternateType(name, info, QAPISchemaAlternateType(name, info,
QAPISchemaObjectTypeVariants(None, QAPISchemaObjectTypeVariants(None,
tag_enum, tag_member,
variants))) variants)))
def _def_command(self, expr, info): def _def_command(self, expr, info):