From c23ef28c205875f59f785e0028086e98ec58030c Mon Sep 17 00:00:00 2001 From: "Carsey, Jaben" Date: Sat, 28 Apr 2018 06:32:22 +0800 Subject: BaseTools: AutoGen - share StripComments API add the API root in one class file. delete the static API out of both classes. share it in the single location. Cc: Liming Gao Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jaben Carsey Reviewed-by: Yonghong Zhu --- BaseTools/Source/Python/AutoGen/IdfClassObject.py | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'BaseTools/Source/Python/AutoGen/IdfClassObject.py') diff --git a/BaseTools/Source/Python/AutoGen/IdfClassObject.py b/BaseTools/Source/Python/AutoGen/IdfClassObject.py index 6953854a52..82396d3744 100644 --- a/BaseTools/Source/Python/AutoGen/IdfClassObject.py +++ b/BaseTools/Source/Python/AutoGen/IdfClassObject.py @@ -22,6 +22,7 @@ from Common.LongFilePathSupport import LongFilePath import re import os from Common.GlobalData import gIdentifierPattern +from UniClassObject import StripComments IMAGE_TOKEN = re.compile('IMAGE_TOKEN *\(([A-Z0-9_]+) *\)', re.MULTILINE | re.UNICODE) @@ -91,7 +92,7 @@ class IdfFileClassObject(object): ImageFileList = [] for Line in FileIn.splitlines(): Line = Line.strip() - Line = self.StripComments(Line) + Line = StripComments(Line) if len(Line) == 0: continue @@ -121,22 +122,6 @@ class IdfFileClassObject(object): if ImageFileList: self.ImageFilesDict[File] = ImageFileList - def StripComments(self, Line): - Comment = '//' - CommentPos = Line.find(Comment) - while CommentPos >= 0: - # if there are non matched quotes before the comment header - # then we are in the middle of a string - # but we need to ignore the escaped quotes and backslashes. - if ((Line.count('"', 0, CommentPos) - Line.count('\\"', 0, CommentPos)) & 1) == 1: - CommentPos = Line.find (Comment, CommentPos + 1) - else: - return Line[:CommentPos].strip() - return Line.strip() - - def ImageDecoder(self, File): - pass - def SearchImageID(ImageFileObject, FileList): if FileList == []: return ImageFileObject -- cgit v1.2.3