BaseTools: FdfParser and FdfParserLite share reg exp

[mirror_edk2.git] / BaseTools / Source / Python / GenFds / FdfParser.py

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index 19c1ad372c4cdbba69e0d987c2ba3d8502eed4ed..08429cd72affc0fe2af6335fdb5965e90603ec9f 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -60,6 +60,7 @@ from Common.LongFilePathSupport import OpenLongFilePath as open
 from Capsule import EFI_CERT_TYPE_PKCS7_GUID\r
 from Capsule import EFI_CERT_TYPE_RSA2048_SHA256_GUID\r
 from Common.RangeExpression import RangeExpression\r
+from Common.FdfParserLite import FileExtensionPattern\r
 \r
 ##define T_CHAR_SPACE                ' '\r
 ##define T_CHAR_NULL                 '\0'\r
@@ -136,21 +137,6 @@ class Warning (Exception):
     def __str__(self):\r
         return self.Message\r
 \r
-## The MACRO class that used to record macro value data when parsing include file\r
-#\r
-#\r
-class MacroProfile :\r
-    ## The constructor\r
-    #\r
-    #   @param  self        The object pointer\r
-    #   @param  FileName    The file that to be parsed\r
-    #\r
-    def __init__(self, FileName, Line):\r
-        self.FileName = FileName\r
-        self.DefinedAtLine  = Line\r
-        self.MacroName = None\r
-        self.MacroValue = None\r
-\r
 ## The Include file content class that used to record file data when parsing include file\r
 #\r
 # May raise Exception when opening file.\r
@@ -3706,8 +3692,7 @@ class FdfParser:
 \r
         Ext = ""\r
         if self.__GetNextToken():\r
-            Pattern = re.compile(r'([a-zA-Z][a-zA-Z0-9]*)')\r
-            if Pattern.match(self.__Token):\r
+            if FileExtensionPattern.match(self.__Token):\r
                 Ext = self.__Token\r
                 return '.' + Ext\r
             else:\r