From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40688) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdixC-0002k1-Dt for qemu-devel@nongnu.org; Thu, 02 Apr 2015 13:30:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ydix9-00006w-0l for qemu-devel@nongnu.org; Thu, 02 Apr 2015 13:30:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57521) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydix8-00006T-NL for qemu-devel@nongnu.org; Thu, 02 Apr 2015 13:30:50 -0400 From: Markus Armbruster Date: Thu, 2 Apr 2015 19:28:47 +0200 Message-Id: <1427995743-7865-4-git-send-email-armbru@redhat.com> In-Reply-To: <1427995743-7865-1-git-send-email-armbru@redhat.com> References: <1427995743-7865-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH RFC 03/19] qapi: Rename _generate_enum_string() to camel_to_upper() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, berto@igalia.com, akong@redhat.com, mdroth@linux.vnet.ibm.com Signed-off-by: Markus Armbruster --- scripts/qapi.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 6d102df..a154272 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -477,7 +477,7 @@ def check_union(expr, expr_info): # Otherwise, check for conflicts in the generated enum else: - c_key = _generate_enum_string(key) + c_key = camel_to_upper(key) if c_key in values: raise QAPIExprError(expr_info, "Union '%s' member '%s' clashes with '%s'" @@ -495,7 +495,7 @@ def check_alternate(expr, expr_info): check_name(expr_info, "Member of alternate '%s'" % name, key) # Check for conflicts in the generated enum - c_key = _generate_enum_string(key) + c_key = camel_to_upper(key) if c_key in values: raise QAPIExprError(expr_info, "Alternate '%s' member '%s' clashes with '%s'" @@ -529,7 +529,7 @@ def check_enum(expr, expr_info): raise QAPIExprError(expr_info, "Enum '%s' member '%s' is not a string" % (name, member)) - key = _generate_enum_string(member) + key = camel_to_upper(member) if key in values: raise QAPIExprError(expr_info, "Enum '%s' member '%s' clashes with '%s'" @@ -886,7 +886,7 @@ def guardend(name): # ENUMName -> ENUM_NAME, EnumName1 -> ENUM_NAME1 # ENUM_NAME -> ENUM_NAME, ENUM_NAME1 -> ENUM_NAME1, ENUM_Name2 -> ENUM_NAME2 # ENUM24_Name -> ENUM24_NAME -def _generate_enum_string(value): +def camel_to_upper(value): c_fun_str = c_fun(value, False) if value.isupper(): return c_fun_str @@ -906,6 +906,6 @@ def _generate_enum_string(value): return new_name.lstrip('_').upper() def generate_enum_full_value(enum_name, enum_value): - abbrev_string = _generate_enum_string(enum_name) - value_string = _generate_enum_string(enum_value) + abbrev_string = camel_to_upper(enum_name) + value_string = camel_to_upper(enum_value) return "%s_%s" % (abbrev_string, value_string) -- 1.9.3