qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, mdroth@linux.vnet.ibm.com, armbru@redhat.com,
	lcapitulino@redhat.com, Wenchao Xia <xiawenc@linux.vnet.ibm.com>
Subject: [Qemu-devel] [PATCH V5 04/10] qapi script: code move for generate_enum_name()
Date: Fri, 20 Dec 2013 13:23:10 +0800	[thread overview]
Message-ID: <1387516996-27531-5-git-send-email-xiawenc@linux.vnet.ibm.com> (raw)
In-Reply-To: <1387516996-27531-1-git-send-email-xiawenc@linux.vnet.ibm.com>

Later both qapi-types.py and qapi-visit.py need a common function
for enum name generation.

Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 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

  parent reply	other threads:[~2013-12-20  5:22 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-20  5:23 [Qemu-devel] [PATCH V5 00/10] qapi script: support enum as discriminator and better enum name Wenchao Xia
2013-12-20  5:23 ` [Qemu-devel] [PATCH V5 01/10] qapi script: remember enum values Wenchao Xia
2013-12-20  5:23 ` [Qemu-devel] [PATCH V5 02/10] qapi script: add check for duplicated key Wenchao Xia
2013-12-20  5:23 ` [Qemu-devel] [PATCH V5 03/10] qapi script: check correctness of discriminator values in union Wenchao Xia
2013-12-20  5:23 ` Wenchao Xia [this message]
2013-12-20  5:23 ` [Qemu-devel] [PATCH V5 05/10] qapi script: use same function to generate enum string Wenchao Xia
2013-12-20  5:23 ` [Qemu-devel] [PATCH V5 06/10] qapi script: support pre-defined enum type as discriminator in union Wenchao Xia
2013-12-20  5:23 ` [Qemu-devel] [PATCH V5 07/10] qapi: convert BlockdevOptions to use enum discriminator Wenchao Xia
2014-01-06  2:01   ` Wenchao Xia
2013-12-20  5:23 ` [Qemu-devel] [PATCH V5 08/10] qapi script: do not allow string discriminator Wenchao Xia
2013-12-20  5:23 ` [Qemu-devel] [PATCH V5 09/10] tests: add cases for inherited struct and union with discriminator Wenchao Xia
2013-12-20  5:23 ` [Qemu-devel] [PATCH V5 10/10] qapi script: do not add "_" for every capitalized char in enum Wenchao Xia
2014-01-13  9:11 ` [Qemu-devel] [PATCH V5 00/10] qapi script: support enum as discriminator and better enum name Kevin Wolf
2014-01-22  5:56   ` Wenchao Xia
2014-01-22 16:07 ` Luiz Capitulino
2014-01-28 16:02   ` Luiz Capitulino
2014-02-11  5:20     ` Wenchao Xia

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1387516996-27531-5-git-send-email-xiawenc@linux.vnet.ibm.com \
    --to=xiawenc@linux.vnet.ibm.com \
    --cc=armbru@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=lcapitulino@redhat.com \
    --cc=mdroth@linux.vnet.ibm.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).