X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=BaseTools%2FSource%2FPython%2FCommon%2FRangeExpression.py;h=5fcc8a432a565a2bc88947175fc03769f45ff60c;hp=540f95728072b8b8666e56e0eff757ae11753104;hb=56326323e6579d4cde9802c684baba06acbdb1d2;hpb=018f7b827fa4def3476f76cdf1d6400d4a8e6ebc 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: