aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2017-03-15 13:57:33 +0100
committerMarkus Armbruster <armbru@redhat.com>2017-03-16 07:13:04 +0100
commit768562ded0354f6834b48c99626b6fadf19b757b (patch)
tree5b03801c7d121c42a166f57cbd8b00da3257a039 /scripts
parented285bf821eeb5d82bb2777707cc02b11194b7b1 (diff)
qapi: union_types is a list used like a dict, make it one
Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <1489582656-31133-45-git-send-email-armbru@redhat.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/qapi.py19
1 files changed, 3 insertions, 16 deletions
diff --git a/scripts/qapi.py b/scripts/qapi.py
index f4d1a483e5..82c25a113e 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -48,7 +48,7 @@ name_case_whitelist = []
enum_types = {}
struct_types = {}
-union_types = []
+union_types = {}
all_names = {}
#
@@ -569,7 +569,7 @@ def find_alternate_member_qtype(qapi_type):
return 'QTYPE_QDICT'
elif qapi_type in enum_types:
return 'QTYPE_QSTRING'
- elif find_union(qapi_type):
+ elif qapi_type in union_types:
return 'QTYPE_QDICT'
return None
@@ -638,19 +638,6 @@ def add_name(name, info, meta, implicit=False):
all_names[name] = meta
-def add_union(definition, info):
- global union_types
- union_types.append(definition)
-
-
-def find_union(name):
- global union_types
- for union in union_types:
- if union['union'] == name:
- return union
- return None
-
-
def check_type(info, source, value, allow_array=False,
allow_dict=False, allow_optional=False,
allow_metas=[]):
@@ -908,7 +895,7 @@ def check_exprs(exprs):
meta = 'union'
check_keys(expr_elem, 'union', ['data'],
['base', 'discriminator'])
- add_union(expr, info)
+ union_types[expr[meta]] = expr
elif 'alternate' in expr:
meta = 'alternate'
check_keys(expr_elem, 'alternate', ['data'])