ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qapi: Factor add_name() calls out of the meta conditional 

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1489582656-31133-42-git-send-email-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2017-03-15 13:57:30 +01:00
parent eda43c6844
commit 6f05345f8f
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/qapi.py
View File

@ -640,8 +640,6 @@ def add_name(name, info, meta, implicit=False):
def add_struct(definition, info): def add_struct(definition, info):
global struct_types global struct_types
name = definition['struct']
add_name(name, info, 'struct')
struct_types.append(definition) struct_types.append(definition)
@ -655,8 +653,6 @@ def find_struct(name):
def add_union(definition, info): def add_union(definition, info):
global union_types global union_types
name = definition['union']
add_name(name, info, 'union')
union_types.append(definition) union_types.append(definition)
@ -670,8 +666,6 @@ def find_union(name):
def add_enum(definition, info): def add_enum(definition, info):
global enum_types global enum_types
name = definition['enum']
add_name(name, info, 'enum', 'data' not in definition)
enum_types.append(definition) enum_types.append(definition)
@ -937,34 +931,33 @@ def check_exprs(exprs):
"Expression missing documentation comment") "Expression missing documentation comment")
if 'enum' in expr: if 'enum' in expr:
name = expr['enum'] meta = 'enum'
check_keys(expr_elem, 'enum', ['data'], ['prefix']) check_keys(expr_elem, 'enum', ['data'], ['prefix'])
add_enum(expr, info) add_enum(expr, info)
elif 'union' in expr: elif 'union' in expr:
name = expr['union'] meta = 'union'
check_keys(expr_elem, 'union', ['data'], check_keys(expr_elem, 'union', ['data'],
['base', 'discriminator']) ['base', 'discriminator'])
add_union(expr, info) add_union(expr, info)
elif 'alternate' in expr: elif 'alternate' in expr:
name = expr['alternate'] meta = 'alternate'
check_keys(expr_elem, 'alternate', ['data']) check_keys(expr_elem, 'alternate', ['data'])
add_name(name, info, 'alternate')
elif 'struct' in expr: elif 'struct' in expr:
name = expr['struct'] meta = 'struct'
check_keys(expr_elem, 'struct', ['data'], ['base']) check_keys(expr_elem, 'struct', ['data'], ['base'])
add_struct(expr, info) add_struct(expr, info)
elif 'command' in expr: elif 'command' in expr:
name = expr['command'] meta = 'command'
check_keys(expr_elem, 'command', [], check_keys(expr_elem, 'command', [],
['data', 'returns', 'gen', 'success-response', 'boxed']) ['data', 'returns', 'gen', 'success-response', 'boxed'])
add_name(name, info, 'command')
elif 'event' in expr: elif 'event' in expr:
name = expr['event'] meta = 'event'
check_keys(expr_elem, 'event', [], ['data', 'boxed']) check_keys(expr_elem, 'event', [], ['data', 'boxed'])
add_name(name, info, 'event')
else: else:
raise QAPISemError(expr_elem['info'], raise QAPISemError(expr_elem['info'],
"Expression is missing metatype") "Expression is missing metatype")
name = expr[meta]
add_name(name, info, meta)
if doc and doc.symbol != name: if doc and doc.symbol != name:
raise QAPISemError(info, "Definition of '%s' follows documentation" raise QAPISemError(info, "Definition of '%s' follows documentation"
" for '%s'" % (name, doc.symbol)) " for '%s'" % (name, doc.symbol))
@ -979,6 +972,7 @@ def check_exprs(exprs):
else: else:
continue continue
add_enum({ 'enum': name }, expr_elem['info']) add_enum({ 'enum': name }, expr_elem['info'])
add_name(name, info, 'enum', implicit=True)
# Validate that exprs make sense # Validate that exprs make sense
for expr_elem in exprs: for expr_elem in exprs: