[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/11] qapi script: remember explicitly defined enum
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 01/11] qapi script: remember explicitly defined enum values |
Date: |
Tue, 11 Mar 2014 09:41:01 -0400 |
From: Wenchao Xia <address@hidden>
Later other scripts will need to check the enum values.
Signed-off-by: Wenchao Xia <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>
---
scripts/qapi.py | 16 +++++++++++-----
tests/qapi-schema/comments.out | 2 +-
tests/qapi-schema/qapi-schema-test.out | 10 +++++-----
3 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/scripts/qapi.py b/scripts/qapi.py
index f3c2a20..023930e 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -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 is_enum(name):
+def find_enum(name):
global enum_types
- return (name in enum_types)
+ for enum in enum_types:
+ if enum['enum_name'] == name:
+ return enum
+ return None
+
+def is_enum(name):
+ return find_enum(name) != None
def c_type(name):
if name == 'str':
diff --git a/tests/qapi-schema/comments.out b/tests/qapi-schema/comments.out
index e3bd904..4ce3dcf 100644
--- a/tests/qapi-schema/comments.out
+++ b/tests/qapi-schema/comments.out
@@ -1,3 +1,3 @@
[OrderedDict([('enum', 'Status'), ('data', ['good', 'bad', 'ugly'])])]
-['Status']
+[{'enum_name': 'Status', 'enum_values': ['good', 'bad', 'ugly']}]
[]
diff --git a/tests/qapi-schema/qapi-schema-test.out
b/tests/qapi-schema/qapi-schema-test.out
index 89b53d4..01685d4 100644
--- a/tests/qapi-schema/qapi-schema-test.out
+++ b/tests/qapi-schema/qapi-schema-test.out
@@ -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')]))]),
--
1.8.1.4
- [Qemu-devel] [PULL for-2.0 00/11] QMP queue, Luiz Capitulino, 2014/03/11
- [Qemu-devel] [PULL 06/11] qapi script: use same function to generate enum string, Luiz Capitulino, 2014/03/11
- [Qemu-devel] [PULL 05/11] qapi script: code move for generate_enum_name(), Luiz Capitulino, 2014/03/11
- [Qemu-devel] [PULL 01/11] qapi script: remember explicitly defined enum values,
Luiz Capitulino <=
- [Qemu-devel] [PULL 02/11] qapi script: add check for duplicated key, Luiz Capitulino, 2014/03/11
- [Qemu-devel] [PULL 03/11] qapi script: remember line number in schema parsing, Luiz Capitulino, 2014/03/11
- [Qemu-devel] [PULL 08/11] qapi: convert BlockdevOptions to use enum discriminator, Luiz Capitulino, 2014/03/11
- [Qemu-devel] [PULL 10/11] qapi script: do not add "_" for every capitalized char in enum, Luiz Capitulino, 2014/03/11
- [Qemu-devel] [PULL 11/11] tests: test-qmp-commands: Fix double free, Luiz Capitulino, 2014/03/11
- [Qemu-devel] [PULL 07/11] qapi script: support enum type as discriminator in union, Luiz Capitulino, 2014/03/11
- [Qemu-devel] [PULL 04/11] qapi script: check correctness of union, Luiz Capitulino, 2014/03/11
- [Qemu-devel] [PULL 09/11] qapi script: do not allow string discriminator, Luiz Capitulino, 2014/03/11
- Re: [Qemu-devel] [PULL for-2.0 00/11] QMP queue, Peter Maydell, 2014/03/12