[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/29] qapi: Move uppercase rejection to check_name_lower()
From: |
Markus Armbruster |
Subject: |
[PULL 11/29] qapi: Move uppercase rejection to check_name_lower() |
Date: |
Tue, 23 Mar 2021 22:56:40 +0100 |
check_name_lower() is the only user of check_name_str() using
permit_upper=False. Move the associated code from check_name_str() to
check_name_lower(), and drop the parameter.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210323094025.3569441-12-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
scripts/qapi/expr.py | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py
index 30285fe334..a815060ee2 100644
--- a/scripts/qapi/expr.py
+++ b/scripts/qapi/expr.py
@@ -34,32 +34,31 @@ def check_name_is_str(name, info, source):
raise QAPISemError(info, "%s requires a string name" % source)
-def check_name_str(name, info, source,
- permit_upper=False):
+def check_name_str(name, info, source):
# Reserve the entire 'q_' namespace for c_name(), and for 'q_empty'
# and 'q_obj_*' implicit type names.
match = valid_name.match(name)
if not match 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(
- info, "%s uses uppercase in name" % source)
return match.group(3)
def check_name_upper(name, info, source):
- stem = check_name_str(name, info, source, permit_upper=True)
+ stem = check_name_str(name, info, source)
# TODO reject '[a-z-]' in @stem
def check_name_lower(name, info, source,
permit_upper=False):
- stem = check_name_str(name, info, source, permit_upper)
+ stem = check_name_str(name, info, source)
+ if not permit_upper and name.lower() != name:
+ raise QAPISemError(
+ info, "%s uses uppercase in name" % source)
# TODO reject '_' in stem
def check_name_camel(name, info, source):
- stem = check_name_str(name, info, source, permit_upper=True)
+ stem = check_name_str(name, info, source)
# TODO reject '[_-]' in stem, require CamelCase
--
2.26.3
- [PULL 16/29] qapi: Factor out QAPISchemaParser._check_pragma_list_of_str(), (continued)
- [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, 2021/03/23
- [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 <=
- [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
- [PULL 27/29] qapi: Enforce enum member naming rules, Markus Armbruster, 2021/03/23
- [PULL 19/29] qapi: Rename pragma *-whitelist to *-exceptions, Markus Armbruster, 2021/03/23
- Re: [PULL 00/29] QAPI patches patches for 2021-03-23, Peter Maydell, 2021/03/23