From: "Zhu, Yonghong" <yonghong.zhu@intel.com>
To: "Carsey, Jaben" <jaben.carsey@intel.com>,
"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Cc: "Gao, Liming" <liming.gao@intel.com>,
"Zhu, Yonghong" <yonghong.zhu@intel.com>
Subject: Re: [PATCH v1 1/1] BaseTools\GenFds: remove extra content
Date: Thu, 13 Sep 2018 01:03:56 +0000 [thread overview]
Message-ID: <B9726D6DCCFB8B4CA276A9169B02216D520FA5E6@SHSMSX103.ccr.corp.intel.com> (raw)
In-Reply-To: <2c6ed8a659f6fd60085ec373857cb9312c296551.1536612406.git.jaben.carsey@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
Best Regards,
Zhu Yonghong
-----Original Message-----
From: Carsey, Jaben
Sent: Tuesday, September 11, 2018 6:16 AM
To: edk2-devel@lists.01.org
Cc: Zhu, Yonghong <yonghong.zhu@intel.com>; Gao, Liming <liming.gao@intel.com>
Subject: [PATCH v1 1/1] BaseTools\GenFds: remove extra content
remove uncalled functions
remove extra blank lines
remove commented out code
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
---
BaseTools/Source/Python/GenFds/FdfParser.py | 56 --------------------
1 file changed, 56 deletions(-)
diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index 7e1be659fca5..1f7d59bb51b0 100644
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -1120,28 +1120,6 @@ class FdfParser:
else:
return False
- def __GetNextOp(self):
- # Skip leading spaces, if exist.
- self.__SkipWhiteSpace()
- if self.__EndOfFile():
- return False
- # Record the token start position, the position of the first non-space char.
- StartPos = self.CurrentOffsetWithinLine
- while not self.__EndOfLine():
- TempChar = self.__CurrentChar()
- # Try to find the end char that is not a space
- if not str(TempChar).isspace():
- self.__GetOneChar()
- else:
- break
- else:
- return False
-
- if StartPos != self.CurrentOffsetWithinLine:
- self.__Token = self.__CurrentLine()[StartPos : self.CurrentOffsetWithinLine]
- return True
- else:
- return False
## __GetNextGuid() method
#
# Get next token unit before a seperator
@@ -1247,28 +1225,6 @@ class FdfParser:
self.__UndoToken()
return False
- ## __GetNextPcdName() method
- #
- # Get next PCD token space C name and PCD C name pair before a seperator
- # If found, the decimal data is put into self.__Token
- #
- # @param self The object pointer
- # @retval Tuple PCD C name and PCD token space C name pair
- #
- def __GetNextPcdName(self):
- if not self.__GetNextWord():
- raise Warning("expected format of <PcdTokenSpaceCName>.<PcdCName>", self.FileName, self.CurrentLineNumber)
- pcdTokenSpaceCName = self.__Token
-
- if not self.__IsToken( "."):
- raise Warning("expected format of <PcdTokenSpaceCName>.<PcdCName>", self.FileName, self.CurrentLineNumber)
-
- if not self.__GetNextWord():
- raise Warning("expected format of <PcdTokenSpaceCName>.<PcdCName>", self.FileName, self.CurrentLineNumber)
- pcdCName = self.__Token
-
- return (pcdCName, pcdTokenSpaceCName)
-
def __GetNextPcdSettings(self):
if not self.__GetNextWord():
raise Warning("expected format of <PcdTokenSpaceCName>.<PcdCName>", self.FileName, self.CurrentLineNumber) @@ -3681,7 +3637,6 @@ class FdfParser:
ModuleType.upper() + \
'.' + \
TemplateName.upper() ] = RuleObj
-# self.Profile.RuleList.append(rule)
return True
## __GetModuleType() method
@@ -4139,7 +4094,6 @@ class FdfParser:
# @retval False Not able to find section statement
#
def __GetRuleEncapsulationSection(self, Rule):
-
if self.__IsKeyword( "COMPRESS"):
Type = "PI_STD"
if self.__IsKeyword("PI_STD") or self.__IsKeyword("PI_NONE"):
@@ -4207,7 +4161,6 @@ class FdfParser:
# @retval False Not able to find a VTF
#
def __GetVtf(self):
-
if not self.__GetNextToken():
return False
@@ -4279,7 +4232,6 @@ class FdfParser:
# @retval False Not able to find a component
#
def __GetComponentStatement(self, VtfObj):
-
if not self.__IsKeyword("COMP_NAME"):
return False
@@ -4413,7 +4365,6 @@ class FdfParser:
# @retval False Not able to find a OptionROM
#
def __GetOptionRom(self):
-
if not self.__GetNextToken():
return False
@@ -4454,7 +4405,6 @@ class FdfParser:
# @retval False Not able to find inf statement
#
def __GetOptRomInfStatement(self, Obj):
-
if not self.__IsKeyword( "INF"):
return False
@@ -4557,7 +4507,6 @@ class FdfParser:
# @retval False Not able to find FILE statement
#
def __GetOptRomFileStatement(self, Obj):
-
if not self.__IsKeyword( "FILE"):
return False
@@ -4592,7 +4541,6 @@ class FdfParser:
# @retval CapList List of Capsule in FD
#
def __GetCapInFd (self, FdName):
-
CapList = []
if FdName.upper() in self.Profile.FdDict:
FdObj = self.Profile.FdDict[FdName.upper()]
@@ -4615,7 +4563,6 @@ class FdfParser:
# @param RefFvList referenced FV by section
#
def __GetReferencedFdCapTuple(self, CapObj, RefFdList = [], RefFvList = []):
-
for CapsuleDataObj in CapObj.CapsuleDataList :
if hasattr(CapsuleDataObj, 'FvName') and CapsuleDataObj.FvName is not None and CapsuleDataObj.FvName.upper() not in RefFvList:
RefFvList.append (CapsuleDataObj.FvName.upper()) @@ -4639,7 +4586,6 @@ class FdfParser:
# @retval FvList list of FV in FD
#
def __GetFvInFd (self, FdName):
-
FvList = []
if FdName.upper() in self.Profile.FdDict:
FdObj = self.Profile.FdDict[FdName.upper()]
@@ -4662,7 +4608,6 @@ class FdfParser:
# @param RefFvList referenced FV by section
#
def __GetReferencedFdFvTuple(self, FvObj, RefFdList = [], RefFvList = []):
-
for FfsObj in FvObj.FfsList:
if isinstance(FfsObj, FfsFileStatement.FileStatement):
if FfsObj.FvName is not None and FfsObj.FvName.upper() not in RefFvList:
@@ -4682,7 +4627,6 @@ class FdfParser:
# @param FvList referenced FV by section
#
def __GetReferencedFdFvTupleFromSection(self, FfsFile, FdList = [], FvList = []):
-
SectionStack = []
SectionStack.extend(FfsFile.SectionList)
while SectionStack != []:
--
2.16.2.windows.1
prev parent reply other threads:[~2018-09-13 1:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1536612406.git.jaben.carsey@intel.com>
2018-09-10 22:16 ` [PATCH v1 1/1] BaseTools\GenFds: remove extra content Jaben Carsey
2018-09-13 1:03 ` Zhu, Yonghong [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=B9726D6DCCFB8B4CA276A9169B02216D520FA5E6@SHSMSX103.ccr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox