From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.136; helo=mga12.intel.com; envelope-from=jaben.carsey@intel.com; receiver=edk2-devel@lists.01.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id C269F203B8C8F for ; Fri, 27 Apr 2018 15:33:02 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Apr 2018 15:33:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,336,1520924400"; d="scan'208";a="54252853" Received: from jcarsey-desk1.amr.corp.intel.com ([10.7.159.144]) by orsmga002.jf.intel.com with ESMTP; 27 Apr 2018 15:32:59 -0700 From: Jaben Carsey To: edk2-devel@lists.01.org Cc: Liming Gao , Yonghong Zhu Date: Fri, 27 Apr 2018 15:32:43 -0700 Message-Id: <3ed1f73d339ca5239155a8aa51f7fdbb97731dbd.1524868034.git.jaben.carsey@intel.com> X-Mailer: git-send-email 2.16.2.windows.1 In-Reply-To: References: In-Reply-To: References: Subject: [PATCH v1 29/42] BaseTools: AutoGen - refactor more functions only called in __init__ X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Apr 2018 22:33:03 -0000 Cc: Liming Gao Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jaben Carsey --- BaseTools/Source/Python/AutoGen/IdfClassObject.py | 89 +++++++++----------- 1 file changed, 40 insertions(+), 49 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/IdfClassObject.py b/BaseTools/Source/Python/AutoGen/IdfClassObject.py index 82396d3744d5..7bc4e4ffb57b 100644 --- a/BaseTools/Source/Python/AutoGen/IdfClassObject.py +++ b/BaseTools/Source/Python/AutoGen/IdfClassObject.py @@ -66,61 +66,52 @@ EFI_HII_PACKAGE_TYPE_SYSTEM_END = 0xFF class IdfFileClassObject(object): def __init__(self, FileList = []): - self.FileList = FileList self.ImageFilesDict = {} self.ImageIDList = [] - if len(self.FileList) > 0: - self.LoadIdfFiles(FileList) + for File in FileList: + if File is None: + EdkLogger.error("Image Definition File Parser", PARSER_ERROR, 'No Image definition file is given.') + self.File = File - def LoadIdfFiles(self, FileList): - if len(FileList) > 0: - for File in FileList: - self.LoadIdfFile(File) + try: + IdfFile = open(LongFilePath(File.Path), mode='r') + FileIn = IdfFile.read() + IdfFile.close() + except: + EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=File) - def LoadIdfFile(self, File = None): - if File is None: - EdkLogger.error("Image Definition File Parser", PARSER_ERROR, 'No Image definition file is given.') - self.File = File + ImageFileList = [] + for Line in FileIn.splitlines(): + Line = Line.strip() + Line = StripComments(Line) + if len(Line) == 0: + continue - try: - IdfFile = open(LongFilePath(File.Path), mode='r') - FileIn = IdfFile.read() - IdfFile.close() - except: - EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=File) + LineNo = GetLineNo(FileIn, Line, False) + if not Line.startswith('#image '): + EdkLogger.error("Image Definition File Parser", PARSER_ERROR, 'The %s in Line %s of File %s is invalid.' % (Line, LineNo, File.Path)) - ImageFileList = [] - for Line in FileIn.splitlines(): - Line = Line.strip() - Line = StripComments(Line) - if len(Line) == 0: - continue - - LineNo = GetLineNo(FileIn, Line, False) - if not Line.startswith('#image '): - EdkLogger.error("Image Definition File Parser", PARSER_ERROR, 'The %s in Line %s of File %s is invalid.' % (Line, LineNo, File.Path)) - - if Line.find('#image ') >= 0: - LineDetails = Line.split() - Len = len(LineDetails) - if Len != 3 and Len != 4: - EdkLogger.error("Image Definition File Parser", PARSER_ERROR, 'The format is not match #image IMAGE_ID [TRANSPARENT] ImageFileName in Line %s of File %s.' % (LineNo, File.Path)) - if Len == 4 and LineDetails[2] != 'TRANSPARENT': - EdkLogger.error("Image Definition File Parser", PARSER_ERROR, 'Please use the keyword "TRANSPARENT" to describe the transparency setting in Line %s of File %s.' % (LineNo, File.Path)) - MatchString = gIdentifierPattern.match(LineDetails[1]) - if MatchString is None: - EdkLogger.error('Image Definition File Parser', FORMAT_INVALID, 'The Image token name %s defined in Idf file %s contains the invalid character.' % (LineDetails[1], File.Path)) - if LineDetails[1] not in self.ImageIDList: - self.ImageIDList.append(LineDetails[1]) - else: - EdkLogger.error("Image Definition File Parser", PARSER_ERROR, 'The %s in Line %s of File %s is already defined.' % (LineDetails[1], LineNo, File.Path)) - if Len == 4: - ImageFile = ImageFileObject(LineDetails[Len-1], LineDetails[1], True) - else: - ImageFile = ImageFileObject(LineDetails[Len-1], LineDetails[1], False) - ImageFileList.append(ImageFile) - if ImageFileList: - self.ImageFilesDict[File] = ImageFileList + if Line.find('#image ') >= 0: + LineDetails = Line.split() + Len = len(LineDetails) + if Len != 3 and Len != 4: + EdkLogger.error("Image Definition File Parser", PARSER_ERROR, 'The format is not match #image IMAGE_ID [TRANSPARENT] ImageFileName in Line %s of File %s.' % (LineNo, File.Path)) + if Len == 4 and LineDetails[2] != 'TRANSPARENT': + EdkLogger.error("Image Definition File Parser", PARSER_ERROR, 'Please use the keyword "TRANSPARENT" to describe the transparency setting in Line %s of File %s.' % (LineNo, File.Path)) + MatchString = gIdentifierPattern.match(LineDetails[1]) + if MatchString is None: + EdkLogger.error('Image Definition File Parser', FORMAT_INVALID, 'The Image token name %s defined in Idf file %s contains the invalid character.' % (LineDetails[1], File.Path)) + if LineDetails[1] not in self.ImageIDList: + self.ImageIDList.append(LineDetails[1]) + else: + EdkLogger.error("Image Definition File Parser", PARSER_ERROR, 'The %s in Line %s of File %s is already defined.' % (LineDetails[1], LineNo, File.Path)) + if Len == 4: + ImageFile = ImageFileObject(LineDetails[Len-1], LineDetails[1], True) + else: + ImageFile = ImageFileObject(LineDetails[Len-1], LineDetails[1], False) + ImageFileList.append(ImageFile) + if ImageFileList: + self.ImageFilesDict[File] = ImageFileList def SearchImageID(ImageFileObject, FileList): if FileList == []: -- 2.16.2.windows.1