qapi script: remember explicitly defined enum values
Later other scripts will need to check the enum values. Signed-off-by: Wenchao Xia <wenchaoqemu@gmail.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
parent
c57ec3249e
commit
dad1fcab91
@ -169,7 +169,7 @@ def parse_schema(fp):
|
||||
|
||||
for expr in schema.exprs:
|
||||
if expr.has_key('enum'):
|
||||
add_enum(expr['enum'])
|
||||
add_enum(expr['enum'], expr['data'])
|
||||
elif expr.has_key('union'):
|
||||
add_union(expr)
|
||||
add_enum('%sKind' % expr['union'])
|
||||
@ -289,13 +289,19 @@ def find_union(name):
|
||||
return union
|
||||
return None
|
||||
|
||||
def add_enum(name):
|
||||
def add_enum(name, enum_values = None):
|
||||
global enum_types
|
||||
enum_types.append(name)
|
||||
enum_types.append({"enum_name": name, "enum_values": enum_values})
|
||||
|
||||
def find_enum(name):
|
||||
global enum_types
|
||||
for enum in enum_types:
|
||||
if enum['enum_name'] == name:
|
||||
return enum
|
||||
return None
|
||||
|
||||
def is_enum(name):
|
||||
global enum_types
|
||||
return (name in enum_types)
|
||||
return find_enum(name) != None
|
||||
|
||||
def c_type(name):
|
||||
if name == 'str':
|
||||
|
@ -1,3 +1,3 @@
|
||||
[OrderedDict([('enum', 'Status'), ('data', ['good', 'bad', 'ugly'])])]
|
||||
['Status']
|
||||
[{'enum_name': 'Status', 'enum_values': ['good', 'bad', 'ugly']}]
|
||||
[]
|
||||
|
@ -15,11 +15,11 @@
|
||||
OrderedDict([('command', 'user_def_cmd2'), ('data', OrderedDict([('ud1a', 'UserDefOne'), ('*ud1b', 'UserDefOne')])), ('returns', 'UserDefTwo')]),
|
||||
OrderedDict([('command', 'user_def_cmd3'), ('data', OrderedDict([('a', 'int'), ('*b', 'int')])), ('returns', 'int')]),
|
||||
OrderedDict([('type', 'UserDefOptions'), ('data', OrderedDict([('*i64', ['int']), ('*u64', ['uint64']), ('*u16', ['uint16']), ('*i64x', 'int'), ('*u64x', 'uint64')]))])]
|
||||
['EnumOne',
|
||||
'UserDefUnionKind',
|
||||
'UserDefFlatUnionKind',
|
||||
'UserDefAnonUnionKind',
|
||||
'UserDefNativeListUnionKind']
|
||||
[{'enum_name': 'EnumOne', 'enum_values': ['value1', 'value2', 'value3']},
|
||||
{'enum_name': 'UserDefUnionKind', 'enum_values': None},
|
||||
{'enum_name': 'UserDefFlatUnionKind', 'enum_values': None},
|
||||
{'enum_name': 'UserDefAnonUnionKind', 'enum_values': None},
|
||||
{'enum_name': 'UserDefNativeListUnionKind', 'enum_values': None}]
|
||||
[OrderedDict([('type', 'NestedEnumsOne'), ('data', OrderedDict([('enum1', 'EnumOne'), ('*enum2', 'EnumOne'), ('enum3', 'EnumOne'), ('*enum4', 'EnumOne')]))]),
|
||||
OrderedDict([('type', 'UserDefZero'), ('data', OrderedDict([('integer', 'int')]))]),
|
||||
OrderedDict([('type', 'UserDefOne'), ('base', 'UserDefZero'), ('data', OrderedDict([('string', 'str'), ('*enum1', 'EnumOne')]))]),
|
||||
|
Loading…
Reference in New Issue
Block a user