tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BaseTools: Workspace - refactor RegEx to minimize multiple compiling 

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-04-20 23:51:24 +08:00 committed by Yonghong Zhu
parent ef42ef7e6d
commit 3e4faa268e
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BaseTools/Source/Python/Workspace/DscBuildData.py
View File

@ -89,6 +89,8 @@ MAKEROOT ?= $(EDK_TOOLS_PATH)/Source/C
LIBS = -lCommon LIBS = -lCommon
''' '''
variablePattern = re.compile(r'[\t\s]*0[xX][a-fA-F0-9]+$')
## regular expressions for finding decimal and hex numbers ## regular expressions for finding decimal and hex numbers
Pattern = re.compile('^[1-9]\d*|0$') Pattern = re.compile('^[1-9]\d*|0$')
HexPattern = re.compile(r'0[xX][0-9a-fA-F]+$') HexPattern = re.compile(r'0[xX][0-9a-fA-F]+$')
@ -2415,7 +2417,7 @@ class DscBuildData(PlatformBuildClassObject):
if VariableOffset.isdigit(): if VariableOffset.isdigit():
if int(VariableOffset, 10) > 0xFFFF: if int(VariableOffset, 10) > 0xFFFF:
ExceedMax = True ExceedMax = True
elif re.match(r'[\t\s]*0[xX][a-fA-F0-9]+$', VariableOffset): elif variablePattern.match(VariableOffset):
if int(VariableOffset, 16) > 0xFFFF: if int(VariableOffset, 16) > 0xFFFF:
ExceedMax = True ExceedMax = True
# For Offset written in "A.B" # For Offset written in "A.B"

8
BaseTools/Source/Python/Workspace/MetaFileParser.py
View File

@ -35,6 +35,10 @@ from Common.LongFilePathSupport import OpenLongFilePath as open
from MetaFileTable import MetaFileStorage from MetaFileTable import MetaFileStorage
from MetaFileCommentParser import CheckInfComment from MetaFileCommentParser import CheckInfComment
## RegEx for finding file versions
hexVersionPattern = re.compile(r'0[xX][\da-f-A-F]{5,8}')
decVersionPattern = re.compile(r'\d+\.\d+')
## A decorator used to parse macro definition ## A decorator used to parse macro definition
def ParseMacro(Parser): def ParseMacro(Parser):
def MacroParser(self): def MacroParser(self):
@ -366,9 +370,9 @@ class MetaFileParser(object):
EdkLogger.error("Parser", FORMAT_INVALID, "%s not defined" % (Macro), ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1) EdkLogger.error("Parser", FORMAT_INVALID, "%s not defined" % (Macro), ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1)
# Sometimes, we need to make differences between EDK and EDK2 modules # Sometimes, we need to make differences between EDK and EDK2 modules
if Name == 'INF_VERSION': if Name == 'INF_VERSION':
if re.match(r'0[xX][\da-f-A-F]{5,8}', Value): if hexVersionPattern.match(Value):
self._Version = int(Value, 0) self._Version = int(Value, 0)
elif re.match(r'\d+\.\d+', Value): elif decVersionPattern.match(Value):
ValueList = Value.split('.') ValueList = Value.split('.')
Major = '%04o' % int(ValueList[0], 0) Major = '%04o' % int(ValueList[0], 0)
Minor = '%04o' % int(ValueList[1], 0) Minor = '%04o' % int(ValueList[1], 0)