From f7496d717357b9af78414d19679b073403812340 Mon Sep 17 00:00:00 2001 From: Liming Gao Date: Thu, 5 Jul 2018 17:40:04 +0800 Subject: BaseTools: Clean up source files 1. Do not use tab characters 2. No trailing white space in one line 3. All files must end with CRLF Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Liming Gao Cc: Yonghong Zhu Reviewed-by: Yonghong Zhu --- .../Python/UPT/Object/Parser/InfPpiObject.py | 160 ++++++++++----------- 1 file changed, 80 insertions(+), 80 deletions(-) (limited to 'BaseTools/Source/Python/UPT/Object/Parser/InfPpiObject.py') diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfPpiObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfPpiObject.py index 0f865c5696..b871a5088a 100644 --- a/BaseTools/Source/Python/UPT/Object/Parser/InfPpiObject.py +++ b/BaseTools/Source/Python/UPT/Object/Parser/InfPpiObject.py @@ -1,12 +1,12 @@ ## @file -# This file is used to define class objects of INF file [Ppis] section. -# It will consumed by InfParser. +# This file is used to define class objects of INF file [Ppis] section. +# It will consumed by InfParser. # -# Copyright (c) 2011, Intel Corporation. All rights reserved.
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
# -# This program and the accompanying materials are licensed and made available -# under the terms and conditions of the BSD License which accompanies this -# distribution. The full text of the license may be found at +# This program and the accompanying materials are licensed and made available +# under the terms and conditions of the BSD License which accompanies this +# distribution. The full text of the license may be found at # http://opensource.org/licenses/bsd-license.php # # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, @@ -18,17 +18,17 @@ InfPpiObject from Library.ParserValidate import IsValidCVariableName from Library.CommentParsing import ParseComment -from Library.ExpressionValidate import IsValidFeatureFlagExp - +from Library.ExpressionValidate import IsValidFeatureFlagExp + from Library.Misc import Sdict -from Library import DataType as DT +from Library import DataType as DT import Logger.Log as Logger from Logger import ToolError from Logger import StringTable as ST def ParsePpiComment(CommentsList, InfPpiItemObj): PreNotify = None - PreUsage = None + PreUsage = None PreHelpText = '' BlockFlag = -1 CommentInsList = [] @@ -39,22 +39,22 @@ def ParsePpiComment(CommentsList, InfPpiItemObj): CommentItemNotify, \ CommentItemString, \ CommentItemHelpText = \ - ParseComment(CommentItem, - DT.ALL_USAGE_TOKENS, - DT.PPI_NOTIFY_TOKENS, - ['PPI'], + ParseComment(CommentItem, + DT.ALL_USAGE_TOKENS, + DT.PPI_NOTIFY_TOKENS, + ['PPI'], False) - + # - # To avoid PyLint error + # To avoid PyLint error # if CommentItemString: pass - + if CommentItemHelpText is None: CommentItemHelpText = '' if Count == len(CommentsList) and CommentItemUsage == CommentItemNotify == DT.ITEM_UNDEFINED: - CommentItemHelpText = DT.END_OF_LINE + CommentItemHelpText = DT.END_OF_LINE # # For the Last comment Item, set BlockFlag. # @@ -65,12 +65,12 @@ def ParsePpiComment(CommentsList, InfPpiItemObj): else: BlockFlag = 3 elif BlockFlag == -1: - BlockFlag = 4 - + BlockFlag = 4 + # # Comment USAGE and NOTIFY information are "UNDEFINED" # - if BlockFlag == -1 or BlockFlag == 1 or BlockFlag == 2: + if BlockFlag == -1 or BlockFlag == 1 or BlockFlag == 2: if CommentItemUsage == CommentItemNotify == DT.ITEM_UNDEFINED: if BlockFlag == -1: BlockFlag = 1 @@ -81,41 +81,41 @@ def ParsePpiComment(CommentsList, InfPpiItemObj): BlockFlag = 3 # # An item have Usage or Notify information and the first time get this information - # + # elif BlockFlag == -1: BlockFlag = 4 - + # # Combine two comment line if they are generic comment - # + # if CommentItemUsage == CommentItemNotify == PreUsage == PreNotify == DT.ITEM_UNDEFINED: CommentItemHelpText = PreHelpText + DT.END_OF_LINE + CommentItemHelpText # # Store this information for next line may still need combine operation. # PreHelpText = CommentItemHelpText - - if BlockFlag == 4: + + if BlockFlag == 4: CommentItemIns = InfPpiItemCommentContent() CommentItemIns.SetUsage(CommentItemUsage) CommentItemIns.SetNotify(CommentItemNotify) CommentItemIns.SetHelpStringItem(CommentItemHelpText) CommentInsList.append(CommentItemIns) - + BlockFlag = -1 PreUsage = None PreNotify = None PreHelpText = '' - + elif BlockFlag == 3: # # Add previous help string - # + # CommentItemIns = InfPpiItemCommentContent() CommentItemIns.SetUsage(DT.ITEM_UNDEFINED) CommentItemIns.SetNotify(DT.ITEM_UNDEFINED) if PreHelpText == '' or PreHelpText.endswith(DT.END_OF_LINE): - PreHelpText += DT.END_OF_LINE + PreHelpText += DT.END_OF_LINE CommentItemIns.SetHelpStringItem(PreHelpText) CommentInsList.append(CommentItemIns) # @@ -126,7 +126,7 @@ def ParsePpiComment(CommentsList, InfPpiItemObj): CommentItemIns.SetNotify(CommentItemNotify) CommentItemIns.SetHelpStringItem(CommentItemHelpText) CommentInsList.append(CommentItemIns) - + BlockFlag = -1 PreUsage = None PreNotify = None @@ -135,15 +135,15 @@ def ParsePpiComment(CommentsList, InfPpiItemObj): PreUsage = CommentItemUsage PreNotify = CommentItemNotify PreHelpText = CommentItemHelpText - + InfPpiItemObj.SetCommentList(CommentInsList) - + return InfPpiItemObj class InfPpiItemCommentContent(): def __init__(self): # - # ## SOMETIMES_CONSUMES ## HelpString + # ## SOMETIMES_CONSUMES ## HelpString # self.UsageItem = '' # @@ -152,30 +152,30 @@ class InfPpiItemCommentContent(): self.HelpStringItem = '' self.Notify = '' self.CommentList = [] - + def SetUsage(self, UsageItem): self.UsageItem = UsageItem def GetUsage(self): return self.UsageItem - + def SetNotify(self, Notify): if Notify != DT.ITEM_UNDEFINED: self.Notify = 'true' def GetNotify(self): return self.Notify - + def SetHelpStringItem(self, HelpStringItem): self.HelpStringItem = HelpStringItem def GetHelpStringItem(self): return self.HelpStringItem - + class InfPpiItem(): def __init__(self): self.Name = '' - self.FeatureFlagExp = '' + self.FeatureFlagExp = '' self.SupArchList = [] self.CommentList = [] - + def SetName(self, Name): self.Name = Name def GetName(self): @@ -184,7 +184,7 @@ class InfPpiItem(): def SetSupArchList(self, SupArchList): self.SupArchList = SupArchList def GetSupArchList(self): - return self.SupArchList + return self.SupArchList def SetCommentList(self, CommentList): self.CommentList = CommentList @@ -206,17 +206,17 @@ class InfPpiObject(): # Macro defined in this section should be only used in this section. # self.Macros = {} - + def SetPpi(self, PpiList, Arch = None): __SupArchList = [] for ArchItem in Arch: # # Validate Arch - # + # if (ArchItem == '' or ArchItem is None): - ArchItem = 'COMMON' + ArchItem = 'COMMON' __SupArchList.append(ArchItem) - + for Item in PpiList: # # Get Comment content of this protocol @@ -226,26 +226,26 @@ class InfPpiObject(): CommentsList = Item[1] CurrentLineOfItem = Item[2] Item = Item[0] - InfPpiItemObj = InfPpiItem() + InfPpiItemObj = InfPpiItem() if len(Item) >= 1 and len(Item) <= 2: # # Only CName contained # if not IsValidCVariableName(Item[0]): - Logger.Error("InfParser", - ToolError.FORMAT_INVALID, + Logger.Error("InfParser", + ToolError.FORMAT_INVALID, ST.ERR_INF_PARSER_INVALID_CNAME%(Item[0]), - File=CurrentLineOfItem[2], - Line=CurrentLineOfItem[1], + File=CurrentLineOfItem[2], + Line=CurrentLineOfItem[1], ExtraData=CurrentLineOfItem[0]) if (Item[0] != ''): InfPpiItemObj.SetName(Item[0]) else: - Logger.Error("InfParser", - ToolError.FORMAT_INVALID, + Logger.Error("InfParser", + ToolError.FORMAT_INVALID, ST.ERR_INF_PARSER_CNAME_MISSING, - File=CurrentLineOfItem[2], - Line=CurrentLineOfItem[1], + File=CurrentLineOfItem[2], + Line=CurrentLineOfItem[1], ExtraData=CurrentLineOfItem[0]) # # Have FeatureFlag information @@ -254,14 +254,14 @@ class InfPpiObject(): # # Contained CName and Feature Flag Express # ::= ["|" ] - # Item[1] should not be empty + # Item[1] should not be empty # if Item[1].strip() == '': - Logger.Error("InfParser", - ToolError.FORMAT_INVALID, + Logger.Error("InfParser", + ToolError.FORMAT_INVALID, ST.ERR_INF_PARSER_FEATURE_FLAG_EXP_MISSING, - File=CurrentLineOfItem[2], - Line=CurrentLineOfItem[1], + File=CurrentLineOfItem[2], + Line=CurrentLineOfItem[1], ExtraData=CurrentLineOfItem[0]) # # Validate Feature Flag Express for PPI entry @@ -269,24 +269,24 @@ class InfPpiObject(): # FeatureFlagRtv = IsValidFeatureFlagExp(Item[1].strip()) if not FeatureFlagRtv[0]: - Logger.Error("InfParser", + Logger.Error("InfParser", ToolError.FORMAT_INVALID, ST.ERR_INF_PARSER_FEATURE_FLAG_EXP_SYNTAX_INVLID%(FeatureFlagRtv[1]), - File=CurrentLineOfItem[2], - Line=CurrentLineOfItem[1], + File=CurrentLineOfItem[2], + Line=CurrentLineOfItem[1], ExtraData=CurrentLineOfItem[0]) InfPpiItemObj.SetFeatureFlagExp(Item[1]) if len(Item) != 1 and len(Item) != 2: # - # Invalid format of Ppi statement + # Invalid format of Ppi statement # - Logger.Error("InfParser", + Logger.Error("InfParser", ToolError.FORMAT_INVALID, ST.ERR_INF_PARSER_GUID_PPI_PROTOCOL_SECTION_CONTENT_ERROR, - File=CurrentLineOfItem[2], - Line=CurrentLineOfItem[1], + File=CurrentLineOfItem[2], + Line=CurrentLineOfItem[1], ExtraData=CurrentLineOfItem[0]) - + # # Get/Set Usage and HelpString for PPI entry # @@ -297,20 +297,20 @@ class InfPpiObject(): CommentItemIns.SetUsage(DT.ITEM_UNDEFINED) CommentItemIns.SetNotify(DT.ITEM_UNDEFINED) InfPpiItemObj.SetCommentList([CommentItemIns]) - + InfPpiItemObj.SetSupArchList(__SupArchList) # # Determine PPI name duplicate. Follow below rule: # - # A PPI must not be duplicated within a [Ppis] section. - # A PPI may appear in multiple architectural [Ppis] - # sections. A PPI listed in an architectural [Ppis] - # section must not be listed in the common architectural + # A PPI must not be duplicated within a [Ppis] section. + # A PPI may appear in multiple architectural [Ppis] + # sections. A PPI listed in an architectural [Ppis] + # section must not be listed in the common architectural # [Ppis] section. - # + # # NOTE: This check will not report error now. - # + # for Item in self.Ppis: if Item.GetName() == InfPpiItemObj.GetName(): ItemSupArchList = Item.GetSupArchList() @@ -324,9 +324,9 @@ class InfPpiObject(): if ItemArch.upper() == 'COMMON' or PpiItemObjArch.upper() == 'COMMON': # # ST.ERR_INF_PARSER_ITEM_DUPLICATE_COMMON - # + # pass - + if (InfPpiItemObj) in self.Ppis: PpiList = self.Ppis[InfPpiItemObj] PpiList.append(InfPpiItemObj) @@ -335,9 +335,9 @@ class InfPpiObject(): PpiList = [] PpiList.append(InfPpiItemObj) self.Ppis[InfPpiItemObj] = PpiList - - return True - - + + return True + + def GetPpi(self): return self.Ppis -- cgit v1.2.3