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

BaseTools: remove local hex number regular expression

Browse Source 
Change to using the new shared hex number regular expression

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-17 07:27:46 +08:00
committed by Yonghong Zhu
parent 018f7b827f
commit 56326323e6
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,7 +213,6 @@ class ValueExpression(object):
NonLetterOpLst = ['+', '-', '*', '/', '%', '&', '|', '^', '~', '<<', '>>', '!', '=', '>', '<', '?', ':'] NonLetterOpLst = ['+', '-', '*', '/', '%', '&', '|', '^', '~', '<<', '>>', '!', '=', '>', '<', '?', ':']
PcdPattern = re.compile(r'[_a-zA-Z][0-9A-Za-z_]*\.[_a-zA-Z][0-9A-Za-z_]*$') PcdPattern = re.compile(r'[_a-zA-Z][0-9A-Za-z_]*\.[_a-zA-Z][0-9A-Za-z_]*$')
HexPattern = re.compile(r'0[xX][0-9a-fA-F]+$')
SymbolPattern = re.compile("(" SymbolPattern = re.compile("("
"\$\([A-Z][A-Z0-9_]*\)|\$\(\w+\.\w+\)|\w+\.\w+|" "\$\([A-Z][A-Z0-9_]*\)|\$\(\w+\.\w+\)|\w+\.\w+|"
@ -665,7 +664,7 @@ class ValueExpression(object):
self._LiteralToken.endswith('}'): self._LiteralToken.endswith('}'):
return True return True
if self.HexPattern.match(self._LiteralToken): if gHexPattern.match(self._LiteralToken):
Token = self._LiteralToken[2:] Token = self._LiteralToken[2:]
if not Token: if not Token:
self._LiteralToken = '0x0' self._LiteralToken = '0x0'

5
BaseTools/Source/Python/Common/RangeExpression.py
View File

@ -210,7 +210,6 @@ class RangeExpression(object):
NonLetterOpLst = ['+', '-', '&', '|', '^', '!', '=', '>', '<'] NonLetterOpLst = ['+', '-', '&', '|', '^', '!', '=', '>', '<']
PcdPattern = re.compile(r'[_a-zA-Z][0-9A-Za-z_]*\.[_a-zA-Z][0-9A-Za-z_]*$') PcdPattern = re.compile(r'[_a-zA-Z][0-9A-Za-z_]*\.[_a-zA-Z][0-9A-Za-z_]*$')
HexPattern = re.compile(r'0[xX][0-9a-fA-F]+')
RangePattern = re.compile(r'[0-9]+ - [0-9]+') RangePattern = re.compile(r'[0-9]+ - [0-9]+')
@ -219,7 +218,7 @@ class RangeExpression(object):
# convert interval to object index. ex. 1 - 10 to a GUID # convert interval to object index. ex. 1 - 10 to a GUID
expr = expr.strip() expr = expr.strip()
NumberDict = {} NumberDict = {}
for HexNumber in self.HexPattern.findall(expr): for HexNumber in gHexPattern.findall(expr):
Number = str(int(HexNumber, 16)) Number = str(int(HexNumber, 16))
NumberDict[HexNumber] = Number NumberDict[HexNumber] = Number
for HexNum in NumberDict: for HexNum in NumberDict:
@ -624,7 +623,7 @@ class RangeExpression(object):
self._LiteralToken.endswith('}'): self._LiteralToken.endswith('}'):
return True return True
if self.HexPattern.match(self._LiteralToken): if gHexPattern.match(self._LiteralToken):
Token = self._LiteralToken[2:] Token = self._LiteralToken[2:]
Token = Token.lstrip('0') Token = Token.lstrip('0')
if not Token: if not Token: