[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for 2.9 43/49] qapi: Factor add_name() calls out of t
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL for 2.9 43/49] qapi: Factor add_name() calls out of the meta conditional |
Date: |
Thu, 16 Mar 2017 07:27:59 +0100 |
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
---
scripts/qapi.py | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/scripts/qapi.py b/scripts/qapi.py
index 3c6e137..1f79eb4 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -640,8 +640,6 @@ def add_name(name, info, meta, implicit=False):
def add_struct(definition, info):
global struct_types
- name = definition['struct']
- add_name(name, info, 'struct')
struct_types.append(definition)
@@ -655,8 +653,6 @@ def find_struct(name):
def add_union(definition, info):
global union_types
- name = definition['union']
- add_name(name, info, 'union')
union_types.append(definition)
@@ -670,8 +666,6 @@ def find_union(name):
def add_enum(definition, info):
global enum_types
- name = definition['enum']
- add_name(name, info, 'enum', 'data' not in definition)
enum_types.append(definition)
@@ -937,34 +931,33 @@ def check_exprs(exprs):
"Expression missing documentation comment")
if 'enum' in expr:
- name = expr['enum']
+ meta = 'enum'
check_keys(expr_elem, 'enum', ['data'], ['prefix'])
add_enum(expr, info)
elif 'union' in expr:
- name = expr['union']
+ meta = 'union'
check_keys(expr_elem, 'union', ['data'],
['base', 'discriminator'])
add_union(expr, info)
elif 'alternate' in expr:
- name = expr['alternate']
+ meta = 'alternate'
check_keys(expr_elem, 'alternate', ['data'])
- add_name(name, info, 'alternate')
elif 'struct' in expr:
- name = expr['struct']
+ meta = 'struct'
check_keys(expr_elem, 'struct', ['data'], ['base'])
add_struct(expr, info)
elif 'command' in expr:
- name = expr['command']
+ meta = 'command'
check_keys(expr_elem, 'command', [],
['data', 'returns', 'gen', 'success-response', 'boxed'])
- add_name(name, info, 'command')
elif 'event' in expr:
- name = expr['event']
+ meta = 'event'
check_keys(expr_elem, 'event', [], ['data', 'boxed'])
- add_name(name, info, 'event')
else:
raise QAPISemError(expr_elem['info'],
"Expression is missing metatype")
+ name = expr[meta]
+ add_name(name, info, meta)
if doc and doc.symbol != name:
raise QAPISemError(info, "Definition of '%s' follows documentation"
" for '%s'" % (name, doc.symbol))
@@ -979,6 +972,7 @@ def check_exprs(exprs):
else:
continue
add_enum({ 'enum': name }, expr_elem['info'])
+ add_name(name, info, 'enum', implicit=True)
# Validate that exprs make sense
for expr_elem in exprs:
--
2.7.4
- [Qemu-devel] [PULL for 2.9 33/49] qapi: Fix detection of doc / expression mismatch, (continued)
- [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, 2017/03/16
- [Qemu-devel] [PULL for 2.9 43/49] qapi: Factor add_name() calls out of the meta conditional,
Markus Armbruster <=
- [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