Renormalized end-of-lines from master@27b044605cd5f6b33a3d231576003850b3fe305btrunk

1 files changed, 226 insertions, 226 deletions

diff --git a/BaseTools/Source/Python/UPT/Parser/InfBinarySectionParser.py b/BaseTools/Source/Python/UPT/Parser/InfBinarySectionParser.py
index 58b53276ec..b3ee70842e 100644
--- a/BaseTools/Source/Python/UPT/Parser/InfBinarySectionParser.py
+++ b/BaseTools/Source/Python/UPT/Parser/InfBinarySectionParser.py
@@ -1,226 +1,226 @@
-## @file

-# This file contained the parser for [Binaries] sections in INF file

-#

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

-#

-# SPDX-License-Identifier: BSD-2-Clause-Patent

-#

-'''

-InfBinarySectionParser

-'''

-##

-# Import Modules

-#

-

-import Logger.Log as Logger

-from Logger import StringTable as ST

-from Logger.ToolError import FORMAT_INVALID

-from Parser.InfParserMisc import InfExpandMacro

-from Library import DataType as DT

-from Library.Parsing import MacroParser

-from Library.Misc import GetSplitValueList

-from Object.Parser.InfCommonObject import InfLineCommentObject

-from Object.Parser.InfCommonObject import CurrentLine

-from Parser.InfParserMisc import InfParserSectionRoot

-

-class InfBinarySectionParser(InfParserSectionRoot):

-    ## InfBinaryParser

-    #

-    #

-    def InfBinaryParser(self, SectionString, InfSectionObject, FileName):

-        #

-        # Macro defined in this section

-        #

-        SectionMacros = {}

-        ValueList     = []

-        #

-        # For UI (UI, SEC_UI, UNI_UI) binaries

-        # One and only one UI section can be included

-        #

-        UiBinaryList  = []

-        #

-        # For Version (VER, SEC_VER, UNI_VER).

-        # One and only one VER section on be included

-        #

-        VerBinaryList = []

-        #

-        # For other common type binaries

-        #

-        ComBinaryList = []

-

-        StillCommentFalg  = False

-        HeaderComments    = []

-        LineComment       = None

-

-        AllSectionContent = ''

-        #

-        # Parse section content

-        #

-        for Line in SectionString:

-            BinLineContent = Line[0]

-            BinLineNo      = Line[1]

-

-            if BinLineContent.strip() == '':

-                continue

-

-            CurrentLineObj = CurrentLine()

-            CurrentLineObj.FileName = FileName

-            CurrentLineObj.LineString = BinLineContent

-            CurrentLineObj.LineNo = BinLineNo

-            #

-            # Found Header Comments

-            #

-            if BinLineContent.strip().startswith(DT.TAB_COMMENT_SPLIT):

-                #

-                # Last line is comments, and this line go on.

-                #

-                if StillCommentFalg:

-                    HeaderComments.append(Line)

-                    AllSectionContent += BinLineContent + DT.END_OF_LINE

-                    continue

-                #

-                # First time encounter comment

-                #

-                else:

-                    #

-                    # Clear original data

-                    #

-                    HeaderComments = []

-                    HeaderComments.append(Line)

-                    AllSectionContent += BinLineContent + DT.END_OF_LINE

-                    StillCommentFalg = True

-                    continue

-            else:

-                StillCommentFalg = False

-

-            if len(HeaderComments) >= 1:

-                LineComment = InfLineCommentObject()

-                LineCommentContent = ''

-                for Item in HeaderComments:

-                    LineCommentContent += Item[0] + DT.END_OF_LINE

-                LineComment.SetHeaderComments(LineCommentContent)

-

-            #

-            # Find Tail comment.

-            #

-            if BinLineContent.find(DT.TAB_COMMENT_SPLIT) > -1:

-                TailComments = BinLineContent[BinLineContent.find(DT.TAB_COMMENT_SPLIT):]

-                BinLineContent = BinLineContent[:BinLineContent.find(DT.TAB_COMMENT_SPLIT)]

-                if LineComment is None:

-                    LineComment = InfLineCommentObject()

-                LineComment.SetTailComments(TailComments)

-

-            #

-            # Find Macro

-            #

-            MacroDef = MacroParser((BinLineContent, BinLineNo),

-                                      FileName,

-                                      DT.MODEL_EFI_BINARY_FILE,

-                                      self.FileLocalMacros)

-            if MacroDef[0] is not None:

-                SectionMacros[MacroDef[0]] = MacroDef[1]

-                LineComment = None

-                HeaderComments = []

-                continue

-

-            #

-            # Replace with Local section Macro and [Defines] section Macro.

-            #

-            LineContent = InfExpandMacro(BinLineContent,

-                                         (FileName, BinLineContent, BinLineNo),

-                                         self.FileLocalMacros,

-                                         SectionMacros, True)

-

-            AllSectionContent += LineContent + DT.END_OF_LINE

-            TokenList = GetSplitValueList(LineContent, DT.TAB_VALUE_SPLIT, 1)

-            ValueList[0:len(TokenList)] = TokenList

-

-            #

-            # Should equal to UI/SEC_UI/UNI_UI

-            #

-            ValueList[0] = ValueList[0].strip()

-            if ValueList[0] == DT.BINARY_FILE_TYPE_UNI_UI or \

-               ValueList[0] == DT.BINARY_FILE_TYPE_SEC_UI or \

-               ValueList[0] == DT.BINARY_FILE_TYPE_UI:

-                if len(ValueList) == 2:

-                    TokenList = GetSplitValueList(ValueList[1],

-                                                  DT.TAB_VALUE_SPLIT,

-                                                  2)

-                    NewValueList = []

-                    NewValueList.append(ValueList[0])

-                    for Item in TokenList:

-                        NewValueList.append(Item)

-                    UiBinaryList.append((NewValueList,

-                                         LineComment,

-                                         CurrentLineObj))

-            #

-            # Should equal to VER/SEC_VER/UNI_VER

-            #

-            elif ValueList[0] == DT.BINARY_FILE_TYPE_UNI_VER or \

-               ValueList[0] == DT.BINARY_FILE_TYPE_SEC_VER or \

-               ValueList[0] == DT.BINARY_FILE_TYPE_VER:

-                if len(ValueList) == 2:

-                    TokenList = GetSplitValueList(ValueList[1],

-                                                  DT.TAB_VALUE_SPLIT,

-                                                  2)

-                    NewValueList = []

-                    NewValueList.append(ValueList[0])

-                    for Item in TokenList:

-                        NewValueList.append(Item)

-                    VerBinaryList.append((NewValueList,

-                                          LineComment,

-                                          CurrentLineObj))

-            else:

-                if len(ValueList) == 2:

-                    if ValueList[0].strip() == 'SUBTYPE_GUID':

-                        TokenList = GetSplitValueList(ValueList[1],

-                                                      DT.TAB_VALUE_SPLIT,

-                                                      5)

-                    else:

-                        TokenList = GetSplitValueList(ValueList[1],

-                              DT.TAB_VALUE_SPLIT,

-                              4)

-

-                    NewValueList = []

-                    NewValueList.append(ValueList[0])

-                    for Item in TokenList:

-                        NewValueList.append(Item)

-                    ComBinaryList.append((NewValueList,

-                                          LineComment,

-                                          CurrentLineObj))

-                elif len(ValueList) == 1:

-                    NewValueList = []

-                    NewValueList.append(ValueList[0])

-                    ComBinaryList.append((NewValueList,

-                                          LineComment,

-                                          CurrentLineObj))

-

-

-

-

-            ValueList = []

-            LineComment = None

-            TailComments = ''

-            HeaderComments = []

-            continue

-

-        #

-        # Current section archs

-        #

-        ArchList = []

-        for Item in self.LastSectionHeaderContent:

-            if Item[1] not in ArchList:

-                ArchList.append(Item[1])

-                InfSectionObject.SetSupArchList(Item[1])

-

-        InfSectionObject.SetAllContent(AllSectionContent)

-        if not InfSectionObject.SetBinary(UiBinaryList,

-                                          VerBinaryList,

-                                          ComBinaryList,

-                                          ArchList):

-            Logger.Error('InfParser',

-                         FORMAT_INVALID,

-                         ST.ERR_INF_PARSER_MODULE_SECTION_TYPE_ERROR%("[Binaries]"),

-                         File=FileName,

-                         Line=Item[3])

-

+## @file
+# This file contained the parser for [Binaries] sections in INF file
+#
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
+#
+# SPDX-License-Identifier: BSD-2-Clause-Patent
+#
+'''
+InfBinarySectionParser
+'''
+##
+# Import Modules
+#
+
+import Logger.Log as Logger
+from Logger import StringTable as ST
+from Logger.ToolError import FORMAT_INVALID
+from Parser.InfParserMisc import InfExpandMacro
+from Library import DataType as DT
+from Library.Parsing import MacroParser
+from Library.Misc import GetSplitValueList
+from Object.Parser.InfCommonObject import InfLineCommentObject
+from Object.Parser.InfCommonObject import CurrentLine
+from Parser.InfParserMisc import InfParserSectionRoot
+
+class InfBinarySectionParser(InfParserSectionRoot):
+    ## InfBinaryParser
+    #
+    #
+    def InfBinaryParser(self, SectionString, InfSectionObject, FileName):
+        #
+        # Macro defined in this section
+        #
+        SectionMacros = {}
+        ValueList     = []
+        #
+        # For UI (UI, SEC_UI, UNI_UI) binaries
+        # One and only one UI section can be included
+        #
+        UiBinaryList  = []
+        #
+        # For Version (VER, SEC_VER, UNI_VER).
+        # One and only one VER section on be included
+        #
+        VerBinaryList = []
+        #
+        # For other common type binaries
+        #
+        ComBinaryList = []
+
+        StillCommentFalg  = False
+        HeaderComments    = []
+        LineComment       = None
+
+        AllSectionContent = ''
+        #
+        # Parse section content
+        #
+        for Line in SectionString:
+            BinLineContent = Line[0]
+            BinLineNo      = Line[1]
+
+            if BinLineContent.strip() == '':
+                continue
+
+            CurrentLineObj = CurrentLine()
+            CurrentLineObj.FileName = FileName
+            CurrentLineObj.LineString = BinLineContent
+            CurrentLineObj.LineNo = BinLineNo
+            #
+            # Found Header Comments
+            #
+            if BinLineContent.strip().startswith(DT.TAB_COMMENT_SPLIT):
+                #
+                # Last line is comments, and this line go on.
+                #
+                if StillCommentFalg:
+                    HeaderComments.append(Line)
+                    AllSectionContent += BinLineContent + DT.END_OF_LINE
+                    continue
+                #
+                # First time encounter comment
+                #
+                else:
+                    #
+                    # Clear original data
+                    #
+                    HeaderComments = []
+                    HeaderComments.append(Line)
+                    AllSectionContent += BinLineContent + DT.END_OF_LINE
+                    StillCommentFalg = True
+                    continue
+            else:
+                StillCommentFalg = False
+
+            if len(HeaderComments) >= 1:
+                LineComment = InfLineCommentObject()
+                LineCommentContent = ''
+                for Item in HeaderComments:
+                    LineCommentContent += Item[0] + DT.END_OF_LINE
+                LineComment.SetHeaderComments(LineCommentContent)
+
+            #
+            # Find Tail comment.
+            #
+            if BinLineContent.find(DT.TAB_COMMENT_SPLIT) > -1:
+                TailComments = BinLineContent[BinLineContent.find(DT.TAB_COMMENT_SPLIT):]
+                BinLineContent = BinLineContent[:BinLineContent.find(DT.TAB_COMMENT_SPLIT)]
+                if LineComment is None:
+                    LineComment = InfLineCommentObject()
+                LineComment.SetTailComments(TailComments)
+
+            #
+            # Find Macro
+            #
+            MacroDef = MacroParser((BinLineContent, BinLineNo),
+                                      FileName,
+                                      DT.MODEL_EFI_BINARY_FILE,
+                                      self.FileLocalMacros)
+            if MacroDef[0] is not None:
+                SectionMacros[MacroDef[0]] = MacroDef[1]
+                LineComment = None
+                HeaderComments = []
+                continue
+
+            #
+            # Replace with Local section Macro and [Defines] section Macro.
+            #
+            LineContent = InfExpandMacro(BinLineContent,
+                                         (FileName, BinLineContent, BinLineNo),
+                                         self.FileLocalMacros,
+                                         SectionMacros, True)
+
+            AllSectionContent += LineContent + DT.END_OF_LINE
+            TokenList = GetSplitValueList(LineContent, DT.TAB_VALUE_SPLIT, 1)
+            ValueList[0:len(TokenList)] = TokenList
+
+            #
+            # Should equal to UI/SEC_UI/UNI_UI
+            #
+            ValueList[0] = ValueList[0].strip()
+            if ValueList[0] == DT.BINARY_FILE_TYPE_UNI_UI or \
+               ValueList[0] == DT.BINARY_FILE_TYPE_SEC_UI or \
+               ValueList[0] == DT.BINARY_FILE_TYPE_UI:
+                if len(ValueList) == 2:
+                    TokenList = GetSplitValueList(ValueList[1],
+                                                  DT.TAB_VALUE_SPLIT,
+                                                  2)
+                    NewValueList = []
+                    NewValueList.append(ValueList[0])
+                    for Item in TokenList:
+                        NewValueList.append(Item)
+                    UiBinaryList.append((NewValueList,
+                                         LineComment,
+                                         CurrentLineObj))
+            #
+            # Should equal to VER/SEC_VER/UNI_VER
+            #
+            elif ValueList[0] == DT.BINARY_FILE_TYPE_UNI_VER or \
+               ValueList[0] == DT.BINARY_FILE_TYPE_SEC_VER or \
+               ValueList[0] == DT.BINARY_FILE_TYPE_VER:
+                if len(ValueList) == 2:
+                    TokenList = GetSplitValueList(ValueList[1],
+                                                  DT.TAB_VALUE_SPLIT,
+                                                  2)
+                    NewValueList = []
+                    NewValueList.append(ValueList[0])
+                    for Item in TokenList:
+                        NewValueList.append(Item)
+                    VerBinaryList.append((NewValueList,
+                                          LineComment,
+                                          CurrentLineObj))
+            else:
+                if len(ValueList) == 2:
+                    if ValueList[0].strip() == 'SUBTYPE_GUID':
+                        TokenList = GetSplitValueList(ValueList[1],
+                                                      DT.TAB_VALUE_SPLIT,
+                                                      5)
+                    else:
+                        TokenList = GetSplitValueList(ValueList[1],
+                              DT.TAB_VALUE_SPLIT,
+                              4)
+
+                    NewValueList = []
+                    NewValueList.append(ValueList[0])
+                    for Item in TokenList:
+                        NewValueList.append(Item)
+                    ComBinaryList.append((NewValueList,
+                                          LineComment,
+                                          CurrentLineObj))
+                elif len(ValueList) == 1:
+                    NewValueList = []
+                    NewValueList.append(ValueList[0])
+                    ComBinaryList.append((NewValueList,
+                                          LineComment,
+                                          CurrentLineObj))
+
+
+
+
+            ValueList = []
+            LineComment = None
+            TailComments = ''
+            HeaderComments = []
+            continue
+
+        #
+        # Current section archs
+        #
+        ArchList = []
+        for Item in self.LastSectionHeaderContent:
+            if Item[1] not in ArchList:
+                ArchList.append(Item[1])
+                InfSectionObject.SetSupArchList(Item[1])
+
+        InfSectionObject.SetAllContent(AllSectionContent)
+        if not InfSectionObject.SetBinary(UiBinaryList,
+                                          VerBinaryList,
+                                          ComBinaryList,
+                                          ArchList):
+            Logger.Error('InfParser',
+                         FORMAT_INVALID,
+                         ST.ERR_INF_PARSER_MODULE_SECTION_TYPE_ERROR%("[Binaries]"),
+                         File=FileName,
+                         Line=Item[3])
+