]> git.proxmox.com Git - mirror_edk2.git/blobdiff - BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py
BaseTools: Clean up source files
[mirror_edk2.git] / BaseTools / Source / Python / UPT / Object / Parser / InfDefineObject.py
index 9d27a92cd6b0e3d3fe76b5b70e27907720d50fbe..8998d6988909ae1719be8038fdf517af92aa85a5 100644 (file)
@@ -1,12 +1,12 @@
 ## @file\r
-# This file is used to define class objects of [Defines] section for INF file. \r
+# This file is used to define class objects of [Defines] section for INF file.\r
 # It will consumed by InfParser\r
 #\r
 # Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
-# This program and the accompanying materials are licensed and made available \r
-# under the terms and conditions of the BSD License which accompanies this \r
-# distribution. The full text of the license may be found at \r
+# This program and the accompanying materials are licensed and made available\r
+# under the terms and conditions of the BSD License which accompanies this\r
+# distribution. The full text of the license may be found at\r
 # http://opensource.org/licenses/bsd-license.php\r
 #\r
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
@@ -21,21 +21,21 @@ import re
 \r
 from Logger import StringTable as ST\r
 from Logger import ToolError\r
-from Library import GlobalData \r
+from Library import GlobalData\r
 from Library import DataType as DT\r
 from Library.StringUtils import GetSplitValueList\r
 from Library.Misc import CheckGuidRegFormat\r
 from Library.Misc import Sdict\r
 from Library.Misc import ConvPathFromAbsToRel\r
 from Library.Misc import ValidateUNIFilePath\r
-from Library.ExpressionValidate import IsValidFeatureFlagExp \r
+from Library.ExpressionValidate import IsValidFeatureFlagExp\r
 from Library.ParserValidate import IsValidWord\r
-from Library.ParserValidate import IsValidInfMoudleType  \r
-from Library.ParserValidate import IsValidHex  \r
-from Library.ParserValidate import IsValidHexVersion  \r
-from Library.ParserValidate import IsValidDecVersion  \r
-from Library.ParserValidate import IsValidCVariableName \r
-from Library.ParserValidate import IsValidBoolType \r
+from Library.ParserValidate import IsValidInfMoudleType\r
+from Library.ParserValidate import IsValidHex\r
+from Library.ParserValidate import IsValidHexVersion\r
+from Library.ParserValidate import IsValidDecVersion\r
+from Library.ParserValidate import IsValidCVariableName\r
+from Library.ParserValidate import IsValidBoolType\r
 from Library.ParserValidate import IsValidPath\r
 from Library.ParserValidate import IsValidFamily\r
 from Library.ParserValidate import IsValidIdentifier\r
@@ -47,7 +47,7 @@ from Object.Parser.InfMisc import ErrorInInf
 from Object.Parser.InfDefineCommonObject import InfDefineLibraryItem\r
 from Object.Parser.InfDefineCommonObject import InfDefineEntryPointItem\r
 from Object.Parser.InfDefineCommonObject import InfDefineUnloadImageItem\r
-from Object.Parser.InfDefineCommonObject import InfDefineConstructorItem \r
+from Object.Parser.InfDefineCommonObject import InfDefineConstructorItem\r
 from Object.Parser.InfDefineCommonObject import InfDefineDestructorItem\r
 \r
 class InfDefSectionOptionRomInfo():\r
@@ -65,9 +65,9 @@ class InfDefSectionOptionRomInfo():
         if self.PciVendorId is not None:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND%(DT.TAB_INF_DEFINES_PCI_VENDOR_ID),\r
                        LineInfo=self.CurrentLine)\r
-            return False           \r
+            return False\r
         #\r
-        # The PciVendorId should be hex string.  \r
+        # The PciVendorId should be hex string.\r
         #\r
         if (IsValidHex(PciVendorId)):\r
             self.PciVendorId = InfDefMember()\r
@@ -78,10 +78,10 @@ class InfDefSectionOptionRomInfo():
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_FROMAT_INVALID%(PciVendorId),\r
                        LineInfo=self.CurrentLine)\r
             return False\r
-        \r
+\r
     def GetPciVendorId(self):\r
         return self.PciVendorId\r
-    \r
+\r
     def SetPciDeviceId(self, PciDeviceId, Comments):\r
         #\r
         # Value has been set before.\r
@@ -89,23 +89,23 @@ class InfDefSectionOptionRomInfo():
         if self.PciDeviceId is not None:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND%(DT.TAB_INF_DEFINES_PCI_DEVICE_ID),\r
                        LineInfo=self.CurrentLine)\r
-            return False         \r
+            return False\r
         #\r
-        # The PciDeviceId should be hex string.  \r
+        # The PciDeviceId should be hex string.\r
         #\r
         if (IsValidHex(PciDeviceId)):\r
             self.PciDeviceId = InfDefMember()\r
             self.PciDeviceId.SetValue(PciDeviceId)\r
-            self.PciDeviceId.Comments = Comments            \r
+            self.PciDeviceId.Comments = Comments\r
             return True\r
         else:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_FROMAT_INVALID%(PciDeviceId),\r
                        LineInfo=self.CurrentLine)\r
             return False\r
-        \r
+\r
     def GetPciDeviceId(self):\r
         return self.PciDeviceId\r
-   \r
+\r
     def SetPciClassCode(self, PciClassCode, Comments):\r
         #\r
         # Value has been set before.\r
@@ -113,9 +113,9 @@ class InfDefSectionOptionRomInfo():
         if self.PciClassCode is not None:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND%(DT.TAB_INF_DEFINES_PCI_CLASS_CODE),\r
                        LineInfo=self.CurrentLine)\r
-            return False        \r
+            return False\r
         #\r
-        # The PciClassCode should be 4 bytes hex string.  \r
+        # The PciClassCode should be 4 bytes hex string.\r
         #\r
         if (IsValidHex(PciClassCode)):\r
             self.PciClassCode = InfDefMember()\r
@@ -127,10 +127,10 @@ class InfDefSectionOptionRomInfo():
                        (PciClassCode),\r
                        LineInfo=self.CurrentLine)\r
             return False\r
-        \r
+\r
     def GetPciClassCode(self):\r
         return self.PciClassCode\r
-    \r
+\r
     def SetPciRevision(self, PciRevision, Comments):\r
         #\r
         # Value has been set before.\r
@@ -138,9 +138,9 @@ class InfDefSectionOptionRomInfo():
         if self.PciRevision is not None:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND%(DT.TAB_INF_DEFINES_PCI_REVISION),\r
                        LineInfo=self.CurrentLine)\r
-            return False          \r
+            return False\r
         #\r
-        # The PciRevision should be 4 bytes hex string.  \r
+        # The PciRevision should be 4 bytes hex string.\r
         #\r
         if (IsValidHex(PciRevision)):\r
             self.PciRevision = InfDefMember()\r
@@ -151,10 +151,10 @@ class InfDefSectionOptionRomInfo():
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_FROMAT_INVALID%(PciRevision),\r
                        LineInfo=self.CurrentLine)\r
             return False\r
-        \r
+\r
     def GetPciRevision(self):\r
         return self.PciRevision\r
-    \r
+\r
     def SetPciCompress(self, PciCompress, Comments):\r
         #\r
         # Value has been set before.\r
@@ -163,9 +163,9 @@ class InfDefSectionOptionRomInfo():
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND%(DT.TAB_INF_DEFINES_PCI_COMPRESS),\r
                        LineInfo=self.CurrentLine)\r
             return False\r
-        \r
+\r
         #\r
-        # The PciCompress should be 'TRUE' or 'FALSE'.  \r
+        # The PciCompress should be 'TRUE' or 'FALSE'.\r
         #\r
         if (PciCompress == 'TRUE' or PciCompress == 'FALSE'):\r
             self.PciCompress = InfDefMember()\r
@@ -175,9 +175,9 @@ class InfDefSectionOptionRomInfo():
         else:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_FROMAT_INVALID%(PciCompress),\r
                        LineInfo=self.CurrentLine)\r
-            return False        \r
+            return False\r
     def GetPciCompress(self):\r
-        return self.PciCompress        \r
+        return self.PciCompress\r
 ##\r
 # INF [Define] section Object\r
 #\r
@@ -210,15 +210,15 @@ class InfDefSection(InfDefSectionOptionRomInfo):
     ## SetHeadComment\r
     #\r
     # @param BaseName: BaseName\r
-    #    \r
+    #\r
     def SetBaseName(self, BaseName, Comments):\r
         #\r
         # Value has been set before.\r
         #\r
-        if self.BaseName is not None:    \r
+        if self.BaseName is not None:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND%(DT.TAB_INF_DEFINES_BASE_NAME),\r
                        LineInfo=self.CurrentLine)\r
-            return False     \r
+            return False\r
         if not (BaseName == '' or BaseName is None):\r
             if IsValidWord(BaseName) and not BaseName.startswith("_"):\r
                 self.BaseName = InfDefMember()\r
@@ -231,26 +231,26 @@ class InfDefSection(InfDefSectionOptionRomInfo):
                 return False\r
 \r
     ## GetBaseName\r
-    #          \r
+    #\r
     def GetBaseName(self):\r
         return self.BaseName\r
 \r
     ## SetFileGuid\r
     #\r
     # @param FileGuid: FileGuid\r
-    #        \r
+    #\r
     def SetFileGuid(self, FileGuid, Comments):\r
         #\r
         # Value has been set before.\r
         #\r
-        if self.FileGuid is not None:    \r
+        if self.FileGuid is not None:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND\\r
                        %(DT.TAB_INF_DEFINES_FILE_GUID),\r
                        LineInfo=self.CurrentLine)\r
-            return False                        \r
+            return False\r
         #\r
         # Do verification of GUID content/format\r
-        #          \r
+        #\r
         if (CheckGuidRegFormat(FileGuid)):\r
             self.FileGuid = InfDefMember()\r
             self.FileGuid.SetValue(FileGuid)\r
@@ -262,23 +262,23 @@ class InfDefSection(InfDefSectionOptionRomInfo):
             return False\r
 \r
     ## GetFileGuid\r
-    #            \r
+    #\r
     def GetFileGuid(self):\r
         return self.FileGuid\r
 \r
     ## SetModuleType\r
     #\r
     # @param ModuleType: ModuleType\r
-    #     \r
+    #\r
     def SetModuleType(self, ModuleType, Comments):\r
         #\r
         # Value has been set before.\r
         #\r
-        if self.ModuleType is not None:    \r
+        if self.ModuleType is not None:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND\\r
                        %(DT.TAB_INF_DEFINES_MODULE_TYPE),\r
                        LineInfo=self.CurrentLine)\r
-            return False           \r
+            return False\r
         #\r
         # Valid Module Type or not\r
         #\r
@@ -289,7 +289,7 @@ class InfDefSection(InfDefSectionOptionRomInfo):
             self.ModuleType.CurrentLine.SetLineNo(self.CurrentLine[1])\r
             self.ModuleType.CurrentLine.SetLineString(self.CurrentLine[2])\r
             self.ModuleType.CurrentLine.SetFileName(self.CurrentLine[0])\r
-            self.ModuleType.Comments = Comments            \r
+            self.ModuleType.Comments = Comments\r
             return True\r
         else:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_MODULETYPE_INVALID%\\r
@@ -298,14 +298,14 @@ class InfDefSection(InfDefSectionOptionRomInfo):
             return False\r
 \r
     ## GetModuleType\r
-    #                       \r
+    #\r
     def GetModuleType(self):\r
         return self.ModuleType\r
-    \r
+\r
     ## SetModuleUniFileName\r
     #\r
     # @param ModuleUniFileName: ModuleUniFileName\r
-    #     \r
+    #\r
     def SetModuleUniFileName(self, ModuleUniFileName, Comments):\r
         if Comments:\r
             pass\r
@@ -315,25 +315,25 @@ class InfDefSection(InfDefSectionOptionRomInfo):
         self.ModuleUniFileName = ModuleUniFileName\r
 \r
     ## GetModuleType\r
-    #                       \r
+    #\r
     def GetModuleUniFileName(self):\r
         return self.ModuleUniFileName\r
-    \r
+\r
     ## SetInfVersion\r
     #\r
     # @param InfVersion: InfVersion\r
-    #            \r
+    #\r
     def SetInfVersion(self, InfVersion, Comments):\r
         #\r
         # Value has been set before.\r
         #\r
-        if self.InfVersion is not None:    \r
+        if self.InfVersion is not None:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND\\r
                        %(DT.TAB_INF_DEFINES_INF_VERSION),\r
                        LineInfo=self.CurrentLine)\r
-            return False        \r
+            return False\r
         #\r
-        # The InfVersion should be 4 bytes hex string. \r
+        # The InfVersion should be 4 bytes hex string.\r
         #\r
         if (IsValidHex(InfVersion)):\r
             if (InfVersion < '0x00010005'):\r
@@ -356,25 +356,25 @@ class InfDefSection(InfDefSectionOptionRomInfo):
         return True\r
 \r
     ## GetInfVersion\r
-    #                     \r
+    #\r
     def GetInfVersion(self):\r
         return self.InfVersion\r
 \r
     ## SetEdkReleaseVersion\r
     #\r
     # @param EdkReleaseVersion: EdkReleaseVersion\r
-    #      \r
+    #\r
     def SetEdkReleaseVersion(self, EdkReleaseVersion, Comments):\r
         #\r
         # Value has been set before.\r
         #\r
-        if self.EdkReleaseVersion is not None:    \r
+        if self.EdkReleaseVersion is not None:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND\\r
                        %(DT.TAB_INF_DEFINES_EDK_RELEASE_VERSION),\r
                        LineInfo=self.CurrentLine)\r
-            return False          \r
+            return False\r
         #\r
-        # The EdkReleaseVersion should be 4 bytes hex string.  \r
+        # The EdkReleaseVersion should be 4 bytes hex string.\r
         #\r
         if IsValidHexVersion(EdkReleaseVersion) or \\r
            IsValidDecVersionVal(EdkReleaseVersion):\r
@@ -389,25 +389,25 @@ class InfDefSection(InfDefSectionOptionRomInfo):
             return False\r
 \r
     ## GetEdkReleaseVersion\r
-    #        \r
+    #\r
     def GetEdkReleaseVersion(self):\r
-        return self.EdkReleaseVersion \r
+        return self.EdkReleaseVersion\r
 \r
     ## SetUefiSpecificationVersion\r
     #\r
     # @param UefiSpecificationVersion: UefiSpecificationVersion\r
-    #         \r
+    #\r
     def SetUefiSpecificationVersion(self, UefiSpecificationVersion, Comments):\r
         #\r
         # Value has been set before.\r
         #\r
-        if self.UefiSpecificationVersion is not None:    \r
+        if self.UefiSpecificationVersion is not None:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND\\r
                        %(DT.TAB_INF_DEFINES_UEFI_SPECIFICATION_VERSION),\r
                        LineInfo=self.CurrentLine)\r
-            return False            \r
+            return False\r
         #\r
-        # The EdkReleaseVersion should be 4 bytes hex string.  \r
+        # The EdkReleaseVersion should be 4 bytes hex string.\r
         #\r
         if IsValidHexVersion(UefiSpecificationVersion) or \\r
            IsValidDecVersionVal(UefiSpecificationVersion):\r
@@ -422,25 +422,25 @@ class InfDefSection(InfDefSectionOptionRomInfo):
             return False\r
 \r
     ## GetUefiSpecificationVersion\r
-    #           \r
+    #\r
     def GetUefiSpecificationVersion(self):\r
-        return self.UefiSpecificationVersion            \r
+        return self.UefiSpecificationVersion\r
 \r
     ## SetPiSpecificationVersion\r
     #\r
     # @param PiSpecificationVersion: PiSpecificationVersion\r
-    #         \r
+    #\r
     def SetPiSpecificationVersion(self, PiSpecificationVersion, Comments):\r
         #\r
         # Value has been set before.\r
         #\r
-        if self.PiSpecificationVersion is not None:    \r
+        if self.PiSpecificationVersion is not None:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND\\r
                        %(DT.TAB_INF_DEFINES_PI_SPECIFICATION_VERSION),\r
                        LineInfo=self.CurrentLine)\r
-            return False         \r
+            return False\r
         #\r
-        # The EdkReleaseVersion should be 4 bytes hex string.  \r
+        # The EdkReleaseVersion should be 4 bytes hex string.\r
         #\r
         if IsValidHexVersion(PiSpecificationVersion) or \\r
            IsValidDecVersionVal(PiSpecificationVersion):\r
@@ -451,24 +451,24 @@ class InfDefSection(InfDefSectionOptionRomInfo):
         else:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_FROMAT_INVALID\\r
                        %(PiSpecificationVersion),\r
-                       LineInfo=self.CurrentLine)            \r
+                       LineInfo=self.CurrentLine)\r
             return False\r
 \r
     ## GetPiSpecificationVersion\r
-    #      \r
+    #\r
     def GetPiSpecificationVersion(self):\r
         return self.PiSpecificationVersion\r
 \r
     ## SetLibraryClass\r
     #\r
     # @param LibraryClass: LibraryClass\r
-    #            \r
+    #\r
     def SetLibraryClass(self, LibraryClass, Comments):\r
         ValueList = GetSplitValueList(LibraryClass)\r
-        Name = ValueList[0]         \r
+        Name = ValueList[0]\r
         if IsValidWord(Name):\r
             InfDefineLibraryItemObj = InfDefineLibraryItem()\r
-            InfDefineLibraryItemObj.SetLibraryName(Name)            \r
+            InfDefineLibraryItemObj.SetLibraryName(Name)\r
             InfDefineLibraryItemObj.Comments = Comments\r
             if len(ValueList) == 2:\r
                 Type = ValueList[1]\r
@@ -479,23 +479,23 @@ class InfDefSection(InfDefSectionOptionRomInfo):
                         ErrorInInf(ST.ERR_INF_PARSER_DEFINE_FROMAT_INVALID%(Item),\r
                                    LineInfo=self.CurrentLine)\r
                         return False\r
-                InfDefineLibraryItemObj.SetTypes(TypeList)                    \r
-            self.LibraryClass.append(InfDefineLibraryItemObj)               \r
+                InfDefineLibraryItemObj.SetTypes(TypeList)\r
+            self.LibraryClass.append(InfDefineLibraryItemObj)\r
         else:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_FROMAT_INVALID%(Name),\r
                        LineInfo=self.CurrentLine)\r
             return False\r
-        \r
+\r
         return True\r
-    \r
+\r
     def GetLibraryClass(self):\r
         return self.LibraryClass\r
-  \r
+\r
     def SetVersionString(self, VersionString, Comments):\r
         #\r
         # Value has been set before.\r
         #\r
-        if self.VersionString is not None:    \r
+        if self.VersionString is not None:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND\\r
                        %(DT.TAB_INF_DEFINES_VERSION_STRING),\r
                        LineInfo=self.CurrentLine)\r
@@ -503,25 +503,25 @@ class InfDefSection(InfDefSectionOptionRomInfo):
         if not IsValidDecVersion(VersionString):\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_FROMAT_INVALID\\r
                        %(VersionString),\r
-                       LineInfo=self.CurrentLine) \r
+                       LineInfo=self.CurrentLine)\r
         self.VersionString = InfDefMember()\r
         self.VersionString.SetValue(VersionString)\r
         self.VersionString.Comments = Comments\r
         return True\r
 \r
-        \r
+\r
     def GetVersionString(self):\r
         return self.VersionString\r
-    \r
+\r
     def SetPcdIsDriver(self, PcdIsDriver, Comments):\r
         #\r
         # Value has been set before.\r
         #\r
-        if self.PcdIsDriver is not None:    \r
+        if self.PcdIsDriver is not None:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND\\r
                        %(DT.TAB_INF_DEFINES_PCD_IS_DRIVER),\r
                        LineInfo=self.CurrentLine)\r
-            return False         \r
+            return False\r
         if PcdIsDriver == 'PEI_PCD_DRIVER' or PcdIsDriver == 'DXE_PCD_DRIVER':\r
             self.PcdIsDriver = InfDefMember()\r
             self.PcdIsDriver.SetValue(PcdIsDriver)\r
@@ -531,20 +531,20 @@ class InfDefSection(InfDefSectionOptionRomInfo):
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_FROMAT_INVALID%(PcdIsDriver),\r
                        LineInfo=self.CurrentLine)\r
             return False\r
-    \r
+\r
     def GetPcdIsDriver(self):\r
         return self.PcdIsDriver\r
-    \r
+\r
     #\r
     # SetEntryPoint\r
-    #    \r
+    #\r
     def SetEntryPoint(self, EntryPoint, Comments):\r
         #\r
         # It can be a list\r
         #\r
         ValueList = []\r
         TokenList = GetSplitValueList(EntryPoint, DT.TAB_VALUE_SPLIT)\r
-        ValueList[0:len(TokenList)] = TokenList        \r
+        ValueList[0:len(TokenList)] = TokenList\r
         InfDefineEntryPointItemObj = InfDefineEntryPointItem()\r
         if not IsValidCVariableName(ValueList[0]):\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_FROMAT_INVALID%\\r
@@ -557,33 +557,33 @@ class InfDefSection(InfDefSectionOptionRomInfo):
                            (ValueList[1]),\r
                            LineInfo=self.CurrentLine)\r
             #\r
-            # Validate FFE    \r
+            # Validate FFE\r
             #\r
             FeatureFlagRtv = IsValidFeatureFlagExp(ValueList[1].strip())\r
             if not FeatureFlagRtv[0]:\r
                 ErrorInInf(ST.ERR_INF_PARSER_FEATURE_FLAG_EXP_SYNTAX_INVLID%\\r
                            (FeatureFlagRtv[1]),\r
-                           LineInfo=self.CurrentLine)       \r
-            InfDefineEntryPointItemObj.SetFeatureFlagExp(ValueList[1])     \r
+                           LineInfo=self.CurrentLine)\r
+            InfDefineEntryPointItemObj.SetFeatureFlagExp(ValueList[1])\r
         if len(ValueList) > 2:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_FROMAT_INVALID%(EntryPoint),\r
                        LineInfo=self.CurrentLine)\r
-        InfDefineEntryPointItemObj.Comments = Comments             \r
-        self.EntryPoint.append(InfDefineEntryPointItemObj)       \r
-        \r
+        InfDefineEntryPointItemObj.Comments = Comments\r
+        self.EntryPoint.append(InfDefineEntryPointItemObj)\r
+\r
     def GetEntryPoint(self):\r
         return self.EntryPoint\r
 \r
     #\r
     # SetUnloadImages\r
-    #      \r
+    #\r
     def SetUnloadImages(self, UnloadImages, Comments):\r
         #\r
         # It can be a list\r
         #\r
         ValueList = []\r
         TokenList = GetSplitValueList(UnloadImages, DT.TAB_VALUE_SPLIT)\r
-        ValueList[0:len(TokenList)] = TokenList        \r
+        ValueList[0:len(TokenList)] = TokenList\r
         InfDefineUnloadImageItemObj = InfDefineUnloadImageItem()\r
         if not IsValidCVariableName(ValueList[0]):\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_FROMAT_INVALID%(ValueList[0]),\r
@@ -594,33 +594,33 @@ class InfDefSection(InfDefSectionOptionRomInfo):
                 ErrorInInf(ST.ERR_INF_PARSER_DEFINE_FROMAT_INVALID%(ValueList[1]),\r
                            LineInfo=self.CurrentLine)\r
             #\r
-            # Validate FFE    \r
+            # Validate FFE\r
             #\r
             FeatureFlagRtv = IsValidFeatureFlagExp(ValueList[1].strip())\r
             if not FeatureFlagRtv[0]:\r
                 ErrorInInf(ST.ERR_INF_PARSER_FEATURE_FLAG_EXP_SYNTAX_INVLID%(FeatureFlagRtv[1]),\r
                            LineInfo=self.CurrentLine)\r
             InfDefineUnloadImageItemObj.SetFeatureFlagExp(ValueList[1])\r
-                \r
+\r
         if len(ValueList) > 2:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_FROMAT_INVALID%(UnloadImages),\r
                        LineInfo=self.CurrentLine)\r
         InfDefineUnloadImageItemObj.Comments = Comments\r
         self.UnloadImages.append(InfDefineUnloadImageItemObj)\r
-        \r
+\r
     def GetUnloadImages(self):\r
         return self.UnloadImages\r
 \r
     #\r
     # SetConstructor\r
-    #          \r
+    #\r
     def SetConstructor(self, Constructor, Comments):\r
         #\r
         # It can be a list\r
         #\r
         ValueList = []\r
         TokenList = GetSplitValueList(Constructor, DT.TAB_VALUE_SPLIT)\r
-        ValueList[0:len(TokenList)] = TokenList        \r
+        ValueList[0:len(TokenList)] = TokenList\r
         InfDefineConstructorItemObj = InfDefineConstructorItem()\r
         if not IsValidCVariableName(ValueList[0]):\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_FROMAT_INVALID%(ValueList[0]),\r
@@ -635,39 +635,39 @@ class InfDefSection(InfDefSectionOptionRomInfo):
                 if ModItem not in DT.MODULE_LIST:\r
                     ErrorInInf(ST.ERR_INF_PARSER_DEFINE_MODULETYPE_INVALID%(ModItem),\r
                                LineInfo=self.CurrentLine)\r
-            InfDefineConstructorItemObj.SetSupModList(ModList)             \r
+            InfDefineConstructorItemObj.SetSupModList(ModList)\r
         if len(ValueList) == 3:\r
             if ValueList[2].strip() == '':\r
                 ErrorInInf(ST.ERR_INF_PARSER_DEFINE_FROMAT_INVALID%(ValueList[2]),\r
                            LineInfo=self.CurrentLine)\r
             #\r
-            # Validate FFE    \r
+            # Validate FFE\r
             #\r
             FeatureFlagRtv = IsValidFeatureFlagExp(ValueList[2].strip())\r
             if not FeatureFlagRtv[0]:\r
                 ErrorInInf(ST.ERR_INF_PARSER_FEATURE_FLAG_EXP_SYNTAX_INVLID%(FeatureFlagRtv[2]),\r
                            LineInfo=self.CurrentLine)\r
             InfDefineConstructorItemObj.SetFeatureFlagExp(ValueList[2])\r
-                    \r
+\r
         if len(ValueList) > 3:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_FROMAT_INVALID%(Constructor),\r
                        LineInfo=self.CurrentLine)\r
-        InfDefineConstructorItemObj.Comments = Comments    \r
-        self.Constructor.append(InfDefineConstructorItemObj)     \r
-           \r
+        InfDefineConstructorItemObj.Comments = Comments\r
+        self.Constructor.append(InfDefineConstructorItemObj)\r
+\r
     def GetConstructor(self):\r
         return self.Constructor\r
 \r
     #\r
     # SetDestructor\r
-    #      \r
+    #\r
     def SetDestructor(self, Destructor, Comments):\r
         #\r
         # It can be a list and only 1 set to TRUE\r
-        #        \r
+        #\r
         ValueList = []\r
         TokenList = GetSplitValueList(Destructor, DT.TAB_VALUE_SPLIT)\r
-        ValueList[0:len(TokenList)] = TokenList        \r
+        ValueList[0:len(TokenList)] = TokenList\r
         InfDefineDestructorItemObj = InfDefineDestructorItem()\r
         if not IsValidCVariableName(ValueList[0]):\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_FROMAT_INVALID%(ValueList[0]),\r
@@ -682,30 +682,30 @@ class InfDefSection(InfDefSectionOptionRomInfo):
                 if ModItem not in DT.MODULE_LIST:\r
                     ErrorInInf(ST.ERR_INF_PARSER_DEFINE_MODULETYPE_INVALID%(ModItem),\r
                                LineInfo=self.CurrentLine)\r
-            InfDefineDestructorItemObj.SetSupModList(ModList)          \r
+            InfDefineDestructorItemObj.SetSupModList(ModList)\r
         if len(ValueList) == 3:\r
             if ValueList[2].strip() == '':\r
                 ErrorInInf(ST.ERR_INF_PARSER_DEFINE_FROMAT_INVALID%(ValueList[2]),\r
                            LineInfo=self.CurrentLine)\r
             #\r
-            # Validate FFE    \r
+            # Validate FFE\r
             #\r
             FeatureFlagRtv = IsValidFeatureFlagExp(ValueList[2].strip())\r
             if not FeatureFlagRtv[0]:\r
                 ErrorInInf(ST.ERR_INF_PARSER_FEATURE_FLAG_EXP_SYNTAX_INVLID%(FeatureFlagRtv[1]),\r
                            LineInfo=self.CurrentLine)\r
             InfDefineDestructorItemObj.SetFeatureFlagExp(ValueList[2])\r
-        \r
+\r
         if len(ValueList) > 3:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_FROMAT_INVALID%(Destructor),\r
                        LineInfo=self.CurrentLine)\r
-            \r
-        InfDefineDestructorItemObj.Comments = Comments \r
-        self.Destructor.append(InfDefineDestructorItemObj) \r
-        \r
+\r
+        InfDefineDestructorItemObj.Comments = Comments\r
+        self.Destructor.append(InfDefineDestructorItemObj)\r
+\r
     def GetDestructor(self):\r
         return self.Destructor\r
-    \r
+\r
     def SetShadow(self, Shadow, Comments):\r
         #\r
         # Value has been set before.\r
@@ -713,7 +713,7 @@ class InfDefSection(InfDefSectionOptionRomInfo):
         if self.Shadow is not None:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND%(DT.TAB_INF_DEFINES_SHADOW),\r
                        LineInfo=self.CurrentLine)\r
-            return False          \r
+            return False\r
         if (IsValidBoolType(Shadow)):\r
             self.Shadow = InfDefMember()\r
             self.Shadow.SetValue(Shadow)\r
@@ -751,22 +751,22 @@ class InfDefSection(InfDefSectionOptionRomInfo):
             IsValidFileFlag = False\r
             ModulePath = os.path.split(self.CurrentLine[0])[0]\r
             if IsValidPath(FileName, ModulePath):\r
-                IsValidFileFlag = True           \r
+                IsValidFileFlag = True\r
             else:\r
                 ErrorInInf(ST.ERR_INF_PARSER_FILE_NOT_EXIST_OR_NAME_INVALID%(FileName),\r
                            LineInfo=self.CurrentLine)\r
                 return False\r
             if IsValidFileFlag:\r
-                FileName = ConvPathFromAbsToRel(FileName, GlobalData.gINF_MODULE_DIR)                     \r
+                FileName = ConvPathFromAbsToRel(FileName, GlobalData.gINF_MODULE_DIR)\r
                 self.CustomMakefile.append((Family, FileName, Comments))\r
                 IsValidFileFlag = False\r
             return True\r
         else:\r
             return False\r
-        \r
+\r
     def GetCustomMakefile(self):\r
         return self.CustomMakefile\r
-    \r
+\r
     #\r
     # ["SPEC" <Spec> <EOL>]*{0,}\r
     # <Spec>                 ::=  <Word> "=" <VersionVal>\r
@@ -785,7 +785,7 @@ class InfDefSection(InfDefSectionOptionRomInfo):
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_NO_NAME + ' Or ' + ST.ERR_INF_PARSER_DEFINE_ITEM_NO_VALUE,\r
                        LineInfo=self.CurrentLine)\r
         Name = __ValueList[0].strip()\r
-        Version = __ValueList[1].strip()   \r
+        Version = __ValueList[1].strip()\r
         if IsValidIdentifier(Name):\r
             if IsValidDecVersion(Version):\r
                 self.Specification.append((Name, Version, Comments))\r
@@ -794,15 +794,15 @@ class InfDefSection(InfDefSectionOptionRomInfo):
                 ErrorInInf(ST.ERR_INF_PARSER_DEFINE_FROMAT_INVALID%(Version),\r
                            LineInfo=self.CurrentLine)\r
                 return False\r
-        else:                  \r
+        else:\r
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_FROMAT_INVALID%(Name),\r
                        LineInfo=self.CurrentLine)\r
-            return False    \r
+            return False\r
         return True\r
 \r
     def GetSpecification(self):\r
         return self.Specification\r
-    \r
+\r
     #\r
     # [<UefiHiiResource> <EOL>]{0,1}\r
     # <UefiHiiResource>      ::=  "UEFI_HII_RESOURCE_SECTION" "=" <BoolType>\r
@@ -815,12 +815,12 @@ class InfDefSection(InfDefSectionOptionRomInfo):
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_ITEM_MORE_THAN_ONE_FOUND\r
                        %(DT.TAB_INF_DEFINES_UEFI_HII_RESOURCE_SECTION),\r
                        LineInfo=self.CurrentLine)\r
-            return False           \r
+            return False\r
         if not (UefiHiiResourceSection == '' or UefiHiiResourceSection is None):\r
             if (IsValidBoolType(UefiHiiResourceSection)):\r
                 self.UefiHiiResourceSection = InfDefMember()\r
                 self.UefiHiiResourceSection.SetValue(UefiHiiResourceSection)\r
-                self.UefiHiiResourceSection.Comments = Comments                \r
+                self.UefiHiiResourceSection.Comments = Comments\r
                 return True\r
             else:\r
                 ErrorInInf(ST.ERR_INF_PARSER_DEFINE_FROMAT_INVALID%(UefiHiiResourceSection),\r
@@ -828,28 +828,28 @@ class InfDefSection(InfDefSectionOptionRomInfo):
                 return False\r
         else:\r
             return False\r
-            \r
+\r
     def GetUefiHiiResourceSection(self):\r
         return self.UefiHiiResourceSection\r
-    \r
-    def SetDpxSource(self, DpxSource, Comments):    \r
+\r
+    def SetDpxSource(self, DpxSource, Comments):\r
         #\r
         # The MakefileName specified file should exist\r
         #\r
         IsValidFileFlag = False\r
         ModulePath = os.path.split(self.CurrentLine[0])[0]\r
         if IsValidPath(DpxSource, ModulePath):\r
-            IsValidFileFlag = True           \r
+            IsValidFileFlag = True\r
         else:\r
             ErrorInInf(ST.ERR_INF_PARSER_FILE_NOT_EXIST_OR_NAME_INVALID%(DpxSource),\r
                        LineInfo=self.CurrentLine)\r
             return False\r
         if IsValidFileFlag:\r
-            DpxSource = ConvPathFromAbsToRel(DpxSource, \r
-                            GlobalData.gINF_MODULE_DIR)     \r
+            DpxSource = ConvPathFromAbsToRel(DpxSource,\r
+                            GlobalData.gINF_MODULE_DIR)\r
             self.DpxSource.append((DpxSource, Comments))\r
             IsValidFileFlag = False\r
-        return True               \r
+        return True\r
 \r
     def GetDpxSource(self):\r
         return self.DpxSource\r
@@ -867,7 +867,7 @@ gFUNCTION_MAPPING_FOR_DEFINE_SECTION = {
     DT.TAB_INF_DEFINES_INF_VERSION                 : InfDefSection.SetInfVersion,\r
     #\r
     # Optional Fields\r
-    #        \r
+    #\r
     DT.TAB_INF_DEFINES_MODULE_UNI_FILE             : InfDefSection.SetModuleUniFileName,\r
     DT.TAB_INF_DEFINES_EDK_RELEASE_VERSION         : InfDefSection.SetEdkReleaseVersion,\r
     DT.TAB_INF_DEFINES_UEFI_SPECIFICATION_VERSION  : InfDefSection.SetUefiSpecificationVersion,\r
@@ -882,10 +882,10 @@ gFUNCTION_MAPPING_FOR_DEFINE_SECTION = {
     DT.TAB_INF_DEFINES_SHADOW                      : InfDefSection.SetShadow,\r
     DT.TAB_INF_DEFINES_PCI_VENDOR_ID               : InfDefSection.SetPciVendorId,\r
     DT.TAB_INF_DEFINES_PCI_DEVICE_ID               : InfDefSection.SetPciDeviceId,\r
-    DT.TAB_INF_DEFINES_PCI_CLASS_CODE              : InfDefSection.SetPciClassCode,   \r
+    DT.TAB_INF_DEFINES_PCI_CLASS_CODE              : InfDefSection.SetPciClassCode,\r
     DT.TAB_INF_DEFINES_PCI_REVISION                : InfDefSection.SetPciRevision,\r
     DT.TAB_INF_DEFINES_PCI_COMPRESS                : InfDefSection.SetPciCompress,\r
-    DT.TAB_INF_DEFINES_CUSTOM_MAKEFILE             : InfDefSection.SetCustomMakefile,  \r
+    DT.TAB_INF_DEFINES_CUSTOM_MAKEFILE             : InfDefSection.SetCustomMakefile,\r
     DT.TAB_INF_DEFINES_SPEC                        : InfDefSection.SetSpecification,\r
     DT.TAB_INF_DEFINES_UEFI_HII_RESOURCE_SECTION   : InfDefSection.SetUefiHiiResourceSection,\r
     DT.TAB_INF_DEFINES_DPX_SOURCE                  : InfDefSection.SetDpxSource\r
@@ -908,7 +908,7 @@ class InfDefMember():
         return self.Value\r
     def SetValue(self, Value):\r
         self.Value = Value\r
-    \r
+\r
 ## InfDefObject\r
 #\r
 #\r
@@ -922,7 +922,7 @@ class InfDefObject(InfSectionCommonDef):
         #\r
         HasFoundInfVersionFalg = False\r
         LineInfo = ['', -1, '']\r
-        ArchListString = ' '.join(Arch)  \r
+        ArchListString = ' '.join(Arch)\r
         #\r
         # Parse Define items.\r
         #\r
@@ -947,7 +947,7 @@ class InfDefObject(InfSectionCommonDef):
                            ErrorCode=ToolError.EDK1_INF_ERROR,\r
                            RaiseError=True)\r
             if Name == DT.TAB_INF_DEFINES_INF_VERSION:\r
-                HasFoundInfVersionFalg = True  \r
+                HasFoundInfVersionFalg = True\r
             if not (Name == '' or Name is None):\r
                 #\r
                 # Process "SPEC" Keyword definition.\r
@@ -958,7 +958,7 @@ class InfDefObject(InfSectionCommonDef):
                     Name = "SPEC"\r
                     Value = SpecValue + " = " + Value\r
                 if ArchListString in self.Defines:\r
-                    DefineList = self.Defines[ArchListString]                 \r
+                    DefineList = self.Defines[ArchListString]\r
                     LineInfo[0] = InfDefMemberObj.CurrentLine.GetFileName()\r
                     LineInfo[1] = InfDefMemberObj.CurrentLine.GetLineNo()\r
                     LineInfo[2] = InfDefMemberObj.CurrentLine.GetLineString()\r
@@ -968,7 +968,7 @@ class InfDefObject(InfSectionCommonDef):
                     #\r
                     if Name not in gFUNCTION_MAPPING_FOR_DEFINE_SECTION.keys():\r
                         ErrorInInf(ST.ERR_INF_PARSER_DEFINE_SECTION_KEYWORD_INVALID%(Name),\r
-                                   LineInfo=LineInfo)                           \r
+                                   LineInfo=LineInfo)\r
                     else:\r
                         ProcessFunc = gFUNCTION_MAPPING_FOR_DEFINE_SECTION[Name]\r
                     if (ProcessFunc is not None):\r
@@ -988,7 +988,7 @@ class InfDefObject(InfSectionCommonDef):
                                    LineInfo=LineInfo)\r
                     #\r
                     # Found the process function from mapping table.\r
-                    #                    \r
+                    #\r
                     else:\r
                         ProcessFunc = gFUNCTION_MAPPING_FOR_DEFINE_SECTION[Name]\r
                     if (ProcessFunc is not None):\r
@@ -1000,9 +1000,9 @@ class InfDefObject(InfSectionCommonDef):
         if not HasFoundInfVersionFalg:\r
             ErrorInInf(ST.ERR_INF_PARSER_NOT_SUPPORT_EDKI_INF,\r
                        ErrorCode=ToolError.EDK1_INF_ERROR,\r
-                       RaiseError=True) \r
+                       RaiseError=True)\r
         return True\r
-    \r
+\r
     def GetDefines(self):\r
-        return self.Defines                      \r
-        \r
+        return self.Defines\r
+\r