From 56326323e6579d4cde9802c684baba06acbdb1d2 Mon Sep 17 00:00:00 2001 From: "Carsey, Jaben" Date: Sat, 17 Mar 2018 07:27:46 +0800 Subject: [PATCH] BaseTools: remove local hex number regular expression Change to using the new shared hex number regular expression Cc: Yonghong Zhu Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jaben Carsey Reviewed-by: Yonghong Zhu --- BaseTools/Source/Python/Common/Expression.py | 3 +-- BaseTools/Source/Python/Common/RangeExpression.py | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py index 287dddfbbc..683604cab5 100644 --- a/BaseTools/Source/Python/Common/Expression.py +++ b/BaseTools/Source/Python/Common/Expression.py @@ -213,7 +213,6 @@ class ValueExpression(object): NonLetterOpLst = ['+', '-', '*', '/', '%', '&', '|', '^', '~', '<<', '>>', '!', '=', '>', '<', '?', ':'] 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("(" "\\$\([A-Z][A-Z0-9_]*\)|\\$\(\w+\.\w+\)|\w+\.\w+|" @@ -665,7 +664,7 @@ class ValueExpression(object): self._LiteralToken.endswith('}'): return True - if self.HexPattern.match(self._LiteralToken): + if gHexPattern.match(self._LiteralToken): Token = self._LiteralToken[2:] if not Token: self._LiteralToken = '0x0' diff --git a/BaseTools/Source/Python/Common/RangeExpression.py b/BaseTools/Source/Python/Common/RangeExpression.py index 540f957280..5fcc8a432a 100644 --- a/BaseTools/Source/Python/Common/RangeExpression.py +++ b/BaseTools/Source/Python/Common/RangeExpression.py @@ -210,7 +210,6 @@ class RangeExpression(object): NonLetterOpLst = ['+', '-', '&', '|', '^', '!', '=', '>', '<'] 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]+') @@ -219,7 +218,7 @@ class RangeExpression(object): # convert interval to object index. ex. 1 - 10 to a GUID expr = expr.strip() NumberDict = {} - for HexNumber in self.HexPattern.findall(expr): + for HexNumber in gHexPattern.findall(expr): Number = str(int(HexNumber, 16)) NumberDict[HexNumber] = Number for HexNum in NumberDict: @@ -624,7 +623,7 @@ class RangeExpression(object): self._LiteralToken.endswith('}'): return True - if self.HexPattern.match(self._LiteralToken): + if gHexPattern.match(self._LiteralToken): Token = self._LiteralToken[2:] Token = Token.lstrip('0') if not Token: -- 2.30.2