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 --- .../Source/Python/UPT/Library/UniClassObject.py | 178 ++++++++++----------- 1 file changed, 89 insertions(+), 89 deletions(-) (limited to 'BaseTools/Source/Python/UPT/Library/UniClassObject.py') diff --git a/BaseTools/Source/Python/UPT/Library/UniClassObject.py b/BaseTools/Source/Python/UPT/Library/UniClassObject.py index a464cbf702..670cf3b4ee 100644 --- a/BaseTools/Source/Python/UPT/Library/UniClassObject.py +++ b/BaseTools/Source/Python/UPT/Library/UniClassObject.py @@ -3,9 +3,9 @@ # # Copyright (c) 2014 - 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, @@ -148,9 +148,9 @@ def GetLanguageCode1766(LangName, File=None): if LangName.isalpha() and gLANG_CONV_TABLE.get(LangName.lower()): return LangName else: - EdkLogger.Error("Unicode File Parser", + EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, - "Invalid RFC 1766 language code : %s" % LangName, + "Invalid RFC 1766 language code : %s" % LangName, File) elif length == 5: if LangName[0:2].isalpha() and LangName[2] == '-': @@ -167,11 +167,11 @@ def GetLanguageCode1766(LangName, File=None): if Key == LangName[0:3].lower(): return Key - EdkLogger.Error("Unicode File Parser", + EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, - "Invalid RFC 4646 language code : %s" % LangName, + "Invalid RFC 4646 language code : %s" % LangName, File) - + ## GetLanguageCode # # Check the language code read from .UNI file and convert RFC 1766 codes to RFC 4646 codes if appropriate @@ -191,9 +191,9 @@ def GetLanguageCode(LangName, IsCompatibleMode, File): return TempLangName return LangName else: - EdkLogger.Error("Unicode File Parser", + EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, - "Invalid RFC 1766 language code : %s" % LangName, + "Invalid RFC 1766 language code : %s" % LangName, File) if (LangName[0] == 'X' or LangName[0] == 'x') and LangName[1] == '-': return LangName @@ -212,9 +212,9 @@ def GetLanguageCode(LangName, IsCompatibleMode, File): if LangName[0:3].isalpha() and gLANG_CONV_TABLE.get(LangName.lower()) is None and LangName[3] == '-': return LangName - EdkLogger.Error("Unicode File Parser", + EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, - "Invalid RFC 4646 language code : %s" % LangName, + "Invalid RFC 4646 language code : %s" % LangName, File) ## FormatUniEntry @@ -231,7 +231,7 @@ def FormatUniEntry(StrTokenName, TokenValueList, ContainerFile): PreFormatLength = 40 if len(StrTokenName) > PreFormatLength: PreFormatLength = len(StrTokenName) + 1 - for (Lang, Value) in TokenValueList: + for (Lang, Value) in TokenValueList: if not Value or Lang == DT.TAB_LANGUAGE_EN_X: continue if Lang == '': @@ -333,15 +333,15 @@ class UniFileClassObject(object): except UnicodeError as Xstr: FileIn = codecs.open(File.Path, mode='rb', encoding='utf_16_le').readlines() except: - EdkLogger.Error("Unicode File Parser", - ToolError.FILE_OPEN_FAILURE, + EdkLogger.Error("Unicode File Parser", + ToolError.FILE_OPEN_FAILURE, "File read failure: %s" % str(Xstr), ExtraData=File) LineNo = GetLineNo(FileIn, Line, False) - EdkLogger.Error("Unicode File Parser", + EdkLogger.Error("Unicode File Parser", ToolError.PARSER_ERROR, - "Wrong language definition", - ExtraData="""%s\n\t*Correct format is like '#langdef en-US "English"'""" % Line, + "Wrong language definition", + ExtraData="""%s\n\t*Correct format is like '#langdef en-US "English"'""" % Line, File = File, Line = LineNo) else: LangName = GetLanguageCode(Lang[1], self.IsCompatibleMode, self.File) @@ -365,7 +365,7 @@ class UniFileClassObject(object): if not IsLangInDef: # # The found STRING tokens will be added into new language string list - # so that the unique STRING identifier is reserved for all languages in the package list. + # so that the unique STRING identifier is reserved for all languages in the package list. # FirstLangName = self.LanguageDef[0][0] if LangName != FirstLangName: @@ -375,10 +375,10 @@ class UniFileClassObject(object): OtherLang = Item.UseOtherLangDef else: OtherLang = FirstLangName - self.OrderedStringList[LangName].append (StringDefClassObject(Item.StringName, - '', - Item.Referenced, - Item.Token, + self.OrderedStringList[LangName].append (StringDefClassObject(Item.StringName, + '', + Item.Referenced, + Item.Token, OtherLang)) self.OrderedStringDict[LangName][Item.StringName] = len(self.OrderedStringList[LangName]) - 1 return True @@ -395,7 +395,7 @@ class UniFileClassObject(object): if Name != '': MatchString = re.match('[A-Z0-9_]+', Name, re.UNICODE) if MatchString is None or MatchString.end(0) != len(Name): - EdkLogger.Error("Unicode File Parser", + EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, 'The string token name %s in UNI file %s must be upper case character.' %(Name, self.File)) LanguageList = Item.split(u'#language ') @@ -406,7 +406,7 @@ class UniFileClassObject(object): Language = LanguageList[IndexI].split()[0] #.replace(u'\r\n', u'') Value = \ - LanguageList[IndexI][LanguageList[IndexI].find(u'\"') + len(u'\"') : LanguageList[IndexI].rfind(u'\"')] + LanguageList[IndexI][LanguageList[IndexI].find(u'\"') + len(u'\"') : LanguageList[IndexI].rfind(u'\"')] Language = GetLanguageCode(Language, self.IsCompatibleMode, self.File) self.AddStringToList(Name, Language, Value) @@ -424,7 +424,7 @@ class UniFileClassObject(object): # def PreProcess(self, File, IsIncludeFile=False): if not os.path.exists(File.Path) or not os.path.isfile(File.Path): - EdkLogger.Error("Unicode File Parser", + EdkLogger.Error("Unicode File Parser", ToolError.FILE_NOT_FOUND, ExtraData=File.Path) @@ -443,8 +443,8 @@ class UniFileClassObject(object): FileIn = codecs.open(File.Path, mode='rb', encoding='utf_16_le').readlines() except: EdkLogger.Error("Unicode File Parser", ToolError.FILE_OPEN_FAILURE, ExtraData=File.Path) - - + + # # get the file header # @@ -467,7 +467,7 @@ class UniFileClassObject(object): if Line.startswith(DT.TAB_COMMENT_EDK1_SPLIT) and HeaderStart and not HeaderEnd and FirstGenHeader: self.UniFileHeader += Line + '\r\n' continue - + # # Use unique identifier # @@ -486,7 +486,7 @@ class UniFileClassObject(object): Line = Line.strip() # # Ignore comment line and empty line - # + # if Line == u'' or Line.startswith(u'//'): # # Change the single line String entry flag status @@ -528,7 +528,7 @@ class UniFileClassObject(object): EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, ExtraData=File.Path) else: EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, ExtraData=File.Path) - + Line = Line.replace(UNICODE_WIDE_CHAR, WIDE_CHAR) Line = Line.replace(UNICODE_NARROW_CHAR, NARROW_CHAR) Line = Line.replace(UNICODE_NON_BREAKING_CHAR, NON_BREAKING_CHAR) @@ -556,16 +556,16 @@ class UniFileClassObject(object): # if Line.startswith(u'#string') and Line.find(u'#language') == -1: MultiLineFeedExits = True - + if Line.startswith(u'#string') and Line.find(u'#language') > 0 and Line.find(u'"') < 0: MultiLineFeedExits = True - + # # Between Language entry and String entry can not contain line feed # if Line.startswith(u'#language') and len(Line.split()) == 2: MultiLineFeedExits = True - + # # Between two String entry, can not contain line feed # @@ -588,7 +588,7 @@ class UniFileClassObject(object): StringEntryExistsFlag = 0 Lines.append(Line) - + # # Convert string def format as below # @@ -601,11 +601,11 @@ class UniFileClassObject(object): # "Mi segunda secuencia 1" # "Mi segunda secuencia 2" # - + if not IsIncludeFile and not Lines: EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, \ Message=ST.ERR_UNIPARSE_NO_SECTION_EXIST, \ - ExtraData=File.Path) + ExtraData=File.Path) NewLines = [] StrName = u'' @@ -615,7 +615,7 @@ class UniFileClassObject(object): EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, \ Message=ST.ERR_UNIPARSE_STRNAME_FORMAT_ERROR % StrName.split()[1], \ ExtraData=File.Path) - + if StrName and len(StrName.split()[1].split(DT.TAB_UNDERLINE_SPLIT)) == 4: StringTokenList = StrName.split()[1].split(DT.TAB_UNDERLINE_SPLIT) if (StringTokenList[3].upper() in [DT.TAB_STR_TOKENPROMPT, DT.TAB_STR_TOKENHELP] and \ @@ -624,19 +624,19 @@ class UniFileClassObject(object): EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, \ Message=ST.ERR_UNIPARSE_STRTOKEN_FORMAT_ERROR % StrName.split()[1], \ ExtraData=File.Path) - + if Line.count(u'#language') > 1: EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, \ Message=ST.ERR_UNIPARSE_SEP_LANGENTRY_LINE % Line, \ - ExtraData=File.Path) - + ExtraData=File.Path) + if Line.startswith(u'//'): continue elif Line.startswith(u'#langdef'): if len(Line.split()) == 2: NewLines.append(Line) continue - elif len(Line.split()) > 2 and Line.find(u'"') > 0: + elif len(Line.split()) > 2 and Line.find(u'"') > 0: NewLines.append(Line[:Line.find(u'"')].strip()) NewLines.append(Line[Line.find(u'"'):]) else: @@ -659,10 +659,10 @@ class UniFileClassObject(object): if Line[Line.find(u'#language')-1] != ' ' or \ Line[Line.find(u'#language')+len(u'#language')] != u' ': EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, ExtraData=File.Path) - + if Line.find(u'"') > 0: EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, ExtraData=File.Path) - + StrName = Line.split()[0] + u' ' + Line.split()[1] if StrName: if StrName.split()[1] not in ExistStrNameList: @@ -684,11 +684,11 @@ class UniFileClassObject(object): if Line[Line.find(u'#language')-1] != u' ' or \ Line[Line.find(u'#language')+len(u'#language')] != u' ': EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, ExtraData=File.Path) - + if Line[Line.find(u'"')-1] != u' ': - EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, ExtraData=File.Path) - - StrName = Line.split()[0] + u' ' + Line.split()[1] + EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, ExtraData=File.Path) + + StrName = Line.split()[0] + u' ' + Line.split()[1] if StrName: if StrName.split()[1] not in ExistStrNameList: ExistStrNameList.append(StrName.split()[1].strip()) @@ -698,11 +698,11 @@ class UniFileClassObject(object): DT.TAB_DEC_BINARY_ABSTRACT, DT.TAB_DEC_BINARY_DESCRIPTION]: EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, \ Message=ST.ERR_UNIPARSE_MULTI_ENTRY_EXIST % StrName.split()[1], \ - ExtraData=File.Path) + ExtraData=File.Path) if IsIncludeFile: if StrName not in NewLines: NewLines.append((Line[:Line.find(u'#language')]).strip()) - else: + else: NewLines.append((Line[:Line.find(u'#language')]).strip()) NewLines.append((Line[Line.find(u'#language'):Line.find(u'"')]).strip()) NewLines.append((Line[Line.find(u'"'):]).strip()) @@ -733,17 +733,17 @@ class UniFileClassObject(object): else: print(Line) EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, ExtraData=File.Path) - + if StrName and not StrName.split()[1].startswith(u'STR_'): EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, \ Message=ST.ERR_UNIPARSE_STRNAME_FORMAT_ERROR % StrName.split()[1], \ - ExtraData=File.Path) - + ExtraData=File.Path) + if StrName and not NewLines: EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, \ Message=ST.ERR_UNI_MISS_LANGENTRY % StrName, \ ExtraData=File.Path) - + # # Check Abstract, Description, BinaryAbstract and BinaryDescription order, # should be Abstract, Description, BinaryAbstract, BinaryDesctiption @@ -762,7 +762,7 @@ class UniFileClassObject(object): BinaryDescriptionPosition = ExistStrNameList.index(StrName) else: DescriptionPosition = ExistStrNameList.index(StrName) - + OrderList = sorted([AbstractPosition, DescriptionPosition]) BinaryOrderList = sorted([BinaryAbstractPosition, BinaryDescriptionPosition]) Min = OrderList[0] @@ -774,25 +774,25 @@ class UniFileClassObject(object): BinaryMax > Max): EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, \ Message=ST.ERR_UNIPARSE_ENTRY_ORDER_WRONG, \ - ExtraData=File.Path) + ExtraData=File.Path) elif BinaryAbstractPosition > -1: if not(BinaryAbstractPosition > Max): EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, \ Message=ST.ERR_UNIPARSE_ENTRY_ORDER_WRONG, \ - ExtraData=File.Path) - + ExtraData=File.Path) + if DescriptionPosition > -1: if not(DescriptionPosition == Max and AbstractPosition == Min and \ DescriptionPosition > AbstractPosition): EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, \ Message=ST.ERR_UNIPARSE_ENTRY_ORDER_WRONG, \ - ExtraData=File.Path) - + ExtraData=File.Path) + if not self.UniFileHeader: - EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, + EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, Message = ST.ERR_NO_SOURCE_HEADER, ExtraData=File.Path) - + return NewLines # @@ -800,13 +800,13 @@ class UniFileClassObject(object): # def LoadUniFile(self, File = None): if File is None: - EdkLogger.Error("Unicode File Parser", - ToolError.PARSER_ERROR, - Message='No unicode file is given', + EdkLogger.Error("Unicode File Parser", + ToolError.PARSER_ERROR, + Message='No unicode file is given', ExtraData=File.Path) - + self.File = File - + # # Process special char in file # @@ -849,10 +849,10 @@ class UniFileClassObject(object): SecondLine.find(u'#string ') < 0 and SecondLine.find(u'#language ') >= 0 and \ ThirdLine.find(u'#string ') < 0 and ThirdLine.find(u'#language ') < 0: if Line.find('"') > 0 or SecondLine.find('"') > 0: - EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, + EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, Message=ST.ERR_UNIPARSE_DBLQUOTE_UNMATCHED, ExtraData=File.Path) - + Name = Line[Line.find(u'#string ') + len(u'#string ') : ].strip(' ') Language = SecondLine[SecondLine.find(u'#language ') + len(u'#language ') : ].strip(' ') for IndexJ in range(IndexI + 2, len(Lines)): @@ -894,11 +894,11 @@ class UniFileClassObject(object): for LangNameItem in self.LanguageDef: if Language == LangNameItem[0]: break - + if Language not in self.OrderedStringList: self.OrderedStringList[Language] = [] self.OrderedStringDict[Language] = {} - + IsAdded = True if Name in self.OrderedStringDict[Language]: IsAdded = False @@ -906,38 +906,38 @@ class UniFileClassObject(object): ItemIndexInList = self.OrderedStringDict[Language][Name] Item = self.OrderedStringList[Language][ItemIndexInList] Item.UpdateValue(Value) - Item.UseOtherLangDef = '' + Item.UseOtherLangDef = '' if IsAdded: Token = len(self.OrderedStringList[Language]) if Index == -1: - self.OrderedStringList[Language].append(StringDefClassObject(Name, - Value, - Referenced, - Token, + self.OrderedStringList[Language].append(StringDefClassObject(Name, + Value, + Referenced, + Token, UseOtherLangDef)) self.OrderedStringDict[Language][Name] = Token for LangName in self.LanguageDef: # # New STRING token will be added into all language string lists. - # so that the unique STRING identifier is reserved for all languages in the package list. + # so that the unique STRING identifier is reserved for all languages in the package list. # if LangName[0] != Language: if UseOtherLangDef != '': OtherLangDef = UseOtherLangDef else: OtherLangDef = Language - self.OrderedStringList[LangName[0]].append(StringDefClassObject(Name, - '', - Referenced, - Token, + self.OrderedStringList[LangName[0]].append(StringDefClassObject(Name, + '', + Referenced, + Token, OtherLangDef)) self.OrderedStringDict[LangName[0]][Name] = len(self.OrderedStringList[LangName[0]]) - 1 else: - self.OrderedStringList[Language].insert(Index, StringDefClassObject(Name, - Value, - Referenced, - Token, + self.OrderedStringList[Language].insert(Index, StringDefClassObject(Name, + Value, + Referenced, + Token, UseOtherLangDef)) self.OrderedStringDict[Language][Name] = Index @@ -1029,16 +1029,16 @@ class UniFileClassObject(object): print(Item) for Member in self.OrderedStringList[Item]: print(str(Member)) - + # - # Read content from '!include' UNI file + # 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", + EdkLogger.Error("Unicode File Parser", ToolError.FILE_NOT_FOUND, ExtraData=FilaPath) try: -- cgit v1.2.3