mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qapi: Move uppercase rejection to check_name_lower()

Browse Source 
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>
This commit is contained in:
Markus Armbruster 2021-03-23 10:40:08 +01:00
parent eaab06faa5
commit d224e0c092
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/qapi/expr.py
View File

@ -34,32 +34,31 @@ def check_name_is_str(name, info, source):
raise QAPISemError(info, "%s requires a string name" % source) raise QAPISemError(info, "%s requires a string name" % source)
def check_name_str(name, info, source, def check_name_str(name, info, source):
permit_upper=False):
# Reserve the entire 'q_' namespace for c_name(), and for 'q_empty' # Reserve the entire 'q_' namespace for c_name(), and for 'q_empty'
# and 'q_obj_*' implicit type names. # and 'q_obj_*' implicit type names.
match = valid_name.match(name) match = valid_name.match(name)
if not match or c_name(name, False).startswith('q_'): if not match or c_name(name, False).startswith('q_'):
raise QAPISemError(info, "%s has an invalid name" % source) 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) return match.group(3)
def check_name_upper(name, info, source): 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 # TODO reject '[a-z-]' in @stem
def check_name_lower(name, info, source, def check_name_lower(name, info, source,
permit_upper=False): 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 # TODO reject '_' in stem
def check_name_camel(name, info, source): 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 # TODO reject '[_-]' in stem, require CamelCase