yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-12-23 10:15:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Separate REGEX of MACRO to groups

Browse source 
Seperate the REGEX into identifier, condition and value, into groups,
to behandled differently.
This commit is contained in:
Ron Eldor 2018-11-27 16:35:20 +02:00
parent a2579be8a0
commit 016f925b4c
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
tests/scripts/generate_test_code.py
View file

@ -184,7 +184,13 @@ BEGIN_CASE_REGEX = r'/\*\s*BEGIN_CASE\s*(?P<depends_on>.*?)\s*\*/'
END_CASE_REGEX = r'/\*\s*END_CASE\s*\*/' END_CASE_REGEX = r'/\*\s*END_CASE\s*\*/'
DEPENDENCY_REGEX = r'depends_on:(?P<dependencies>.*)' DEPENDENCY_REGEX = r'depends_on:(?P<dependencies>.*)'
C_IDENTIFIER_REGEX = r'!?[a-z_][a-z0-9_]*(([<>]=?|==)[0-9]*)?$' C_IDENTIFIER_REGEX = r'!?[a-z_][a-z0-9_]*'
CONDITION_OPERATOR_REGEX = r'[!=]=|[<>]=?'
# forbid 0ddd which might be accidentally octal or accidentally decimal
CONDITION_VALUE_REGEX = r'[-+]?(0x[0-9a-f]+|0|[1-9][0-9]*)'
CONDITION_REGEX = r'({})(?:\s*({})\s*({}))?$'.format(C_IDENTIFIER_REGEX,
CONDITION_OPERATOR_REGEX,
CONDITION_VALUE_REGEX)
TEST_FUNCTION_VALIDATION_REGEX = r'\s*void\s+(?P<func_name>\w+)\s*\(' TEST_FUNCTION_VALIDATION_REGEX = r'\s*void\s+(?P<func_name>\w+)\s*\('
INT_CHECK_REGEX = r'int\s+.*' INT_CHECK_REGEX = r'int\s+.*'
CHAR_CHECK_REGEX = r'char\s*\*\s*.*' CHAR_CHECK_REGEX = r'char\s*\*\s*.*'
@ -255,7 +261,6 @@ class FileWrapper(io.FileIO, object):
def split_dep(dep): def split_dep(dep):
""" """
Split NOT character '!' from dependency. Used by gen_dependencies() Split NOT character '!' from dependency. Used by gen_dependencies()
Determine condition MACRO and definition MACRO.
:param dep: Dependency list :param dep: Dependency list
:return: string tuple. Ex: ('!', MACRO) for !MACRO and ('', MACRO) for :return: string tuple. Ex: ('!', MACRO) for !MACRO and ('', MACRO) for
@ -384,7 +389,7 @@ def validate_dependency(dependency):
:return: input dependency stripped of leading & trailing white spaces. :return: input dependency stripped of leading & trailing white spaces.
""" """
dependency = dependency.strip() dependency = dependency.strip()
if not re.match(C_IDENTIFIER_REGEX, dependency, re.I): if not re.match(CONDITION_REGEX, dependency, re.I):
raise GeneratorInputError('Invalid dependency %s' % dependency) raise GeneratorInputError('Invalid dependency %s' % dependency)
return dependency return dependency
@ -732,19 +737,29 @@ def gen_dep_check(dep_id, dep):
raise GeneratorInputError("Dependency Id should be a positive " raise GeneratorInputError("Dependency Id should be a positive "
"integer.") "integer.")
_not, dep = ('!', dep[1:]) if dep[0] == '!' else ('', dep) _not, dep = ('!', dep[1:]) if dep[0] == '!' else ('', dep)
_defined = '' if re.search(r'(<=?|>=?|==)', dep) else 'defined'
if not dep: if not dep:
raise GeneratorInputError("Dependency should not be an empty string.") raise GeneratorInputError("Dependency should not be an empty string.")
dependency = re.match(CONDITION_REGEX, dep, re.I)
if not dependency:
raise GeneratorInputError('Invalid dependency %s' % dep)
_defined = '' if dependency.group(2) else 'defined'
_cond = dependency.group(2) if dependency.group(2) else ''
_value = dependency.group(3) if dependency.group(3) else ''
dep_check = ''' dep_check = '''
case {id}: case {id}:
{{ {{
#if {_not}{_defined}({macro}) #if {_not}{_defined}({macro}{_cond}{_value})
ret = DEPENDENCY_SUPPORTED; ret = DEPENDENCY_SUPPORTED;
#else #else
ret = DEPENDENCY_NOT_SUPPORTED; ret = DEPENDENCY_NOT_SUPPORTED;
#endif #endif
}} }}
break;'''.format(_not=_not, _defined=_defined, macro=dep, id=dep_id) break;'''.format(_not=_not, _defined=_defined,
macro=dependency.group(1), id=dep_id,
_cond=_cond, _value=_value)
return dep_check return dep_check