Factor out is_internal_name as a separate method

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2021-01-25 22:41:45 +01:00
parent e7c445542d
commit f8deb759ba

View file

@ -35,6 +35,10 @@ class PSAMacroCollector:
self.algorithms_from_hash = {} self.algorithms_from_hash = {}
self.key_usages = set() self.key_usages = set()
def is_internal_name(self, name):
"""Whether this is an internal macro. Internal macros will be skipped."""
return name.endswith('_FLAG') or name.endswith('MASK')
# "#define" followed by a macro name with either no parameters # "#define" followed by a macro name with either no parameters
# or a single parameter and a non-empty expansion. # or a single parameter and a non-empty expansion.
# Grab the macro name in group 1, the parameter name if any in group 2 # Grab the macro name in group 1, the parameter name if any in group 2
@ -60,7 +64,7 @@ class PSAMacroCollector:
# backward compatibility aliases that share # backward compatibility aliases that share
# numerical values with non-deprecated values. # numerical values with non-deprecated values.
return return
if name.endswith('_FLAG') or name.endswith('MASK'): if self.is_internal_name(name):
# Macro only to build actual values # Macro only to build actual values
return return
elif (name.startswith('PSA_ERROR_') or name == 'PSA_SUCCESS') \ elif (name.startswith('PSA_ERROR_') or name == 'PSA_SUCCESS') \