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

BaseTools: refactor repeated RegExp when no special searching is needed.

Browse Source 
use str.replace and try/except.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@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-27 08:33:08 +08:00
committed by Yonghong Zhu
parent e52aed0d85
commit cc0321f22a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -936,12 +936,13 @@ class ValueExpressionEx(ValueExpression):
OffsetList = _ReOffset.findall(Item) OffsetList = _ReOffset.findall(Item)
except: except:
pass pass
# replace each offset, except errors
for Offset in OffsetList: for Offset in OffsetList:
if Offset in LabelDict.keys(): try:
Re = re.compile('OFFSET_OF\(%s\)' % Offset) Item = Item.replace('OFFSET_OF({})'.format(Offset),LabelDict[Offset])
Item = Re.sub(LabelDict[Offset], Item) except:
else:
raise BadExpression('%s not defined' % Offset) raise BadExpression('%s not defined' % Offset)
NewPcdValueList.append(Item) NewPcdValueList.append(Item)
AllPcdValueList = [] AllPcdValueList = []