BaseTools: GenFds - simplify testing for Hex number

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>

2 files changed, 2 insertions, 8 deletions

diff --git a/BaseTools/Source/Python/Common/GlobalData.py b/BaseTools/Source/Python/Common/GlobalData.py
index f58dc5a8dd..e3131b86cc 100644
--- a/BaseTools/Source/Python/Common/GlobalData.py
+++ b/BaseTools/Source/Python/Common/GlobalData.py
@@ -62,6 +62,7 @@ gGuidPatternEnd = re.compile(r'{}$'.format(_GuidPattern))
 ## Regular expressions for HEX matching

 g4HexChar = re.compile(r'{}{{4}}'.format(_HexChar))

 gHexPattern = re.compile(r'0[xX]{}+'.format(_HexChar))

+gHexPatternAll = re.compile(r'0[xX]{}+$'.format(_HexChar))

 

 ## Regular expressions for string identifier checking

 gIdentifierPattern = re.compile('^[a-zA-Z][a-zA-Z0-9_]*$', re.UNICODE)

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index 6baf875833..25755a9778 100644
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -1183,13 +1183,6 @@ class FdfParser:
 

         self.__GetOneChar()

 

-    def __IsHex(self, HexStr):

-        if not HexStr.upper().startswith("0X"):

-            return False

-        if len(self.__Token) <= 2:

-            return False

-        return True if all(x in string.hexdigits for x in HexStr[2:]) else False

-

     ## __GetNextHexNumber() method

     #

     #   Get next HEX data before a seperator

@@ -1202,7 +1195,7 @@ class FdfParser:
     def __GetNextHexNumber(self):

         if not self.__GetNextToken():

             return False

-        if self.__IsHex(self.__Token):

+        if gHexPatternAll.match(self.__Token):

             return True

         else:

             self.__UndoToken()