BaseTools: remove local hex number regular expression

[mirror_edk2.git] / BaseTools / Source / Python / Common / RangeExpression.py

diff --git a/BaseTools/Source/Python/Common/RangeExpression.py b/BaseTools/Source/Python/Common/RangeExpression.py
index 540f95728072b8b8666e56e0eff757ae11753104..5fcc8a432a565a2bc88947175fc03769f45ff60c 100644 (file)
--- a/BaseTools/Source/Python/Common/RangeExpression.py
+++ b/BaseTools/Source/Python/Common/RangeExpression.py
@@ -210,7 +210,6 @@ class RangeExpression(object):
     NonLetterOpLst = ['+', '-', '&', '|', '^', '!', '=', '>', '<']\r
 \r
     PcdPattern = re.compile(r'[_a-zA-Z][0-9A-Za-z_]*\.[_a-zA-Z][0-9A-Za-z_]*$')\r
     NonLetterOpLst = ['+', '-', '&', '|', '^', '!', '=', '>', '<']\r
 \r
     PcdPattern = re.compile(r'[_a-zA-Z][0-9A-Za-z_]*\.[_a-zA-Z][0-9A-Za-z_]*$')\r

-    HexPattern = re.compile(r'0[xX][0-9a-fA-F]+')\r

     \r
     RangePattern = re.compile(r'[0-9]+ - [0-9]+')\r
 \r
     \r
     RangePattern = re.compile(r'[0-9]+ - [0-9]+')\r
 \r


@@ -219,7 +218,7 @@ class RangeExpression(object):
         # convert interval to object index. ex. 1 - 10 to a GUID\r
         expr = expr.strip()\r
         NumberDict = {}\r
         # convert interval to object index. ex. 1 - 10 to a GUID\r
         expr = expr.strip()\r
         NumberDict = {}\r

-        for HexNumber in self.HexPattern.findall(expr):\r
+        for HexNumber in gHexPattern.findall(expr):\r

             Number = str(int(HexNumber, 16))\r
             NumberDict[HexNumber] = Number\r
         for HexNum in NumberDict:\r
             Number = str(int(HexNumber, 16))\r
             NumberDict[HexNumber] = Number\r
         for HexNum in NumberDict:\r


@@ -624,7 +623,7 @@ class RangeExpression(object):
             self._LiteralToken.endswith('}'):\r
             return True\r
 \r
             self._LiteralToken.endswith('}'):\r
             return True\r
 \r

-        if self.HexPattern.match(self._LiteralToken):\r
+        if gHexPattern.match(self._LiteralToken):\r

             Token = self._LiteralToken[2:]\r
             Token = Token.lstrip('0')\r
             if not Token:\r
             Token = self._LiteralToken[2:]\r
             Token = Token.lstrip('0')\r
             if not Token:\r