Re: [PATCH v1 1/9] BaseTools: FdfParser and FdfParserLite share reg exp

["Zhu, Yonghong" <yonghong.zhu@intel.com>]

Hi Jaben,

For this series patch, I have two comment:
1.  1/9 patch: after remove the 'Pattern' variable in FdfParser.py file, this statement " if Pattern.match(self.__Token): " is incorrect now since there missing  'Pattern' variable.
2.  6/9 patch: need additional {} ({{4}}) for the statement "g4HexChar = re.compile(r'{}{4}'.format(_HexChar))"
Others are good to me. thanks.

Best Regards,
Zhu Yonghong


-----Original Message-----
From: Carsey, Jaben 
Sent: Saturday, March 17, 2018 7:28 AM
To: edk2-devel@lists.01.org
Cc: Zhu, Yonghong <yonghong.zhu@intel.com>; Gao, Liming <liming.gao@intel.com>
Subject: [PATCH v1 1/9] BaseTools: FdfParser and FdfParserLite share reg exp

FdfParser can share regular expression from FdfParserLite.
reduce overlap and reduce recompile of the same expression.

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>
---
 BaseTools/Source/Python/Common/FdfParserLite.py | 5 +++--
 BaseTools/Source/Python/GenFds/FdfParser.py     | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/BaseTools/Source/Python/Common/FdfParserLite.py b/BaseTools/Source/Python/Common/FdfParserLite.py
index 7d129bfcab59..330422ad59d2 100644
--- a/BaseTools/Source/Python/Common/FdfParserLite.py
+++ b/BaseTools/Source/Python/Common/FdfParserLite.py
@@ -46,6 +46,8 @@ InputMacroDict = {}
 # All Macro values when parsing file, not replace existing Macro  AllMacroList = []
 
+FileExtensionPattern = re.compile(r'([a-zA-Z][a-zA-Z0-9]*)')
+
 def GetRealFileLine (File, Line):
     
     InsertedLines = 0
@@ -2842,8 +2844,7 @@ class FdfParser(object):
             
         Ext = ""
         if self.__GetNextToken():
-            Pattern = re.compile(r'([a-zA-Z][a-zA-Z0-9]*)')
-            if Pattern.match(self.__Token):
+            if FileExtensionPattern.match(self.__Token):
                 Ext = self.__Token                            
                 return '.' + Ext    
             else:
diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index dda7ed4ce798..03183e398bdb 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.FdfParserLite import FileExtensionPattern
 
 ##define T_CHAR_SPACE                ' '
 ##define T_CHAR_NULL                 '\0'
@@ -3706,7 +3707,6 @@ class FdfParser:
 
         Ext = ""
         if self.__GetNextToken():
-            Pattern = re.compile(r'([a-zA-Z][a-zA-Z0-9]*)')
             if Pattern.match(self.__Token):
                 Ext = self.__Token
                 return '.' + Ext
--
2.16.2.windows.1