[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/29] qapi: Lift enum-specific code out of check_name_str()
From: |
Markus Armbruster |
Subject: |
[PULL 09/29] qapi: Lift enum-specific code out of check_name_str() |
Date: |
Tue, 23 Mar 2021 22:56:38 +0100 |
check_name_str() masks leading digits when passed enum_member=True.
Only check_enum() does. Lift the masking into check_enum().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210323094025.3569441-10-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
scripts/qapi/expr.py | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py
index 507550c340..e00467636c 100644
--- a/scripts/qapi/expr.py
+++ b/scripts/qapi/expr.py
@@ -34,18 +34,11 @@ def check_name_is_str(name, info, source):
def check_name_str(name, info, source,
- enum_member=False,
permit_upper=False):
- membername = name
-
- # Enum members can start with a digit, because the generated C
- # code always prefixes it with the enum name
- if enum_member and membername[0].isdigit():
- membername = 'D' + membername
# Reserve the entire 'q_' namespace for c_name(), and for 'q_empty'
# and 'q_obj_*' implicit type names.
- if not valid_name.match(membername) or \
- c_name(membername, False).startswith('q_'):
+ if not valid_name.match(name) or \
+ c_name(name, False).startswith('q_'):
raise QAPISemError(info, "%s has an invalid name" % source)
if not permit_upper and name.lower() != name:
raise QAPISemError(
@@ -213,11 +206,15 @@ def check_enum(expr, info):
for m in members]
for member in members:
source = "'data' member"
+ member_name = member['name']
check_keys(member, info, source, ['name'], ['if'])
- check_name_is_str(member['name'], info, source)
- source = "%s '%s'" % (source, member['name'])
- check_name_str(member['name'], info, source,
- enum_member=True, permit_upper=permit_upper)
+ check_name_is_str(member_name, info, source)
+ source = "%s '%s'" % (source, member_name)
+ # Enum members may start with a digit
+ if member_name[0].isdigit():
+ member_name = 'd' + member_name # Hack: hide the digit
+ check_name_str(member_name, info, source,
+ permit_upper=permit_upper)
check_if(member, info, source)
--
2.26.3
- [PULL 04/29] tests/qapi-schema: Belatedly update comment on alternate clash, (continued)
- [PULL 04/29] tests/qapi-schema: Belatedly update comment on alternate clash, Markus Armbruster, 2021/03/23
- [PULL 18/29] tests/qapi-schema: Rename returns-whitelist to returns-bad-type, Markus Armbruster, 2021/03/23
- [PULL 14/29] qapi: Enforce type naming rules, Markus Armbruster, 2021/03/23
- [PULL 15/29] tests/qapi-schema: Rename redefined-builtin to redefined-predefined, Markus Armbruster, 2021/03/23
- [PULL 23/29] qapi: Enforce feature naming rules, Markus Armbruster, 2021/03/23
- [PULL 21/29] tests-qmp-cmds: Drop unused and incorrect qmp_TestIfCmd(), Markus Armbruster, 2021/03/23
- [PULL 12/29] qapi: Consistently permit any case in downstream prefixes, Markus Armbruster, 2021/03/23
- [PULL 16/29] qapi: Factor out QAPISchemaParser._check_pragma_list_of_str(), Markus Armbruster, 2021/03/23
- [PULL 28/29] qapi: Enforce union and alternate branch naming rules, Markus Armbruster, 2021/03/23
- [PULL 17/29] tests/qapi-schema: Rename pragma-*-crap to pragma-value-not-*, Markus Armbruster, 2021/03/23
- [PULL 09/29] qapi: Lift enum-specific code out of check_name_str(),
Markus Armbruster <=
- [PULL 13/29] qapi: Enforce event naming rules, Markus Armbruster, 2021/03/23
- [PULL 29/29] block: Remove monitor command block_passwd, Markus Armbruster, 2021/03/23
- [PULL 22/29] qapi: Prepare for rejecting underscore in command and member names, Markus Armbruster, 2021/03/23
- [PULL 08/29] qapi: Permit flat union members for any tag value, Markus Armbruster, 2021/03/23
- [PULL 24/29] qapi: Enforce command naming rules, Markus Armbruster, 2021/03/23
- [PULL 20/29] qapi/pragma: Streamline comments on member-name-exceptions, Markus Armbruster, 2021/03/23
- [PULL 11/29] qapi: Move uppercase rejection to check_name_lower(), Markus Armbruster, 2021/03/23
- [PULL 10/29] qapi: Rework name checking in preparation of stricter checking, Markus Armbruster, 2021/03/23
- [PULL 26/29] qapi: Enforce struct member naming rules, Markus Armbruster, 2021/03/23
- [PULL 25/29] tests/qapi-schema: Switch member name clash test to struct, Markus Armbruster, 2021/03/23