diff options
| author | Eric Blake <eblake@redhat.com> | 2015-12-01 22:20:50 -0700 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2015-12-17 08:21:28 +0100 |
| commit | 9d3f3494c5b941774e2c3e7639332d53bbe6f8be (patch) | |
| tree | 1e0222f761ff2c7592ca8ebb7ad047b08a0c3da7 | |
| parent | 0b2e84ba774651656771ed697dee8825759dffa9 (diff) | |
| download | focaccia-qemu-9d3f3494c5b941774e2c3e7639332d53bbe6f8be.tar.gz focaccia-qemu-9d3f3494c5b941774e2c3e7639332d53bbe6f8be.zip | |
qapi: Inline _make_implicit_tag()
Now that alternates no longer use an implicit tag, we can inline _make_implicit_tag() into its one caller, _def_union_type(). No change to generated code. Suggested-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Eric Blake <eblake@redhat.com> Message-Id: <1449033659-25497-7-git-send-email-eblake@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
| -rw-r--r-- | scripts/qapi.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/scripts/qapi.py b/scripts/qapi.py index 2b46dd095f..7e6c396a1d 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -1319,11 +1319,6 @@ class QAPISchema(object): typ, info, 'wrapper', [self._make_member('data', typ, info)]) return QAPISchemaObjectTypeVariant(case, typ) - def _make_implicit_tag(self, type_name, info, variants): - typ = self._make_implicit_enum_type(type_name, info, - [v.name for v in variants]) - return QAPISchemaObjectTypeMember('type', typ, False) - def _def_union_type(self, expr, info): name = expr['union'] data = expr['data'] @@ -1337,7 +1332,9 @@ class QAPISchema(object): else: variants = [self._make_simple_variant(key, value, info) for (key, value) in data.iteritems()] - tag_member = self._make_implicit_tag(name, info, variants) + typ = self._make_implicit_enum_type(name, info, + [v.name for v in variants]) + tag_member = QAPISchemaObjectTypeMember('type', typ, False) members = [tag_member] self._def_entity( QAPISchemaObjectType(name, info, base, members, |