[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.9 44/47] qapi: union_types is a list used like
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH for-2.9 44/47] qapi: union_types is a list used like a dict, make it one |
Date: |
Mon, 13 Mar 2017 07:18:44 +0100 |
Signed-off-by: Markus Armbruster <address@hidden>
---
scripts/qapi.py | 19 +++----------------
1 file changed, 3 insertions(+), 16 deletions(-)
diff --git a/scripts/qapi.py b/scripts/qapi.py
index ab266db..870ff4e 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 = {}
#
@@ -564,7 +564,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
@@ -633,19 +633,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=[]):
@@ -903,7 +890,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'])
--
2.7.4
- Re: [Qemu-devel] [PATCH for-2.9 47/47] qapi: Fix a misleading parser error message, (continued)
- [Qemu-devel] [PATCH for-2.9 32/47] qapi: Move detection of doc / expression name mismatch, Markus Armbruster, 2017/03/13
- [Qemu-devel] [PATCH for-2.9 40/47] qapi: Simplify what gets stored in enum_types, Markus Armbruster, 2017/03/13
- [Qemu-devel] [PATCH for-2.9 33/47] qapi: Improve error message on @NAME: in free-form doc, Markus Armbruster, 2017/03/13
- [Qemu-devel] [PATCH for-2.9 43/47] qapi: struct_types is a list used like a dict, make it one, Markus Armbruster, 2017/03/13
- [Qemu-devel] [PATCH for-2.9 44/47] qapi: union_types is a list used like a dict, make it one,
Markus Armbruster <=
- [Qemu-devel] [PATCH for-2.9 38/47] qapi: Eliminate check_docs() and drop QAPIDoc.expr, Markus Armbruster, 2017/03/13
- [Qemu-devel] [PATCH for-2.9 35/47] tests/qapi-schema: Rename doc-bad-args to doc-bad-command-arg, Markus Armbruster, 2017/03/13
- [Qemu-devel] [PATCH for-2.9 34/47] qapi: Move empty doc section checking to doc parser, Markus Armbruster, 2017/03/13
- Re: [Qemu-devel] [PATCH for-2.9 34/47] qapi: Move empty doc section checking to doc parser, Eric Blake, 2017/03/14