[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.9 43/47] qapi: struct_types is a list used lik
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH for-2.9 43/47] qapi: struct_types is a list used like a dict, make it one |
Date: |
Mon, 13 Mar 2017 07:18:43 +0100 |
Signed-off-by: Markus Armbruster <address@hidden>
---
scripts/qapi.py | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/scripts/qapi.py b/scripts/qapi.py
index 5a3a606..ab266db 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -47,7 +47,7 @@ returns_whitelist = []
name_case_whitelist = []
enum_types = {}
-struct_types = []
+struct_types = {}
union_types = []
all_names = {}
@@ -550,7 +550,7 @@ class QAPISchemaParser(object):
def find_base_members(base):
if isinstance(base, dict):
return base
- base_struct_define = find_struct(base)
+ base_struct_define = struct_types.get(base)
if not base_struct_define:
return None
return base_struct_define['data']
@@ -560,7 +560,7 @@ def find_base_members(base):
def find_alternate_member_qtype(qapi_type):
if qapi_type in builtin_types:
return builtin_types[qapi_type]
- elif find_struct(qapi_type):
+ elif qapi_type in struct_types:
return 'QTYPE_QDICT'
elif qapi_type in enum_types:
return 'QTYPE_QSTRING'
@@ -633,19 +633,6 @@ def add_name(name, info, meta, implicit=False):
all_names[name] = meta
-def add_struct(definition, info):
- global struct_types
- struct_types.append(definition)
-
-
-def find_struct(name):
- global struct_types
- for struct in struct_types:
- if struct['struct'] == name:
- return struct
- return None
-
-
def add_union(definition, info):
global union_types
union_types.append(definition)
@@ -923,7 +910,7 @@ def check_exprs(exprs):
elif 'struct' in expr:
meta = 'struct'
check_keys(expr_elem, 'struct', ['data'], ['base'])
- add_struct(expr, info)
+ struct_types[expr[meta]] = expr
elif 'command' in expr:
meta = 'command'
check_keys(expr_elem, 'command', [],
--
2.7.4
- [Qemu-devel] [PATCH for-2.9 30/47] tests/qapi-schema: Improve doc / expression mismatch coverage, (continued)
- [Qemu-devel] [PATCH for-2.9 30/47] tests/qapi-schema: Improve doc / expression mismatch coverage, Markus Armbruster, 2017/03/13
- [Qemu-devel] [PATCH for-2.9 47/47] qapi: Fix a misleading parser error message, Markus Armbruster, 2017/03/13
- [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 <=
- [Qemu-devel] [PATCH for-2.9 44/47] qapi: union_types is a list used like a dict, make it one, Markus Armbruster, 2017/03/13
- [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