BaseTools: FdfParser & FdfParserLite refactor regular expression for GUIDs

Instead of recompiling it each time the API is called, just use
the global one that exists.

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>

2 files changed, 5 insertions, 5 deletions

diff --git a/BaseTools/Source/Python/Common/FdfParserLite.py b/BaseTools/Source/Python/Common/FdfParserLite.py
index 7d129bfcab..df287414db 100644
--- a/BaseTools/Source/Python/Common/FdfParserLite.py
+++ b/BaseTools/Source/Python/Common/FdfParserLite.py
@@ -1,7 +1,7 @@
 ## @file

 # parse FDF file

 #

-#  Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -21,6 +21,7 @@ import Common.LongFilePathOs as os
 import CommonDataClass.FdfClass

 from Common.LongFilePathSupport import OpenLongFilePath as open

 from Common.MultipleWorkspace import MultipleWorkspace as mws

+from Common.RangeExpression import RangeExpression

 

 ##define T_CHAR_SPACE                ' '

 ##define T_CHAR_NULL                 '\0'

@@ -931,8 +932,7 @@ class FdfParser(object):
         

         if not self.__GetNextToken():

             return False

-        p = re.compile('[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}')

-        if p.match(self.__Token) != None:

+        if RangeExpression.RegGuidPattern.match(self.__Token) != None:

             return True

         else:

             self.__UndoToken()

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index dda7ed4ce7..19c1ad372c 100644
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -59,6 +59,7 @@ import Common.LongFilePathOs as os
 from Common.LongFilePathSupport import OpenLongFilePath as open

 from Capsule import EFI_CERT_TYPE_PKCS7_GUID

 from Capsule import EFI_CERT_TYPE_RSA2048_SHA256_GUID

+from Common.RangeExpression import RangeExpression

 

 ##define T_CHAR_SPACE                ' '

 ##define T_CHAR_NULL                 '\0'

@@ -1149,8 +1150,7 @@ class FdfParser:
 

         if not self.__GetNextToken():

             return False

-        p = re.compile('[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}')

-        if p.match(self.__Token) != None:

+        if RangeExpression.RegGuidPattern.match(self.__Token) != None:

             return True

         else:

             self.__UndoToken()