sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools: Expression refactor function

Browse Source 
The function is about C Names, not C Strings.
Move the re.compile outside the function call

Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
Carsey, Jaben
2018-03-14 07:11:32 +08:00
committed by Yonghong Zhu
parent ae4cc2b084
commit 1f901a89f0
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
BaseTools/Source/Python/Common/Expression.py
View File

@ -40,6 +40,8 @@ ERR_ARRAY_ELE = 'This must be HEX value for NList or Array: [%s].'
ERR_EMPTY_EXPR = 'Empty expression is not allowed.' ERR_EMPTY_EXPR = 'Empty expression is not allowed.'
ERR_IN_OPERAND = 'Macro after IN operator can only be: $(FAMILY), $(ARCH), $(TOOL_CHAIN_TAG) and $(TARGET).' ERR_IN_OPERAND = 'Macro after IN operator can only be: $(FAMILY), $(ARCH), $(TOOL_CHAIN_TAG) and $(TARGET).'
__ValidString = re.compile(r'[_a-zA-Z][_0-9a-zA-Z]*$')
## SplitString ## SplitString
# Split string to list according double quote # Split string to list according double quote
# For example: abc"de\"f"ghi"jkl"mn will be: ['abc', '"de\"f"', 'ghi', '"jkl"', 'mn'] # For example: abc"de\"f"ghi"jkl"mn will be: ['abc', '"de\"f"', 'ghi', '"jkl"', 'mn']
@ -117,11 +119,8 @@ def SplitPcdValueString(String):
RetList.append(Item) RetList.append(Item)
return RetList return RetList
def IsValidCString(Str): def IsValidCName(Str):
ValidString = re.compile(r'[_a-zA-Z][_0-9a-zA-Z]*$') return True if __ValidString.match(Str) else False
if not ValidString.match(Str):
return False
return True
def BuildOptionValue(PcdValue, GuidDict): def BuildOptionValue(PcdValue, GuidDict):
IsArray = False IsArray = False
@ -912,7 +911,7 @@ class ValueExpressionEx(ValueExpression):
Item = Item.strip() Item = Item.strip()
if LabelList: if LabelList:
for Label in LabelList: for Label in LabelList:
if not IsValidCString(Label): if not IsValidCName(Label):
raise BadExpression('%s is not a valid c variable name' % Label) raise BadExpression('%s is not a valid c variable name' % Label)
if Label not in LabelDict.keys(): if Label not in LabelDict.keys():
LabelDict[Label] = str(LabelOffset) LabelDict[Label] = str(LabelOffset)