[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC 03/19] qapi: Rename _generate_enum_string() to c
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH RFC 03/19] qapi: Rename _generate_enum_string() to camel_to_upper() |
Date: |
Thu, 2 Apr 2015 19:28:47 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
---
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
- [Qemu-devel] [PATCH RFC 16/19] qobject: Clean up around qtype_code, (continued)
- [Qemu-devel] [PATCH RFC 16/19] qobject: Clean up around qtype_code, Markus Armbruster, 2015/04/02
- [Qemu-devel] [PATCH RFC 13/19] qapi: Factor open_output(), close_output() out of generators, Markus Armbruster, 2015/04/02
- [Qemu-devel] [PATCH RFC 10/19] qapi: Factor parse_command_line() out of the generators, Markus Armbruster, 2015/04/02
- [Qemu-devel] [PATCH RFC 11/19] qapi: Fix generators to report command line errors decently, Markus Armbruster, 2015/04/02
- [Qemu-devel] [PATCH RFC 04/19] qapi: Rename generate_enum_full_value() to c_enum_const(), Markus Armbruster, 2015/04/02
- [Qemu-devel] [PATCH RFC 03/19] qapi: Rename _generate_enum_string() to camel_to_upper(),
Markus Armbruster <=
- [Qemu-devel] [PATCH RFC 05/19] qapi: Simplify c_enum_const(), Markus Armbruster, 2015/04/02
- [Qemu-devel] [PATCH RFC 01/19] tests: Add missing dependencies on $(qapi-py), Markus Armbruster, 2015/04/02
- [Qemu-devel] [PATCH RFC 08/19] qapi: qapi-event.py option -b does nothing, drop it, Markus Armbruster, 2015/04/02
- [Qemu-devel] [PATCH RFC 02/19] qapi: Fix C identifiers generated for names containing '.', Markus Armbruster, 2015/04/02