diff mbox

[v12,32/36] qapi: Inline _make_implicit_tag()

Message ID 1447836791-369-33-git-send-email-eblake@redhat.com
State New
Headers show

Commit Message

Eric Blake Nov. 18, 2015, 8:53 a.m. UTC 
Now that alternates no longer use an implicit tag, we can
inline _make_implicit_tag() into its one caller of
_def_union_type().

No change to generated code.

Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>

---
v12: new patch
---
 scripts/qapi.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

Comments

Markus Armbruster Nov. 18, 2015, 6:48 p.m. UTC | #1 
Eric Blake <eblake@redhat.com> writes:

> Now that alternates no longer use an implicit tag, we can
> inline _make_implicit_tag() into its one caller of
> _def_union_type().

Scratch "of".

> No change to generated code.
>
> Suggested-by: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Eric Blake <eblake@redhat.com>

Patch looks good.
diff mbox

Patch

diff --git a/scripts/qapi.py b/scripts/qapi.py
index 3756d41..362afa1 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -1342,11 +1342,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']
@@ -1360,7 +1355,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,