From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45694) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WL1px-0005Og-4s for qemu-devel@nongnu.org; Tue, 04 Mar 2014 21:45:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WL1pq-0007uD-F8 for qemu-devel@nongnu.org; Tue, 04 Mar 2014 21:45:36 -0500 Received: from mail-pb0-x22c.google.com ([2607:f8b0:400e:c01::22c]:36076) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WL1pq-0007u7-8P for qemu-devel@nongnu.org; Tue, 04 Mar 2014 21:45:30 -0500 Received: by mail-pb0-f44.google.com with SMTP id rp16so433457pbb.3 for ; Tue, 04 Mar 2014 18:45:29 -0800 (PST) From: Wenchao Xia Date: Tue, 4 Mar 2014 18:44:35 -0800 Message-Id: <1393987480-37579-6-git-send-email-wenchaoqemu@gmail.com> In-Reply-To: <1393987480-37579-1-git-send-email-wenchaoqemu@gmail.com> References: <1393987480-37579-1-git-send-email-wenchaoqemu@gmail.com> Subject: [Qemu-devel] [PATCH V9 05/10] qapi script: code move for generate_enum_name() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, Wenchao Xia , mdroth@linux.vnet.ibm.com, armbru@redhat.com, lcapitulino@redhat.com Later both qapi-types.py and qapi-visit.py need a common function for enum name generation. Signed-off-by: Wenchao Xia Reviewed-by: Eric Blake --- 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 2c6e0dc..35ad993 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 f1ca5b6..0de9fe2 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -467,3 +467,13 @@ def guardend(name): ''', name=guardname(name)) + +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