BaseTools: UPT/Library: Remove unnecessary code

Running the vulture tool on the UPT/Library folder gave the following
report. Remove the unnecessary code.

- UPT/Library/CommentGenerating.py:50:
  unused function 'GenGenericComment' (60% confidence)
- UPT/Library/CommentGenerating.py:172:
  unused function 'GenInfPcdTailComment' (60% confidence)
- UPT/Library/CommentGenerating.py:185:
  unused function 'GenInfProtocolPPITailComment' (60% confidence)
- UPT/Library/CommentGenerating.py:203:
  unused function 'GenInfGuidTailComment' (60% confidence)
- UPT/Library/Misc.py:504:
  unused class 'MergeCommentDict' (60% confidence)
- UPT/Library/Misc.py:527:
  unused function 'GenDummyHelpTextObj' (60% confidence)
- UPT/Library/ParserValidate.py:110:
  unused function 'IsValidInfComponentType' (60% confidence)
- UPT/Library/ParserValidate.py:122:
  unused function 'IsValidToolFamily' (60% confidence)
- UPT/Library/ParserValidate.py:134:
  unused function 'IsValidToolTagName' (60% confidence)
- UPT/Library/ParserValidate.py:465:
  unused function 'IsValidBuildNumber' (60% confidence)
- UPT/Library/ParserValidate.py:478:
  unused function 'IsValidDepex' (60% confidence)
- UPT/Library/ParserValidate.py:546:
  unused function 'IsValidVersionString' (60% confidence)
- UPT/Library/ParserValidate.py:721:
  unused function 'CheckUTF16FileHeader' (60% confidence)
- UPT/Library/Parsing.py:52:
  unused function 'GetBuildOption' (60% confidence)
- UPT/Library/Parsing.py:100:
  unused function 'GetLibraryClassOfInf' (60% confidence)
- UPT/Library/Parsing.py:150:
  unused function 'GetPcd' (60% confidence)
- UPT/Library/Parsing.py:177:
  unused function 'GetFeatureFlagPcd' (60% confidence)
- UPT/Library/Parsing.py:201:
  unused function 'GetDynamicDefaultPcd' (60% confidence)
- UPT/Library/Parsing.py:227:
  unused function 'GetDynamicHiiPcd' (60% confidence)
- UPT/Library/Parsing.py:254:
  unused function 'GetDynamicVpdPcd' (60% confidence)
- UPT/Library/Parsing.py:277:
  unused function 'GetComponent' (60% confidence)
- UPT/Library/Parsing.py:392:
  unused function 'GetExec' (60% confidence)
- UPT/Library/Parsing.py:416:
  unused function 'GetComponents' (60% confidence)
- UPT/Library/Parsing.py:532:
  unused function 'GetSource' (60% confidence)
- UPT/Library/Parsing.py:581:
  unused function 'GetGuidsProtocolsPpisOfInf' (60% confidence)
- UPT/Library/Parsing.py:595:
  unused function 'GetGuidsProtocolsPpisOfDec' (60% confidence)
- UPT/Library/Parsing.py:645:
  unused function 'GetPcdOfInf' (60% confidence)
- UPT/Library/Parsing.py:682:
  unused function 'GetPcdOfDec' (60% confidence)
- UPT/Library/Parsing.py:739:
  unused function 'InsertSectionItems' (60% confidence)
- UPT/Library/Parsing.py:776:
  unused function 'GenMetaDatSectionItem' (60% confidence)
- UPT/Library/StringUtils.py:87:
  unused function 'GetLibraryClassesWithModuleType' (60% confidence)
- UPT/Library/StringUtils.py:107:
  unused function 'GetDynamics' (60% confidence)
- UPT/Library/StringUtils.py:350:
  unused function 'GetMultipleValuesOfKeyFromLines' (60% confidence)
- UPT/Library/StringUtils.py:396:
  unused function 'GetSingleValueOfKeyFromLines' (60% confidence)
- UPT/Library/StringUtils.py:463:
  unused function 'PreCheck' (60% confidence)
- UPT/Library/StringUtils.py:675:
  unused function 'StringArrayLength' (60% confidence)
- UPT/Library/StringUtils.py:718:
  unused function 'IsHexDigit' (60% confidence)
- UPT/Library/UniClassObject.py:86:
  unused function 'UniToStr' (60% confidence)
- UPT/Library/UniClassObject.py:227:
  unused attribute 'StringNameByteList' (60% confidence)
- UPT/Library/UniClassObject.py:237:
  unused attribute 'StringNameByteList' (60% confidence)
- UPT/Library/UniClassObject.py:377:
  unused method 'GetIncludeFile' (60% confidence)
- UPT/Library/UniClassObject.py:947:
  unused method 'FindStringValue' (60% confidence)
- UPT/Library/UniClassObject.py:957:
  unused method 'FindByToken' (60% confidence)
- UPT/Library/UniClassObject.py:1022:
  unused method 'ReadIncludeUNIfile' (60% confidence)
- UPT/Library/StringUtils.py:718:
  unused function 'IsHexDigit' (60% confidence)
- UPT/Library/Xml/XmlRoutines.py:176:
  unused function 'XmlElementList' (60% confidence)
- UPT/Library/Xml/XmlRoutines.py:202:
  unused function 'XmlNodeName' (60% confidence)

Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>

7 files changed, 0 insertions, 1155 deletions

diff --git a/BaseTools/Source/Python/UPT/Library/CommentGenerating.py b/BaseTools/Source/Python/UPT/Library/CommentGenerating.py
index 4c50ada..ac09ab8 100644
--- a/BaseTools/Source/Python/UPT/Library/CommentGenerating.py
+++ b/BaseTools/Source/Python/UPT/Library/CommentGenerating.py
@@ -43,18 +43,6 @@ def GenTailCommentLines (TailCommentLines, LeadingSpaceNum = 0):
 

     return CommentStr

 

-## GenGenericComment

-#

-# @param CommentLines:   Generic comment Text, maybe Multiple Lines

-#

-def GenGenericComment (CommentLines):

-    if not CommentLines:

-        return ''

-    CommentLines = CommentLines.rstrip(END_OF_LINE)

-    CommentStr = TAB_SPECIAL_COMMENT + TAB_SPACE_SPLIT + (END_OF_LINE + TAB_COMMENT_SPLIT + TAB_SPACE_SPLIT).join\

-    (GetSplitValueList(CommentLines, END_OF_LINE)) + END_OF_LINE

-    return CommentStr

-

 ## GenGenericCommentF

 #

 #  similar to GenGenericComment but will remove <EOL> at end of comment once,

@@ -162,57 +150,6 @@ def GenHeaderCommentSection(Abstract, Description, Copyright, License, IsBinaryH
 

     return Content

 

-

-## GenInfPcdTailComment

-#  Generate Pcd tail comment for Inf, this would be one line comment

-#

-# @param Usage:            Usage type

-# @param TailCommentText:  Comment text for tail comment

-#

-def GenInfPcdTailComment (Usage, TailCommentText):

-    if (Usage == ITEM_UNDEFINED) and (not TailCommentText):

-        return ''

-

-    CommentLine = TAB_SPACE_SPLIT.join([Usage, TailCommentText])

-    return GenTailCommentLines(CommentLine)

-

-## GenInfProtocolPPITailComment

-#  Generate Protocol/PPI tail comment for Inf

-#

-# @param Usage:            Usage type

-# @param TailCommentText:  Comment text for tail comment

-#

-def GenInfProtocolPPITailComment (Usage, Notify, TailCommentText):

-    if (not Notify) and (Usage == ITEM_UNDEFINED) and (not TailCommentText):

-        return ''

-

-    if Notify:

-        CommentLine = USAGE_ITEM_NOTIFY + " ## "

-    else:

-        CommentLine = ''

-

-    CommentLine += TAB_SPACE_SPLIT.join([Usage, TailCommentText])

-    return GenTailCommentLines(CommentLine)

-

-## GenInfGuidTailComment

-#  Generate Guid tail comment for Inf

-#

-# @param Usage:            Usage type

-# @param TailCommentText:  Comment text for tail comment

-#

-def GenInfGuidTailComment (Usage, GuidTypeList, VariableName, TailCommentText):

-    GuidType = GuidTypeList[0]

-    if (Usage == ITEM_UNDEFINED) and (GuidType == ITEM_UNDEFINED) and \

-        (not TailCommentText):

-        return ''

-

-    FirstLine = Usage + " ## " + GuidType

-    if GuidType == TAB_INF_GUIDTYPE_VAR:

-        FirstLine += ":" + VariableName

-

-    CommentLine = TAB_SPACE_SPLIT.join([FirstLine, TailCommentText])

-    return GenTailCommentLines(CommentLine)

-

 ## GenDecGuidTailComment

 #

 # @param SupModuleList:  Supported module type list

diff --git a/BaseTools/Source/Python/UPT/Library/Misc.py b/BaseTools/Source/Python/UPT/Library/Misc.py
index f3688de..554d1ec 100644
--- a/BaseTools/Source/Python/UPT/Library/Misc.py
+++ b/BaseTools/Source/Python/UPT/Library/Misc.py
@@ -495,41 +495,6 @@ def IsAllModuleList(ModuleList):
     else:

         return True

 

-## Dictionary that use comment(GenericComment, TailComment) as value,

-# if a new comment which key already in the dic is inserted, then the

-# comment will be merged.

-# Key is (Statement, SupArch), when TailComment is added, it will ident

-# according to Statement

-#

-class MergeCommentDict(dict):

-    ## []= operator

-    #

-    def __setitem__(self, Key, CommentVal):

-        GenericComment, TailComment = CommentVal

-        if Key in self:

-            OrigVal1, OrigVal2 = dict.__getitem__(self, Key)

-            Statement = Key[0]

-            dict.__setitem__(self, Key, (OrigVal1 + GenericComment, OrigVal2 \

-                                         + len(Statement) * ' ' + TailComment))

-        else:

-            dict.__setitem__(self, Key, (GenericComment, TailComment))

-

-    ## =[] operator

-    #

-    def __getitem__(self, Key):

-        return dict.__getitem__(self, Key)

-

-

-## GenDummyHelpTextObj

-#

-# @retval HelpTxt:   Generated dummy help text object

-#

-def GenDummyHelpTextObj():

-    HelpTxt = TextObject()

-    HelpTxt.SetLang(TAB_LANGUAGE_EN_US)

-    HelpTxt.SetString(' ')

-    return HelpTxt

-

 ## ConvertVersionToDecimal, the minor version should be within 0 - 99

 # <HexVersion>          ::=  "0x" <Major> <Minor>

 # <Major>               ::=  (a-fA-F0-9){4}

diff --git a/BaseTools/Source/Python/UPT/Library/ParserValidate.py b/BaseTools/Source/Python/UPT/Library/ParserValidate.py
index edb0c62..cfa51e7 100644
--- a/BaseTools/Source/Python/UPT/Library/ParserValidate.py
+++ b/BaseTools/Source/Python/UPT/Library/ParserValidate.py
@@ -103,43 +103,6 @@ def IsValidInfMoudleType(ModuleType):
     else:

         return False

 

-## Is Valid Component Type or not

-#

-# @param      ComponentType:  A string contain ComponentType need to be judged.

-#

-def IsValidInfComponentType(ComponentType):

-    if ComponentType.upper() in COMPONENT_TYPE_LIST:

-        return True

-    else:

-        return False

-

-

-## Is valid Tool Family or not

-#

-# @param   ToolFamily:   A string contain Tool Family need to be judged.

-# Family := [A-Z]([a-zA-Z0-9])*

-#

-def IsValidToolFamily(ToolFamily):

-    ReIsValidFamily = re.compile(r"^[A-Z]+[A-Za-z0-9]{0,}$", re.DOTALL)

-    if ReIsValidFamily.match(ToolFamily) is None:

-        return False

-    return True

-

-## Is valid Tool TagName or not

-#

-# The TagName sample is MYTOOLS and VS2005.

-#

-# @param   TagName:   A string contain Tool TagName need to be judged.

-#

-def IsValidToolTagName(TagName):

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

-        return True

-    if TagName.strip() == '*':

-        return True

-    if not IsValidWord(TagName):

-        return False

-    return True

-

 ## Is valid arch or not

 #

 # @param Arch   The arch string need to be validated

@@ -455,37 +418,6 @@ def IsValidHexVersion(Word):
 

     return True

 

-## IsValidBuildNumber

-#

-# Check whether the BUILD_NUMBER is valid.

-# ["BUILD_NUMBER" "=" <Integer>{1,4} <EOL>]

-#

-# @param Word:  The BUILD_NUMBER string need to be checked.

-#

-def IsValidBuildNumber(Word):

-    ReIsValieBuildNumber = re.compile(r"[0-9]{1,4}$", re.DOTALL)

-    if ReIsValieBuildNumber.match(Word) is None:

-        return False

-

-    return True

-

-## IsValidDepex

-#

-# Check whether the Depex is valid.

-#

-# @param Word:  The Depex string need to be checked.

-#

-def IsValidDepex(Word):

-    Index = Word.upper().find("PUSH")

-    if Index > -1:

-        return IsValidCFormatGuid(Word[Index+4:].strip())

-

-    ReIsValidCName = re.compile(r"^[A-Za-z_][0-9A-Za-z_\s\.]*$", re.DOTALL)

-    if ReIsValidCName.match(Word) is None:

-        return False

-

-    return True

-

 ## IsValidNormalizedString

 #

 # Check

@@ -532,25 +464,6 @@ def IsValidIdString(String):
 

     return False

 

-## IsValidVersionString

-#

-# Check whether the VersionString is valid.

-# <AsciiString>           ::=  [ [<WhiteSpace>]{0,} [<AsciiChars>]{0,} ] {0,}

-# <WhiteSpace>            ::=  {<Tab>} {<Space>}

-# <Tab>                   ::=  0x09

-# <Space>                 ::=  0x20

-# <AsciiChars>            ::=  (0x21 - 0x7E)

-#

-# @param VersionString:  The VersionString need to be checked.

-#

-def IsValidVersionString(VersionString):

-    VersionString = VersionString.strip()

-    for Char in VersionString:

-        if not (Char >= 0x21 and Char <= 0x7E):

-            return False

-

-    return True

-

 ## IsValidPcdValue

 #

 # Check whether the PcdValue is valid.

@@ -714,13 +627,3 @@ def IsValidUserId(UserId):
         if Char == '.' and not Quoted:

             return False

     return True

-

-#

-# Check if a UTF16-LE file has a BOM header

-#

-def CheckUTF16FileHeader(File):

-    FileIn = open(File, 'rb').read(2)

-    if FileIn != b'\xff\xfe':

-        return False

-

-    return True

diff --git a/BaseTools/Source/Python/UPT/Library/Parsing.py b/BaseTools/Source/Python/UPT/Library/Parsing.py
index 6fb1337..5f2a448 100644
--- a/BaseTools/Source/Python/UPT/Library/Parsing.py
+++ b/BaseTools/Source/Python/UPT/Library/Parsing.py
@@ -41,29 +41,6 @@ from . import GlobalData
 

 gPKG_INFO_DICT = {}

 

-## GetBuildOption

-#

-# Parse a string with format "[<Family>:]<ToolFlag>=Flag"

-# Return (Family, ToolFlag, Flag)

-#

-# @param String:  String with BuildOption statement

-# @param File:    The file which defines build option, used in error report

-#

-def GetBuildOption(String, File, LineNo= -1):

-    (Family, ToolChain, Flag) = ('', '', '')

-    if String.find(DataType.TAB_EQUAL_SPLIT) < 0:

-        RaiseParserError(String, 'BuildOptions', File, \

-                         '[<Family>:]<ToolFlag>=Flag', LineNo)

-    else:

-        List = GetSplitValueList(String, DataType.TAB_EQUAL_SPLIT, MaxSplit=1)

-        if List[0].find(':') > -1:

-            Family = List[0][ : List[0].find(':')].strip()

-            ToolChain = List[0][List[0].find(':') + 1 : ].strip()

-        else:

-            ToolChain = List[0].strip()

-        Flag = List[1].strip()

-    return (Family, ToolChain, Flag)

-

 ## Get Library Class

 #

 # Get Library of Dsc as <LibraryClassKeyWord>|<LibraryInstance>

@@ -88,37 +65,6 @@ def GetLibraryClass(Item, ContainerFile, WorkspaceDir, LineNo= -1):
 

     return (List[0], List[1], SupMod)

 

-## Get Library Class

-#

-# Get Library of Dsc as <LibraryClassKeyWord>[|<LibraryInstance>]

-# [|<TokenSpaceGuidCName>.<PcdCName>]

-#

-# @param Item:           String as <LibraryClassKeyWord>|<LibraryInstance>

-# @param ContainerFile:  The file which describes the library class, used for

-#                        error report

-#

-def GetLibraryClassOfInf(Item, ContainerFile, WorkspaceDir, LineNo= -1):

-    ItemList = GetSplitValueList((Item[0] + DataType.TAB_VALUE_SPLIT * 2))

-    SupMod = DataType.SUP_MODULE_LIST_STRING

-

-    if len(ItemList) > 5:

-        RaiseParserError\

-        (Item[0], 'LibraryClasses', ContainerFile, \

-         '<LibraryClassKeyWord>[|<LibraryInstance>]\

-         [|<TokenSpaceGuidCName>.<PcdCName>]')

-    else:

-        CheckFileType(ItemList[1], '.Inf', ContainerFile, 'LibraryClasses', \

-                      Item[0], LineNo)

-        CheckFileExist(WorkspaceDir, ItemList[1], ContainerFile, \

-                       'LibraryClasses', Item[0], LineNo)

-        if ItemList[2] != '':

-            CheckPcdTokenInfo(ItemList[2], 'LibraryClasses', \

-                              ContainerFile, LineNo)

-        if Item[1] != '':

-            SupMod = Item[1]

-

-    return (ItemList[0], ItemList[1], ItemList[2], SupMod)

-

 ## CheckPcdTokenInfo

 #

 # Check if PcdTokenInfo is following <TokenSpaceGuidCName>.<PcdCName>

@@ -136,414 +82,6 @@ def CheckPcdTokenInfo(TokenInfoString, Section, File, LineNo= -1):
 

     RaiseParserError(TokenInfoString, Section, File, Format, LineNo)

 

-## Get Pcd

-#

-# Get Pcd of Dsc as <PcdTokenSpaceGuidCName>.<TokenCName>|<Value>

-# [|<Type>|<MaximumDatumSize>]

-#

-# @param Item:           String as <PcdTokenSpaceGuidCName>.<TokenCName>|

-#                        <Value>[|<Type>|<MaximumDatumSize>]

-# @param ContainerFile:  The file which describes the pcd, used for error

-#                        report

-

-#

-def GetPcd(Item, Type, ContainerFile, LineNo= -1):

-    TokenGuid, TokenName, Value, MaximumDatumSize, Token = '', '', '', '', ''

-    List = GetSplitValueList(Item + DataType.TAB_VALUE_SPLIT * 2)

-

-    if len(List) < 4 or len(List) > 6:

-        RaiseParserError(Item, 'Pcds' + Type, ContainerFile, \

-                         '<PcdTokenSpaceGuidCName>.<TokenCName>|<Value>\

-                         [|<Type>|<MaximumDatumSize>]', LineNo)

-    else:

-        Value = List[1]

-        MaximumDatumSize = List[2]

-        Token = List[3]

-

-    if CheckPcdTokenInfo(List[0], 'Pcds' + Type, ContainerFile, LineNo):

-        (TokenGuid, TokenName) = GetSplitValueList(List[0], DataType.TAB_SPLIT)

-

-    return (TokenName, TokenGuid, Value, MaximumDatumSize, Token, Type)

-

-## Get FeatureFlagPcd

-#

-# Get FeatureFlagPcd of Dsc as <PcdTokenSpaceGuidCName>.<TokenCName>|TRUE/FALSE

-#

-# @param Item:           String as <PcdTokenSpaceGuidCName>

-#                        .<TokenCName>|TRUE/FALSE

-# @param ContainerFile:  The file which describes the pcd, used for error

-#                        report

-#

-def GetFeatureFlagPcd(Item, Type, ContainerFile, LineNo= -1):

-    TokenGuid, TokenName, Value = '', '', ''

-    List = GetSplitValueList(Item)

-    if len(List) != 2:

-        RaiseParserError(Item, 'Pcds' + Type, ContainerFile, \

-                         '<PcdTokenSpaceGuidCName>.<TokenCName>|TRUE/FALSE', \

-                         LineNo)

-    else:

-        Value = List[1]

-    if CheckPcdTokenInfo(List[0], 'Pcds' + Type, ContainerFile, LineNo):

-        (TokenGuid, TokenName) = GetSplitValueList(List[0], DataType.TAB_SPLIT)

-

-    return (TokenName, TokenGuid, Value, Type)

-

-## Get DynamicDefaultPcd

-#

-# Get DynamicDefaultPcd of Dsc as <PcdTokenSpaceGuidCName>.<TokenCName>

-# |<Value>[|<DatumTyp>[|<MaxDatumSize>]]

-#

-# @param Item:           String as <PcdTokenSpaceGuidCName>.<TokenCName>|

-#                        TRUE/FALSE

-# @param ContainerFile:  The file which describes the pcd, used for error

-#                        report

-#

-def GetDynamicDefaultPcd(Item, Type, ContainerFile, LineNo= -1):

-    TokenGuid, TokenName, Value, DatumTyp, MaxDatumSize = '', '', '', '', ''

-    List = GetSplitValueList(Item + DataType.TAB_VALUE_SPLIT * 2)

-    if len(List) < 4 or len(List) > 8:

-        RaiseParserError(Item, 'Pcds' + Type, ContainerFile, \

-                         '<PcdTokenSpaceGuidCName>.<TokenCName>|<Value>\

-                         [|<DatumTyp>[|<MaxDatumSize>]]', LineNo)

-    else:

-        Value = List[1]

-        DatumTyp = List[2]

-        MaxDatumSize = List[3]

-    if CheckPcdTokenInfo(List[0], 'Pcds' + Type, ContainerFile, LineNo):

-        (TokenGuid, TokenName) = GetSplitValueList(List[0], DataType.TAB_SPLIT)

-

-    return (TokenName, TokenGuid, Value, DatumTyp, MaxDatumSize, Type)

-

-## Get DynamicHiiPcd

-#

-# Get DynamicHiiPcd of Dsc as <PcdTokenSpaceGuidCName>.<TokenCName>|<String>|

-# <VariableGuidCName>|<VariableOffset>[|<DefaultValue>[|<MaximumDatumSize>]]

-#

-# @param Item:           String as <PcdTokenSpaceGuidCName>.<TokenCName>|

-#                        TRUE/FALSE

-# @param ContainerFile:  The file which describes the pcd, used for error

-#                        report

-#

-def GetDynamicHiiPcd(Item, Type, ContainerFile, LineNo= -1):

-    TokenGuid, TokenName, List1, List2, List3, List4, List5 = \

-    '', '', '', '', '', '', ''

-    List = GetSplitValueList(Item + DataType.TAB_VALUE_SPLIT * 2)

-    if len(List) < 6 or len(List) > 8:

-        RaiseParserError(Item, 'Pcds' + Type, ContainerFile, \

-                         '<PcdTokenSpaceGuidCName>.<TokenCName>|<String>|\

-                         <VariableGuidCName>|<VariableOffset>[|<DefaultValue>\

-                         [|<MaximumDatumSize>]]', LineNo)

-    else:

-        List1, List2, List3, List4, List5 = \

-        List[1], List[2], List[3], List[4], List[5]

-    if CheckPcdTokenInfo(List[0], 'Pcds' + Type, ContainerFile, LineNo):

-        (TokenGuid, TokenName) = GetSplitValueList(List[0], DataType.TAB_SPLIT)

-

-    return (TokenName, TokenGuid, List1, List2, List3, List4, List5, Type)

-

-## Get DynamicVpdPcd

-#

-# Get DynamicVpdPcd of Dsc as <PcdTokenSpaceGuidCName>.<TokenCName>|

-# <VpdOffset>[|<MaximumDatumSize>]

-#

-# @param Item:           String as <PcdTokenSpaceGuidCName>.<TokenCName>

-#                        |TRUE/FALSE

-# @param ContainerFile:  The file which describes the pcd, used for error

-#                        report

-#

-def GetDynamicVpdPcd(Item, Type, ContainerFile, LineNo= -1):

-    TokenGuid, TokenName, List1, List2 = '', '', '', ''

-    List = GetSplitValueList(Item + DataType.TAB_VALUE_SPLIT)

-    if len(List) < 3 or len(List) > 4:

-        RaiseParserError(Item, 'Pcds' + Type, ContainerFile, \

-                         '<PcdTokenSpaceGuidCName>.<TokenCName>|<VpdOffset>\

-                         [|<MaximumDatumSize>]', LineNo)

-    else:

-        List1, List2 = List[1], List[2]

-    if CheckPcdTokenInfo(List[0], 'Pcds' + Type, ContainerFile, LineNo):

-        (TokenGuid, TokenName) = GetSplitValueList(List[0], DataType.TAB_SPLIT)

-

-    return (TokenName, TokenGuid, List1, List2, Type)

-

-## GetComponent

-#

-# Parse block of the components defined in dsc file

-# Set KeyValues as [ ['component name', [lib1, lib2, lib3],

-# [bo1, bo2, bo3], [pcd1, pcd2, pcd3]], ...]

-#

-# @param Lines:             The content to be parsed

-# @param KeyValues:         To store data after parsing

-#

-def GetComponent(Lines, KeyValues):

-    (FindBlock, FindLibraryClass, FindBuildOption, FindPcdsFeatureFlag, \

-     FindPcdsPatchableInModule, FindPcdsFixedAtBuild, FindPcdsDynamic, \

-     FindPcdsDynamicEx) = (False, False, False, False, False, False, False, \

-                           False)

-    ListItem = None

-    LibraryClassItem = []

-    BuildOption = []

-    Pcd = []

-

-    for Line in Lines:

-        Line = Line[0]

-        #

-        # Ignore !include statement

-        #

-        if Line.upper().find(DataType.TAB_INCLUDE.upper() + ' ') > -1 or \

-        Line.upper().find(DataType.TAB_DEFINE + ' ') > -1:

-            continue

-

-        if FindBlock == False:

-            ListItem = Line

-            #

-            # find '{' at line tail

-            #

-            if Line.endswith('{'):

-                FindBlock = True

-                ListItem = CleanString(Line.rsplit('{', 1)[0], \

-                                       DataType.TAB_COMMENT_SPLIT)

-

-        #

-        # Parse a block content

-        #

-        if FindBlock:

-            if Line.find('<LibraryClasses>') != -1:

-                (FindLibraryClass, FindBuildOption, FindPcdsFeatureFlag, \

-                 FindPcdsPatchableInModule, FindPcdsFixedAtBuild, \

-                 FindPcdsDynamic, FindPcdsDynamicEx) = \

-                 (True, False, False, False, False, False, False)

-                continue

-            if Line.find('<BuildOptions>') != -1:

-                (FindLibraryClass, FindBuildOption, FindPcdsFeatureFlag, \

-                 FindPcdsPatchableInModule, FindPcdsFixedAtBuild, \

-                 FindPcdsDynamic, FindPcdsDynamicEx) = \

-                 (False, True, False, False, False, False, False)

-                continue

-            if Line.find('<PcdsFeatureFlag>') != -1:

-                (FindLibraryClass, FindBuildOption, FindPcdsFeatureFlag, \

-                 FindPcdsPatchableInModule, FindPcdsFixedAtBuild, \

-                 FindPcdsDynamic, FindPcdsDynamicEx) = \

-                 (False, False, True, False, False, False, False)

-                continue

-            if Line.find('<PcdsPatchableInModule>') != -1:

-                (FindLibraryClass, FindBuildOption, FindPcdsFeatureFlag, \

-                 FindPcdsPatchableInModule, FindPcdsFixedAtBuild, \

-                 FindPcdsDynamic, FindPcdsDynamicEx) = \

-                 (False, False, False, True, False, False, False)

-                continue

-            if Line.find('<PcdsFixedAtBuild>') != -1:

-                (FindLibraryClass, FindBuildOption, FindPcdsFeatureFlag, \

-                 FindPcdsPatchableInModule, FindPcdsFixedAtBuild, \

-                 FindPcdsDynamic, FindPcdsDynamicEx) = \

-                 (False, False, False, False, True, False, False)

-                continue

-            if Line.find('<PcdsDynamic>') != -1:

-                (FindLibraryClass, FindBuildOption, FindPcdsFeatureFlag, \

-                 FindPcdsPatchableInModule, FindPcdsFixedAtBuild, \

-                 FindPcdsDynamic, FindPcdsDynamicEx) = \

-                 (False, False, False, False, False, True, False)

-                continue

-            if Line.find('<PcdsDynamicEx>') != -1:

-                (FindLibraryClass, FindBuildOption, FindPcdsFeatureFlag, \

-                 FindPcdsPatchableInModule, FindPcdsFixedAtBuild, \

-                 FindPcdsDynamic, FindPcdsDynamicEx) = \

-                 (False, False, False, False, False, False, True)

-                continue

-            if Line.endswith('}'):

-                #

-                # find '}' at line tail

-                #

-                KeyValues.append([ListItem, LibraryClassItem, \

-                                  BuildOption, Pcd])

-                (FindBlock, FindLibraryClass, FindBuildOption, \

-                 FindPcdsFeatureFlag, FindPcdsPatchableInModule, \

-                 FindPcdsFixedAtBuild, FindPcdsDynamic, FindPcdsDynamicEx) = \

-                 (False, False, False, False, False, False, False, False)

-                LibraryClassItem, BuildOption, Pcd = [], [], []

-                continue

-

-        if FindBlock:

-            if FindLibraryClass:

-                LibraryClassItem.append(Line)

-            elif FindBuildOption:

-                BuildOption.append(Line)

-            elif FindPcdsFeatureFlag:

-                Pcd.append((DataType.TAB_PCDS_FEATURE_FLAG_NULL, Line))

-            elif FindPcdsPatchableInModule:

-                Pcd.append((DataType.TAB_PCDS_PATCHABLE_IN_MODULE_NULL, Line))

-            elif FindPcdsFixedAtBuild:

-                Pcd.append((DataType.TAB_PCDS_FIXED_AT_BUILD_NULL, Line))

-            elif FindPcdsDynamic:

-                Pcd.append((DataType.TAB_PCDS_DYNAMIC_DEFAULT_NULL, Line))

-            elif FindPcdsDynamicEx:

-                Pcd.append((DataType.TAB_PCDS_DYNAMIC_EX_DEFAULT_NULL, Line))

-        else:

-            KeyValues.append([ListItem, [], [], []])

-

-    return True

-

-## GetExec

-#

-# Parse a string with format "InfFilename [EXEC = ExecFilename]"

-# Return (InfFilename, ExecFilename)

-#

-# @param String:  String with EXEC statement

-#

-def GetExec(String):

-    InfFilename = ''

-    ExecFilename = ''

-    if String.find('EXEC') > -1:

-        InfFilename = String[ : String.find('EXEC')].strip()

-        ExecFilename = String[String.find('EXEC') + len('EXEC') : ].strip()

-    else:

-        InfFilename = String.strip()

-

-    return (InfFilename, ExecFilename)

-

-## GetComponents

-#

-# Parse block of the components defined in dsc file

-# Set KeyValues as [ ['component name', [lib1, lib2, lib3], [bo1, bo2, bo3],

-# [pcd1, pcd2, pcd3]], ...]

-#

-# @param Lines:             The content to be parsed

-# @param Key:               Reserved

-# @param KeyValues:         To store data after parsing

-# @param CommentCharacter:  Comment char, used to ignore comment content

-#

-# @retval True Get component successfully

-#

-def GetComponents(Lines, KeyValues, CommentCharacter):

-    if Lines.find(DataType.TAB_SECTION_END) > -1:

-        Lines = Lines.split(DataType.TAB_SECTION_END, 1)[1]

-    (FindBlock, FindLibraryClass, FindBuildOption, FindPcdsFeatureFlag, \

-     FindPcdsPatchableInModule, FindPcdsFixedAtBuild, FindPcdsDynamic, \

-     FindPcdsDynamicEx) = \

-     (False, False, False, False, False, False, False, False)

-    ListItem = None

-    LibraryClassItem = []

-    BuildOption = []

-    Pcd = []

-

-    LineList = Lines.split('\n')

-    for Line in LineList:

-        Line = CleanString(Line, CommentCharacter)

-        if Line is None or Line == '':

-            continue

-

-        if FindBlock == False:

-            ListItem = Line

-            #

-            # find '{' at line tail

-            #

-            if Line.endswith('{'):

-                FindBlock = True

-                ListItem = CleanString(Line.rsplit('{', 1)[0], CommentCharacter)

-

-        #

-        # Parse a block content

-        #

-        if FindBlock:

-            if Line.find('<LibraryClasses>') != -1:

-                (FindLibraryClass, FindBuildOption, FindPcdsFeatureFlag, \

-                 FindPcdsPatchableInModule, FindPcdsFixedAtBuild, \

-                 FindPcdsDynamic, FindPcdsDynamicEx) = \

-                 (True, False, False, False, False, False, False)

-                continue

-            if Line.find('<BuildOptions>') != -1:

-                (FindLibraryClass, FindBuildOption, FindPcdsFeatureFlag, \

-                 FindPcdsPatchableInModule, FindPcdsFixedAtBuild, \

-                 FindPcdsDynamic, FindPcdsDynamicEx) = \

-                 (False, True, False, False, False, False, False)

-                continue

-            if Line.find('<PcdsFeatureFlag>') != -1:

-                (FindLibraryClass, FindBuildOption, FindPcdsFeatureFlag, \

-                 FindPcdsPatchableInModule, FindPcdsFixedAtBuild, \

-                 FindPcdsDynamic, FindPcdsDynamicEx) = \

-                 (False, False, True, False, False, False, False)

-                continue

-            if Line.find('<PcdsPatchableInModule>') != -1:

-                (FindLibraryClass, FindBuildOption, FindPcdsFeatureFlag, \

-                 FindPcdsPatchableInModule, FindPcdsFixedAtBuild, \

-                 FindPcdsDynamic, FindPcdsDynamicEx) = \

-                 (False, False, False, True, False, False, False)

-                continue

-            if Line.find('<PcdsFixedAtBuild>') != -1:

-                (FindLibraryClass, FindBuildOption, FindPcdsFeatureFlag, \

-                 FindPcdsPatchableInModule, FindPcdsFixedAtBuild, \

-                 FindPcdsDynamic, FindPcdsDynamicEx) = \

-                 (False, False, False, False, True, False, False)

-                continue

-            if Line.find('<PcdsDynamic>') != -1:

-                (FindLibraryClass, FindBuildOption, FindPcdsFeatureFlag, \

-                 FindPcdsPatchableInModule, FindPcdsFixedAtBuild, \

-                 FindPcdsDynamic, FindPcdsDynamicEx) = \

-                 (False, False, False, False, False, True, False)

-                continue

-            if Line.find('<PcdsDynamicEx>') != -1:

-                (FindLibraryClass, FindBuildOption, FindPcdsFeatureFlag, \

-                 FindPcdsPatchableInModule, FindPcdsFixedAtBuild, \

-                 FindPcdsDynamic, FindPcdsDynamicEx) = \

-                 (False, False, False, False, False, False, True)

-                continue

-            if Line.endswith('}'):

-                #

-                # find '}' at line tail

-                #

-                KeyValues.append([ListItem, LibraryClassItem, BuildOption, \

-                                  Pcd])

-                (FindBlock, FindLibraryClass, FindBuildOption, \

-                 FindPcdsFeatureFlag, FindPcdsPatchableInModule, \

-                 FindPcdsFixedAtBuild, FindPcdsDynamic, FindPcdsDynamicEx) = \

-                 (False, False, False, False, False, False, False, False)

-                LibraryClassItem, BuildOption, Pcd = [], [], []

-                continue

-

-        if FindBlock:

-            if FindLibraryClass:

-                LibraryClassItem.append(Line)

-            elif FindBuildOption:

-                BuildOption.append(Line)

-            elif FindPcdsFeatureFlag:

-                Pcd.append((DataType.TAB_PCDS_FEATURE_FLAG, Line))

-            elif FindPcdsPatchableInModule:

-                Pcd.append((DataType.TAB_PCDS_PATCHABLE_IN_MODULE, Line))

-            elif FindPcdsFixedAtBuild:

-                Pcd.append((DataType.TAB_PCDS_FIXED_AT_BUILD, Line))

-            elif FindPcdsDynamic:

-                Pcd.append((DataType.TAB_PCDS_DYNAMIC, Line))

-            elif FindPcdsDynamicEx:

-                Pcd.append((DataType.TAB_PCDS_DYNAMIC_EX, Line))

-        else:

-            KeyValues.append([ListItem, [], [], []])

-

-    return True

-

-## Get Source

-#

-# Get Source of Inf as <Filename>[|<Family>[|<TagName>[|<ToolCode>

-# [|<PcdFeatureFlag>]]]]

-#

-# @param Item:           String as <Filename>[|<Family>[|<TagName>[|<ToolCode>

-#                        [|<PcdFeatureFlag>]]]]

-# @param ContainerFile:  The file which describes the library class, used

-#                        for error report

-#

-def GetSource(Item, ContainerFile, FileRelativePath, LineNo= -1):

-    ItemNew = Item + DataType.TAB_VALUE_SPLIT * 4

-    List = GetSplitValueList(ItemNew)

-    if len(List) < 5 or len(List) > 9:

-        RaiseParserError(Item, 'Sources', ContainerFile, \

-                         '<Filename>[|<Family>[|<TagName>[|<ToolCode>\

-                         [|<PcdFeatureFlag>]]]]', LineNo)

-    List[0] = NormPath(List[0])

-    CheckFileExist(FileRelativePath, List[0], ContainerFile, 'Sources', \

-                   Item, LineNo)

-    if List[4] != '':

-        CheckPcdTokenInfo(List[4], 'Sources', ContainerFile, LineNo)

-

-    return (List[0], List[1], List[2], List[3], List[4])

-

 ## Get Binary

 #

 # Get Binary of Inf as <Filename>[|<Family>[|<TagName>[|<ToolCode>

@@ -569,51 +107,6 @@ def GetBinary(Item, ContainerFile, LineNo= -1):
     elif len(List) == 3:

         return (List[0], List[1], List[2], '')

 

-## Get Guids/Protocols/Ppis

-#

-# Get Guids/Protocols/Ppis of Inf as <GuidCName>[|<PcdFeatureFlag>]

-#

-# @param Item:           String as <GuidCName>[|<PcdFeatureFlag>]

-# @param Type:           Type of parsing string

-# @param ContainerFile:  The file which describes the library class,

-#                        used for error report

-#

-def GetGuidsProtocolsPpisOfInf(Item):

-    ItemNew = Item + DataType.TAB_VALUE_SPLIT

-    List = GetSplitValueList(ItemNew)

-    return (List[0], List[1])

-

-## Get Guids/Protocols/Ppis

-#

-# Get Guids/Protocols/Ppis of Dec as <GuidCName>=<GuidValue>

-#

-# @param Item:           String as <GuidCName>=<GuidValue>

-# @param Type:           Type of parsing string

-# @param ContainerFile:  The file which describes the library class,

-# used for error report

-#

-def GetGuidsProtocolsPpisOfDec(Item, Type, ContainerFile, LineNo= -1):

-    List = GetSplitValueList(Item, DataType.TAB_EQUAL_SPLIT)

-    if len(List) != 2:

-        RaiseParserError(Item, Type, ContainerFile, '<CName>=<GuidValue>', \

-                         LineNo)

-    #

-    #convert C-Format Guid to Register Format

-    #

-    if List[1][0] == '{' and List[1][-1] == '}':

-        RegisterFormatGuid = GuidStructureStringToGuidString(List[1])

-        if RegisterFormatGuid == '':

-            RaiseParserError(Item, Type, ContainerFile, \

-                             'CFormat or RegisterFormat', LineNo)

-    else:

-        if CheckGuidRegFormat(List[1]):

-            RegisterFormatGuid = List[1]

-        else:

-            RaiseParserError(Item, Type, ContainerFile, \

-                             'CFormat or RegisterFormat', LineNo)

-

-    return (List[0], RegisterFormatGuid)

-

 ## GetPackage

 #

 # Get Package of Inf as <PackagePath>[|<PcdFeatureFlag>]

@@ -634,70 +127,6 @@ def GetPackage(Item, ContainerFile, FileRelativePath, LineNo= -1):
 

     return (List[0], List[1])

 

-## Get Pcd Values of Inf

-#

-# Get Pcd of Inf as <TokenSpaceGuidCName>.<PcdCName>[|<Value>]

-#

-# @param Item:  The string describes pcd

-# @param Type:  The type of Pcd

-# @param File:  The file which describes the pcd, used for error report

-#

-def GetPcdOfInf(Item, Type, File, LineNo):

-    Format = '<TokenSpaceGuidCName>.<PcdCName>[|<Value>]'

-    TokenGuid, TokenName, Value, InfType = '', '', '', ''

-

-    if Type == DataType.TAB_PCDS_FIXED_AT_BUILD:

-        InfType = DataType.TAB_INF_FIXED_PCD

-    elif Type == DataType.TAB_PCDS_PATCHABLE_IN_MODULE:

-        InfType = DataType.TAB_INF_PATCH_PCD

-    elif Type == DataType.TAB_PCDS_FEATURE_FLAG:

-        InfType = DataType.TAB_INF_FEATURE_PCD

-    elif Type == DataType.TAB_PCDS_DYNAMIC_EX:

-        InfType = DataType.TAB_INF_PCD_EX

-    elif Type == DataType.TAB_PCDS_DYNAMIC:

-        InfType = DataType.TAB_INF_PCD

-    List = GetSplitValueList(Item, DataType.TAB_VALUE_SPLIT, 1)

-    TokenInfo = GetSplitValueList(List[0], DataType.TAB_SPLIT)

-    if len(TokenInfo) != 2:

-        RaiseParserError(Item, InfType, File, Format, LineNo)

-    else:

-        TokenGuid = TokenInfo[0]

-        TokenName = TokenInfo[1]

-

-    if len(List) > 1:

-        Value = List[1]

-    else:

-        Value = None

-    return (TokenGuid, TokenName, Value, InfType)

-

-

-## Get Pcd Values of Dec

-#

-# Get Pcd of Dec as <TokenSpcCName>.<TokenCName>|<Value>|<DatumType>|<Token>

-# @param Item:  Pcd item

-# @param Type:  Pcd type

-# @param File:  Dec file

-# @param LineNo:  Line number

-#

-def GetPcdOfDec(Item, Type, File, LineNo= -1):

-    Format = '<TokenSpaceGuidCName>.<PcdCName>|<Value>|<DatumType>|<Token>'

-    TokenGuid, TokenName, Value, DatumType, Token = '', '', '', '', ''

-    List = GetSplitValueList(Item)

-    if len(List) != 4:

-        RaiseParserError(Item, 'Pcds' + Type, File, Format, LineNo)

-    else:

-        Value = List[1]

-        DatumType = List[2]

-        Token = List[3]

-    TokenInfo = GetSplitValueList(List[0], DataType.TAB_SPLIT)

-    if len(TokenInfo) != 2:

-        RaiseParserError(Item, 'Pcds' + Type, File, Format, LineNo)

-    else:

-        TokenGuid = TokenInfo[0]

-        TokenName = TokenInfo[1]

-

-    return (TokenGuid, TokenName, Value, DatumType, Token, Type)

-

 ## Parse DEFINE statement

 #

 # Get DEFINE macros

@@ -725,60 +154,6 @@ def ParseDefine(LineValue, StartLine, Table, FileID, SectionName, \
                  '', '', Arch, SectionModel, FileID, StartLine, -1, \

                  StartLine, -1, 0)

 

-## InsertSectionItems

-#

-# Insert item data of a section to a dict

-#

-# @param Model:   A model

-# @param CurrentSection:   Current section

-# @param SectionItemList:   Section item list

-# @param ArchList:   Arch list

-# @param ThirdList:   Third list

-# @param RecordSet:   Record set

-#

-def InsertSectionItems(Model, SectionItemList, ArchList, \

-                       ThirdList, RecordSet):

-    #

-    # Insert each item data of a section

-    #

-    for Index in range(0, len(ArchList)):

-        Arch = ArchList[Index]

-        Third = ThirdList[Index]

-        if Arch == '':

-            Arch = DataType.TAB_ARCH_COMMON

-

-        Records = RecordSet[Model]

-        for SectionItem in SectionItemList:

-            LineValue, StartLine, Comment = SectionItem[0], \

-            SectionItem[1], SectionItem[2]

-

-            Logger.Debug(4, ST.MSG_PARSING % LineValue)

-            #

-            # And then parse DEFINE statement

-            #

-            if LineValue.upper().find(DataType.TAB_DEFINE.upper() + ' ') > -1:

-                continue

-            #

-            # At last parse other sections

-            #

-            IdNum = -1

-            Records.append([LineValue, Arch, StartLine, IdNum, Third, Comment])

-

-        if RecordSet != {}:

-            RecordSet[Model] = Records

-

-## GenMetaDatSectionItem

-#

-# @param Key:    A key

-# @param Value:  A value

-# @param List:   A list

-#

-def GenMetaDatSectionItem(Key, Value, List):

-    if Key not in List:

-        List[Key] = [Value]

-    else:

-        List[Key].append(Value)

-

 ## GetPkgInfoFromDec

 #

 # get package name, guid, version info from dec files

diff --git a/BaseTools/Source/Python/UPT/Library/StringUtils.py b/BaseTools/Source/Python/UPT/Library/StringUtils.py
index a6f47d0..fa6c121 100644
--- a/BaseTools/Source/Python/UPT/Library/StringUtils.py
+++ b/BaseTools/Source/Python/UPT/Library/StringUtils.py
@@ -75,50 +75,6 @@ def GenDefines(String, Arch, Defines):
             return -1

     return 1

 

-## GetLibraryClassesWithModuleType

-#

-# Get Library Class definition when no module type defined

-#

-# @param Lines:             The content to be parsed

-# @param Key:               Reserved

-# @param KeyValues:         To store data after parsing

-# @param CommentCharacter:  Comment char, used to ignore comment content

-#

-def GetLibraryClassesWithModuleType(Lines, Key, KeyValues, CommentCharacter):

-    NewKey = SplitModuleType(Key)

-    Lines = Lines.split(DataType.TAB_SECTION_END, 1)[1]

-    LineList = Lines.splitlines()

-    for Line in LineList:

-        Line = CleanString(Line, CommentCharacter)

-        if Line != '' and Line[0] != CommentCharacter:

-            KeyValues.append([CleanString(Line, CommentCharacter), NewKey[1]])

-

-    return True

-

-## GetDynamics

-#

-# Get Dynamic Pcds

-#

-# @param Lines:             The content to be parsed

-# @param Key:               Reserved

-# @param KeyValues:         To store data after parsing

-# @param CommentCharacter:  Comment char, used to ignore comment content

-#

-def GetDynamics(Lines, Key, KeyValues, CommentCharacter):

-    #

-    # Get SkuId Name List

-    #

-    SkuIdNameList = SplitModuleType(Key)

-

-    Lines = Lines.split(DataType.TAB_SECTION_END, 1)[1]

-    LineList = Lines.splitlines()

-    for Line in LineList:

-        Line = CleanString(Line, CommentCharacter)

-        if Line != '' and Line[0] != CommentCharacter:

-            KeyValues.append([CleanString(Line, CommentCharacter), SkuIdNameList[1]])

-

-    return True

-

 ## SplitModuleType

 #

 # Split ModuleType out of section defien to get key

@@ -337,29 +293,6 @@ def CleanString2(Line, CommentCharacter=DataType.TAB_COMMENT_SPLIT, AllowCppStyl
 

     return Line, Comment

 

-## GetMultipleValuesOfKeyFromLines

-#

-# Parse multiple strings to clean comment and spaces

-# The result is saved to KeyValues

-#

-# @param Lines:             The content to be parsed

-# @param Key:               Reserved

-# @param KeyValues:         To store data after parsing

-# @param CommentCharacter:  Comment char, used to ignore comment content

-#

-def GetMultipleValuesOfKeyFromLines(Lines, Key, KeyValues, CommentCharacter):

-    if Key:

-        pass

-    if KeyValues:

-        pass

-    Lines = Lines.split(DataType.TAB_SECTION_END, 1)[1]

-    LineList = Lines.split('\n')

-    for Line in LineList:

-        Line = CleanString(Line, CommentCharacter)

-        if Line != '' and Line[0] != CommentCharacter:

-            KeyValues += [Line]

-    return True

-

 ## GetDefineValue

 #

 # Parse a DEFINE statement to get defined value

@@ -375,133 +308,6 @@ def GetDefineValue(String, Key, CommentCharacter):
     String = CleanString(String)

     return String[String.find(Key + ' ') + len(Key + ' ') : ]

 

-## GetSingleValueOfKeyFromLines

-#

-# Parse multiple strings as below to get value of each definition line

-# Key1 = Value1

-# Key2 = Value2

-# The result is saved to Dictionary

-#

-# @param Lines:                The content to be parsed

-# @param Dictionary:           To store data after parsing

-# @param CommentCharacter:     Comment char, be used to ignore comment content

-# @param KeySplitCharacter:    Key split char, between key name and key value.

-#                              Key1 = Value1, '=' is the key split char

-# @param ValueSplitFlag:       Value split flag, be used to decide if has

-#                              multiple values

-# @param ValueSplitCharacter:  Value split char, be used to split multiple

-#                              values. Key1 = Value1|Value2, '|' is the value

-#                              split char

-#

-def GetSingleValueOfKeyFromLines(Lines, Dictionary, CommentCharacter, KeySplitCharacter, \

-                                 ValueSplitFlag, ValueSplitCharacter):

-    Lines = Lines.split('\n')

-    Keys = []

-    Value = ''

-    DefineValues = ['']

-    SpecValues = ['']

-

-    for Line in Lines:

-        #

-        # Handle DEFINE and SPEC

-        #

-        if Line.find(DataType.TAB_INF_DEFINES_DEFINE + ' ') > -1:

-            if '' in DefineValues:

-                DefineValues.remove('')

-            DefineValues.append(GetDefineValue(Line, DataType.TAB_INF_DEFINES_DEFINE, CommentCharacter))

-            continue

-        if Line.find(DataType.TAB_INF_DEFINES_SPEC + ' ') > -1:

-            if '' in SpecValues:

-                SpecValues.remove('')

-            SpecValues.append(GetDefineValue(Line, DataType.TAB_INF_DEFINES_SPEC, CommentCharacter))

-            continue

-

-        #

-        # Handle Others

-        #

-        LineList = Line.split(KeySplitCharacter, 1)

-        if len(LineList) >= 2:

-            Key = LineList[0].split()

-            if len(Key) == 1 and Key[0][0] != CommentCharacter:

-                #

-                # Remove comments and white spaces

-                #

-                LineList[1] = CleanString(LineList[1], CommentCharacter)

-                if ValueSplitFlag:

-                    Value = list(map(lambda x: x.strip(), LineList[1].split(ValueSplitCharacter)))

-                else:

-                    Value = CleanString(LineList[1], CommentCharacter).splitlines()

-

-                if Key[0] in Dictionary:

-                    if Key[0] not in Keys:

-                        Dictionary[Key[0]] = Value

-                        Keys.append(Key[0])

-                    else:

-                        Dictionary[Key[0]].extend(Value)

-                else:

-                    Dictionary[DataType.TAB_INF_DEFINES_MACRO][Key[0]] = Value[0]

-

-    if DefineValues == []:

-        DefineValues = ['']

-    if SpecValues == []:

-        SpecValues = ['']

-    Dictionary[DataType.TAB_INF_DEFINES_DEFINE] = DefineValues

-    Dictionary[DataType.TAB_INF_DEFINES_SPEC] = SpecValues

-

-    return True

-

-## The content to be parsed

-#

-# Do pre-check for a file before it is parsed

-# Check $()

-# Check []

-#

-# @param FileName:       Used for error report

-# @param FileContent:    File content to be parsed

-# @param SupSectionTag:  Used for error report

-#

-def PreCheck(FileName, FileContent, SupSectionTag):

-    if SupSectionTag:

-        pass

-    LineNo = 0

-    IsFailed = False

-    NewFileContent = ''

-    for Line in FileContent.splitlines():

-        LineNo = LineNo + 1

-        #

-        # Clean current line

-        #

-        Line = CleanString(Line)

-        #

-        # Remove commented line

-        #

-        if Line.find(DataType.TAB_COMMA_SPLIT) == 0:

-            Line = ''

-        #

-        # Check $()

-        #

-        if Line.find('$') > -1:

-            if Line.find('$(') < 0 or Line.find(')') < 0:

-                Logger.Error("Parser", FORMAT_INVALID, Line=LineNo, File=FileName, RaiseError=Logger.IS_RAISE_ERROR)

-        #

-        # Check []

-        #

-        if Line.find('[') > -1 or Line.find(']') > -1:

-            #

-            # Only get one '[' or one ']'

-            #

-            if not (Line.find('[') > -1 and Line.find(']') > -1):

-                Logger.Error("Parser", FORMAT_INVALID, Line=LineNo, File=FileName, RaiseError=Logger.IS_RAISE_ERROR)

-        #

-        # Regenerate FileContent

-        #

-        NewFileContent = NewFileContent + Line + '\r\n'

-

-    if IsFailed:

-        Logger.Error("Parser", FORMAT_INVALID, Line=LineNo, File=FileName, RaiseError=Logger.IS_RAISE_ERROR)

-

-    return NewFileContent

-

 ## CheckFileType

 #

 # Check if the Filename is including ExtName

@@ -666,20 +472,6 @@ def GetHelpTextList(HelpTextClassList):
                 List.extend(HelpText.String.split('\n'))

     return List

 

-## Get String Array Length

-#

-# Get String Array Length

-#

-# @param String: the source string

-#

-def StringArrayLength(String):

-    if String.startswith('L"'):

-        return (len(String) - 3 + 1) * 2

-    elif String.startswith('"'):

-        return (len(String) - 2 + 1)

-    else:

-        return len(String.split()) + 1

-

 ## RemoveDupOption

 #

 # Remove Dup Option

@@ -707,27 +499,6 @@ def RemoveDupOption(OptionString, Which="/I", Against=None):
             ValueList.append(Val)

     return " ".join(OptionList)

 

-## Check if the string is HexDgit

-#

-# Return true if all characters in the string are digits and there is at

-# least one character

-# or valid Hexs (started with 0x, following by hexdigit letters)

-# , false otherwise.

-# @param string: input string

-#

-def IsHexDigit(Str):

-    try:

-        int(Str, 10)

-        return True

-    except ValueError:

-        if len(Str) > 2 and Str.upper().startswith('0X'):

-            try:

-                int(Str, 16)

-                return True

-            except ValueError:

-                return False

-    return False

-

 ## Check if the string is HexDgit and its integer value within limit of UINT32

 #

 # Return true if all characters in the string are digits and there is at

diff --git a/BaseTools/Source/Python/UPT/Library/UniClassObject.py b/BaseTools/Source/Python/UPT/Library/UniClassObject.py
index 80924a6..1e7ca70 100644
--- a/BaseTools/Source/Python/UPT/Library/UniClassObject.py
+++ b/BaseTools/Source/Python/UPT/Library/UniClassObject.py
@@ -74,18 +74,6 @@ gLANG_CONV_TABLE = {'eng':'en', 'fra':'fr', \
                  'wln':'wa', 'wol':'wo', 'xho':'xh', 'yid':'yi', 'yor':'yo', 'zha':'za', \

                  'zho':'zh', 'zul':'zu'}

 

-## Convert a python unicode string to a normal string

-#

-# Convert a python unicode string to a normal string

-# UniToStr(u'I am a string') is 'I am a string'

-#

-# @param Uni:  The python unicode string

-#

-# @retval:     The formatted normal string

-#

-def UniToStr(Uni):

-    return repr(Uni)[2:-1]

-

 ## Convert a unicode string to a Hex list

 #

 # Convert a unicode string to a Hex list

@@ -224,7 +212,6 @@ def FormatUniEntry(StrTokenName, TokenValueList, ContainerFile):
 class StringDefClassObject(object):

     def __init__(self, Name = None, Value = None, Referenced = False, Token = None, UseOtherLangDef = ''):

         self.StringName = ''

-        self.StringNameByteList = []

         self.StringValue = ''

         self.StringValueByteList = ''

         self.Token = 0

@@ -234,7 +221,6 @@ class StringDefClassObject(object):
 

         if Name is not None:

             self.StringName = Name

-            self.StringNameByteList = UniToHexList(Name)

         if Value is not None:

             self.StringValue = Value

             self.StringValueByteList = UniToHexList(self.StringValue)

@@ -372,15 +358,6 @@ class UniFileClassObject(object):
                 self.AddStringToList(Name, Language, Value)

 

     #

-    # Get include file list and load them

-    #

-    def GetIncludeFile(self, Item, Dir = None):

-        if Dir:

-            pass

-        FileName = Item[Item.find(u'!include ') + len(u'!include ') :Item.find(u' ', len(u'!include '))][1:-1]

-        self.LoadUniFile(FileName)

-

-    #

     # Pre-process before parse .uni file

     #

     def PreProcess(self, File, IsIncludeFile=False):

@@ -942,26 +919,6 @@ class UniFileClassObject(object):
             Item.Referenced = True

 

     #

-    # Search the string in language definition by Name

-    #

-    def FindStringValue(self, Name, Lang):

-        if Name in self.OrderedStringDict[Lang]:

-            ItemIndexInList = self.OrderedStringDict[Lang][Name]

-            return self.OrderedStringList[Lang][ItemIndexInList]

-

-        return None

-

-    #

-    # Search the string in language definition by Token

-    #

-    def FindByToken(self, Token, Lang):

-        for Item in self.OrderedStringList[Lang]:

-            if Item.Token == Token:

-                return Item

-

-        return None

-

-    #

     # Re-order strings and re-generate tokens

     #

     def ReToken(self):

@@ -1015,25 +972,3 @@ class UniFileClassObject(object):
             print(Item)

             for Member in self.OrderedStringList[Item]:

                 print(str(Member))

-

-    #

-    # Read content from '!include' UNI file

-    #

-    def ReadIncludeUNIfile(self, FilaPath):

-        if self.File:

-            pass

-

-        if not os.path.exists(FilaPath) or not os.path.isfile(FilaPath):

-            EdkLogger.Error("Unicode File Parser",

-                             ToolError.FILE_NOT_FOUND,

-                             ExtraData=FilaPath)

-        try:

-            FileIn = codecs.open(FilaPath, mode='rb', encoding='utf_8').readlines()

-        except UnicodeError as Xstr:

-            FileIn = codecs.open(FilaPath, mode='rb', encoding='utf_16').readlines()

-        except UnicodeError:

-            FileIn = codecs.open(FilaPath, mode='rb', encoding='utf_16_le').readlines()

-        except:

-            EdkLogger.Error("Unicode File Parser", ToolError.FILE_OPEN_FAILURE, ExtraData=FilaPath)

-        return FileIn

-

diff --git a/BaseTools/Source/Python/UPT/Library/Xml/XmlRoutines.py b/BaseTools/Source/Python/UPT/Library/Xml/XmlRoutines.py
index 94e97fa..b12999a 100644
--- a/BaseTools/Source/Python/UPT/Library/Xml/XmlRoutines.py
+++ b/BaseTools/Source/Python/UPT/Library/Xml/XmlRoutines.py
@@ -150,33 +150,6 @@ def XmlElement2(Dom, String):
     except BaseException:

         return ""

 

-

-## Get a single XML element of the current node.

-#

-# Return a single XML element specified by the current root Dom.

-# If the input Dom is not valid, then an empty string is returned.

-#

-# @param  Dom                The root XML DOM object.

-#

-def XmlElementData(Dom):

-    try:

-        return Dom.firstChild.data.strip()

-    except BaseException:

-        return ""

-

-

-## Get a list of XML elements using XPath style syntax.

-#

-# Return a list of XML elements from the root Dom specified by XPath String.

-# If the input Dom or String is not valid, then an empty list is returned.

-#

-# @param  Dom                The root XML DOM object.

-# @param  String             A XPath style path.

-#

-def XmlElementList(Dom, String):

-    return list(map(XmlElementData, XmlList(Dom, String)))

-

-

 ## Get the XML attribute of the current node.

 #

 # Return a single XML attribute named Attribute from the current root Dom.

@@ -191,20 +164,6 @@ def XmlAttribute(Dom, Attribute):
     except BaseException:

         return ''

 

-

-## Get the XML node name of the current node.

-#

-# Return a single XML node name from the current root Dom.

-# If the input Dom is not valid, then an empty string is returned.

-#

-# @param  Dom                The root XML DOM object.

-#

-def XmlNodeName(Dom):

-    try:

-        return Dom.nodeName.strip()

-    except BaseException:

-        return ''

-

 ## Parse an XML file.

 #

 # Parse the input XML file named FileName and return a XML DOM it stands for.