[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/26] qapi: Rename _generate_enum_string() to camel_
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 05/26] qapi: Rename _generate_enum_string() to camel_to_upper() |
Date: |
Fri, 15 May 2015 10:24:31 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Eric Blake <address@hidden>
---
scripts/qapi.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/scripts/qapi.py b/scripts/qapi.py
index a4701ca..7330f7c 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -538,7 +538,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'"
@@ -556,7 +556,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'"
@@ -587,7 +587,7 @@ def check_enum(expr, expr_info):
for member in members:
check_name(expr_info, "Member of enum '%s'" %name, member,
enum_member=True)
- 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'"
@@ -941,7 +941,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_name(value, False)
if value.isupper():
return c_fun_str
@@ -961,6 +961,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
- [Qemu-devel] [PULL 00/26] qapi: Fix qapi mangling of downstream names, and more, Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 02/26] doc: fix qmp event type, Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 08/26] qapi: Use c_enum_const() in generate_alternate_qtypes(), Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 01/26] qmp: Add qom_path field to query-cpus command, Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 07/26] qapi: Simplify c_enum_const(), Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 05/26] qapi: Rename _generate_enum_string() to camel_to_upper(),
Markus Armbruster <=
- [Qemu-devel] [PULL 06/26] qapi: Rename generate_enum_full_value() to c_enum_const(), Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 14/26] qapi: Support downstream simple unions, Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 03/26] qapi: Fix C identifiers generated for names containing '.', Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 18/26] tests: Add missing dependencies on $(qapi-py), Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 26/26] qapi: Inline gen_command_decl_prologue(), gen_command_def_prologue(), Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 25/26] qapi: Drop pointless flush() before close(), Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 20/26] qapi: qapi-commands.py option --type is unused, drop it, Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 11/26] qapi: Make c_type() consistently convert qapi names, Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 19/26] qapi: qapi-event.py option -b does nothing, drop it, Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 04/26] qapi: Rename identical c_fun()/c_var() into c_name(), Markus Armbruster, 2015/05/15