[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for 2.9 44/49] qapi: enum_types is a list used like a
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL for 2.9 44/49] qapi: enum_types is a list used like a dict, make it one |
Date: |
Thu, 16 Mar 2017 07:28:00 +0100 |
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
---
scripts/qapi.py | 29 ++++++-----------------------
1 file changed, 6 insertions(+), 23 deletions(-)
diff --git a/scripts/qapi.py b/scripts/qapi.py
index 1f79eb4..735ddaa 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -46,7 +46,7 @@ returns_whitelist = []
# Whitelist of entities allowed to violate case conventions
name_case_whitelist = []
-enum_types = []
+enum_types = {}
struct_types = []
union_types = []
all_names = {}
@@ -567,7 +567,7 @@ def find_alternate_member_qtype(qapi_type):
return builtin_types[qapi_type]
elif find_struct(qapi_type):
return 'QTYPE_QDICT'
- elif find_enum(qapi_type):
+ elif qapi_type in enum_types:
return 'QTYPE_QSTRING'
elif find_union(qapi_type):
return 'QTYPE_QDICT'
@@ -591,7 +591,7 @@ def discriminator_find_enum_define(expr):
if not discriminator_type:
return None
- return find_enum(discriminator_type)
+ return enum_types.get(discriminator_type)
# Names must be letters, numbers, -, and _. They must start with letter,
@@ -664,23 +664,6 @@ def find_union(name):
return None
-def add_enum(definition, info):
- global enum_types
- enum_types.append(definition)
-
-
-def find_enum(name):
- global enum_types
- for enum in enum_types:
- if enum['enum'] == name:
- return enum
- return None
-
-
-def is_enum(name):
- return find_enum(name) is not None
-
-
def check_type(info, source, value, allow_array=False,
allow_dict=False, allow_optional=False,
allow_metas=[]):
@@ -799,7 +782,7 @@ def check_union(expr, info):
"Discriminator '%s' is not a member of base "
"struct '%s'"
% (discriminator, base))
- enum_define = find_enum(discriminator_type)
+ enum_define = enum_types.get(discriminator_type)
allow_metas = ['struct']
# Do not allow string discriminator
if not enum_define:
@@ -933,7 +916,7 @@ def check_exprs(exprs):
if 'enum' in expr:
meta = 'enum'
check_keys(expr_elem, 'enum', ['data'], ['prefix'])
- add_enum(expr, info)
+ enum_types[expr[meta]] = expr
elif 'union' in expr:
meta = 'union'
check_keys(expr_elem, 'union', ['data'],
@@ -971,7 +954,7 @@ def check_exprs(exprs):
name = '%sKind' % expr['alternate']
else:
continue
- add_enum({ 'enum': name }, expr_elem['info'])
+ enum_types[name] = {'enum': name}
add_name(name, info, 'enum', implicit=True)
# Validate that exprs make sense
--
2.7.4
- [Qemu-devel] [PULL for 2.9 22/49] qapi2texi: Plainer enum value and member name formatting, (continued)
- [Qemu-devel] [PULL for 2.9 22/49] qapi2texi: Plainer enum value and member name formatting, Markus Armbruster, 2017/03/16
- [Qemu-devel] [PULL for 2.9 33/49] qapi: Fix detection of doc / expression mismatch, Markus Armbruster, 2017/03/16
- [Qemu-devel] [PULL for 2.9 23/49] qapi2texi: Present the table of members more clearly, Markus Armbruster, 2017/03/16
- [Qemu-devel] [PULL for 2.9 36/49] qapi: Move empty doc section checking to doc parser, Markus Armbruster, 2017/03/16
- [Qemu-devel] [PULL for 2.9 42/49] qapi: Simplify what gets stored in enum_types, Markus Armbruster, 2017/03/16
- [Qemu-devel] [PULL for 2.9 34/49] qapi: Move detection of doc / expression name mismatch, Markus Armbruster, 2017/03/16
- [Qemu-devel] [PULL for 2.9 46/49] qapi: union_types is a list used like a dict, make it one, Markus Armbruster, 2017/03/16
- [Qemu-devel] [PULL for 2.9 45/49] qapi: struct_types is a list used like a dict, make it one, Markus Armbruster, 2017/03/16
- [Qemu-devel] [PULL for 2.9 38/49] tests/qapi-schema: Improve coverage of bogus member docs, Markus Armbruster, 2017/03/16
- [Qemu-devel] [PULL for 2.9 16/49] qapi: Prepare for requiring more complete documentation, Markus Armbruster, 2017/03/16
- [Qemu-devel] [PULL for 2.9 44/49] qapi: enum_types is a list used like a dict, make it one,
Markus Armbruster <=
- [Qemu-devel] [PULL for 2.9 43/49] qapi: Factor add_name() calls out of the meta conditional, Markus Armbruster, 2017/03/16
- [Qemu-devel] [PULL for 2.9 28/49] qapi2texi: Generate reference to base type members, Markus Armbruster, 2017/03/16
- [Qemu-devel] [PULL for 2.9 49/49] qapi: Fix a misleading parser error message, Markus Armbruster, 2017/03/16
- [Qemu-devel] [PULL for 2.9 47/49] qapi: Drop unused .check_clash() parameter schema, Markus Armbruster, 2017/03/16
- [Qemu-devel] [PULL for 2.9 37/49] tests/qapi-schema: Rename doc-bad-args to doc-bad-command-arg, Markus Armbruster, 2017/03/16
- [Qemu-devel] [PULL for 2.9 05/49] qapi: Back out doc comments added just to please qapi.py, Markus Armbruster, 2017/03/16
- [Qemu-devel] [PULL for 2.9 19/49] qapi: The #optional tag is redundant, drop, Markus Armbruster, 2017/03/16
- Re: [Qemu-devel] [PULL for 2.9 00/49] QAPI patches for 2017-03-16, Peter Maydell, 2017/03/16