[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V2 4/8] qapi script: code move for generate_enum_nam
From: |
Wenchao Xia |
Subject: |
[Qemu-devel] [PATCH V2 4/8] qapi script: code move for generate_enum_name() |
Date: |
Wed, 13 Nov 2013 06:25:04 +0800 |
Later both qapi-types.py and qapi-visit.py need a common function
for enum name generation.
Signed-off-by: Wenchao Xia <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
scripts/qapi-types.py | 10 ----------
scripts/qapi.py | 10 ++++++++++
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py
index 4a1652b..88bf76a 100644
--- a/scripts/qapi-types.py
+++ b/scripts/qapi-types.py
@@ -127,16 +127,6 @@ const char *%(name)s_lookup[] = {
''')
return ret
-def generate_enum_name(name):
- if name.isupper():
- return c_fun(name, False)
- new_name = ''
- for c in c_fun(name, False):
- if c.isupper():
- new_name += '_'
- new_name += c
- return new_name.lstrip('_').upper()
-
def generate_enum(name, values):
lookup_decl = mcgen('''
extern const char *%(name)s_lookup[];
diff --git a/scripts/qapi.py b/scripts/qapi.py
index 3f50d52..0e4e9d7 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -416,3 +416,13 @@ def discriminator_find_enum_define(expr):
% discriminator)
return find_enum(discriminator_type)
+
+def generate_enum_name(name):
+ if name.isupper():
+ return c_fun(name, False)
+ new_name = ''
+ for c in c_fun(name, False):
+ if c.isupper():
+ new_name += '_'
+ new_name += c
+ return new_name.lstrip('_').upper()
--
1.7.1
- [Qemu-devel] [PATCH V2 0/8] qapi script: support enum as discriminator and better enum name, Wenchao Xia, 2013/11/13
- [Qemu-devel] [PATCH V2 2/8] qapi script: add check for duplicated key, Wenchao Xia, 2013/11/13
- [Qemu-devel] [PATCH V2 5/8] qapi script: use same function to generate enum string, Wenchao Xia, 2013/11/13
- [Qemu-devel] [PATCH V2 1/8] qapi script: remember enum values, Wenchao Xia, 2013/11/13
- [Qemu-devel] [PATCH V2 3/8] qapi script: check correctness of discriminator values in union, Wenchao Xia, 2013/11/13
- [Qemu-devel] [PATCH V2 7/8] qapi script: do not add "_" for every capitalized char in enum, Wenchao Xia, 2013/11/13
- [Qemu-devel] [PATCH V2 4/8] qapi script: code move for generate_enum_name(),
Wenchao Xia <=
- [Qemu-devel] [PATCH V2 6/8] qapi script: not generate hidden enum type for pre-defined enum discriminator, Wenchao Xia, 2013/11/13
- [Qemu-devel] [PATCH V2 8/8] tests: add cases for inherited struct and union with discriminator, Wenchao Xia, 2013/11/13
- Re: [Qemu-devel] [PATCH V2 0/8] qapi script: support enum as discriminator and better enum name, Wenchao Xia, 2013/11/13
- Re: [Qemu-devel] [PATCH V2 0/8] qapi script: support enum as discriminator and better enum name, Luiz Capitulino, 2013/11/25
- Re: [Qemu-devel] [PATCH V2 0/8] qapi script: support enum as discriminator and better enum name, Kevin Wolf, 2013/11/28