From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41846) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNMw9-0000Ar-GR for qemu-devel@nongnu.org; Tue, 11 Mar 2014 09:41:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WNMw4-00068u-Nd for qemu-devel@nongnu.org; Tue, 11 Mar 2014 09:41:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13207) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNMw4-00068n-Fv for qemu-devel@nongnu.org; Tue, 11 Mar 2014 09:41:36 -0400 From: Luiz Capitulino Date: Tue, 11 Mar 2014 09:41:05 -0400 Message-Id: <1394545271-27573-6-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1394545271-27573-1-git-send-email-lcapitulino@redhat.com> References: <1394545271-27573-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PULL 05/11] qapi script: code move for generate_enum_name() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: qemu-devel@nongnu.org, anthony@codemonkey.ws 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 Reviewed-by: Markus Armbruster Signed-off-by: Luiz Capitulino --- 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.8.1.4