From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42723) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WIyrR-0002sV-GC for qemu-devel@nongnu.org; Thu, 27 Feb 2014 06:10:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WIyrM-00068I-5X for qemu-devel@nongnu.org; Thu, 27 Feb 2014 06:10:41 -0500 Received: from mail-pd0-x235.google.com ([2607:f8b0:400e:c02::235]:50121) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WIyrL-000677-Lu for qemu-devel@nongnu.org; Thu, 27 Feb 2014 06:10:36 -0500 Received: by mail-pd0-f181.google.com with SMTP id p10so2285289pdj.40 for ; Thu, 27 Feb 2014 03:10:34 -0800 (PST) From: Wenchao Xia Date: Thu, 27 Feb 2014 03:09:31 -0800 Message-Id: <1393499376-4374-6-git-send-email-wenchaoqemu@gmail.com> In-Reply-To: <1393499376-4374-1-git-send-email-wenchaoqemu@gmail.com> References: <1393499376-4374-1-git-send-email-wenchaoqemu@gmail.com> Subject: [Qemu-devel] [PATCH V8 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, Wenchao Xia From: Wenchao Xia 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 Signed-off-by: Wenchao Xia --- 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 cea346f..dadf5a5 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -485,3 +485,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