From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33583) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdcBH-0004zS-PQ for qemu-devel@nongnu.org; Tue, 05 Nov 2013 03:40:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VdcB9-0002Z0-2v for qemu-devel@nongnu.org; Tue, 05 Nov 2013 03:40:11 -0500 Received: from e28smtp02.in.ibm.com ([122.248.162.2]:50880) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdcB8-0002QY-D7 for qemu-devel@nongnu.org; Tue, 05 Nov 2013 03:40:03 -0500 Received: from /spool/local by e28smtp02.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 5 Nov 2013 14:09:58 +0530 Received: from d28relay04.in.ibm.com (d28relay04.in.ibm.com [9.184.220.61]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id E91D5E0059 for ; Tue, 5 Nov 2013 14:11:39 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay04.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id rA58dpWF43188416 for ; Tue, 5 Nov 2013 14:09:51 +0530 Received: from d28av02.in.ibm.com (localhost [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id rA58ds9K015918 for ; Tue, 5 Nov 2013 14:09:54 +0530 From: Wenchao Xia Date: Tue, 5 Nov 2013 08:37:34 +0800 Message-Id: <1383611860-9053-5-git-send-email-xiawenc@linux.vnet.ibm.com> In-Reply-To: <1383611860-9053-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1383611860-9053-1-git-send-email-xiawenc@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH RFC 04/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, armbru@redhat.com, lcapitulino@redhat.com, pbonzini@redhat.com, Wenchao Xia Later both qapi-types.py and qapi-visit.py need a common function for enum name generation. 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 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 235df4f..9e2dd70 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -416,3 +416,13 @@ def descriminator_find_enum_define(expr): sys.exit(1) return find_enum(descriminator_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