tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BaseTools: make static functions when self is not needed 

remove self, and add @staticmethod to functions

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
Carsey, Jaben 2018-03-30 08:19:32 +08:00 committed by Yonghong Zhu
parent 231fdbb210
commit 5bcf1d5671
2 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
BaseTools/Source/Python/Common/FdfParserLite.py
View File

@ -2130,13 +2130,12 @@ class FdfParser(object):
# #
# Check whether reloc strip flag can be set for a file type. # Check whether reloc strip flag can be set for a file type.
# #
# @param self The object pointer
# @param FileType The file type to check with # @param FileType The file type to check with
# @retval True This type could have relocation strip flag # @retval True This type could have relocation strip flag
# @retval False No way to have it # @retval False No way to have it
# #
@staticmethod
def __FileCouldHaveRelocFlag (self, FileType): def __FileCouldHaveRelocFlag (FileType):
if FileType in ('SEC', 'PEI_CORE', 'PEIM', 'PEI_DXE_COMBO'): if FileType in ('SEC', 'PEI_CORE', 'PEIM', 'PEI_DXE_COMBO'):
return True return True
else: else:
@ -2146,13 +2145,12 @@ class FdfParser(object):
# #
# Check whether reloc strip flag can be set for a section type. # Check whether reloc strip flag can be set for a section type.
# #
# @param self The object pointer
# @param SectionType The section type to check with # @param SectionType The section type to check with
# @retval True This type could have relocation strip flag # @retval True This type could have relocation strip flag
# @retval False No way to have it # @retval False No way to have it
# #
@staticmethod
def __SectionCouldHaveRelocFlag (self, SectionType): def __SectionCouldHaveRelocFlag (SectionType):
if SectionType in ('TE', 'PE32'): if SectionType in ('TE', 'PE32'):
return True return True
else: else:
@ -3152,12 +3150,12 @@ class FdfParser(object):
# #
# Get whether a section could be optional # Get whether a section could be optional
# #
# @param self The object pointer
# @param SectionType The section type to check # @param SectionType The section type to check
# @retval True section could be optional # @retval True section could be optional
# @retval False section never optional # @retval False section never optional
# #
def __RuleSectionCouldBeOptional(self, SectionType): @staticmethod
def __RuleSectionCouldBeOptional(SectionType):
if SectionType in ("DXE_DEPEX", "UI", "VERSION", "PEI_DEPEX", "RAW", "SMM_DEPEX"): if SectionType in ("DXE_DEPEX", "UI", "VERSION", "PEI_DEPEX", "RAW", "SMM_DEPEX"):
return True return True
else: else:
@ -3167,12 +3165,12 @@ class FdfParser(object):
# #
# Get whether a section could have build number information # Get whether a section could have build number information
# #
# @param self The object pointer
# @param SectionType The section type to check # @param SectionType The section type to check
# @retval True section could have build number information # @retval True section could have build number information
# @retval False section never have build number information # @retval False section never have build number information
# #
def __RuleSectionCouldHaveBuildNum(self, SectionType): @staticmethod
def __RuleSectionCouldHaveBuildNum(SectionType):
if SectionType in ("VERSION"): if SectionType in ("VERSION"):
return True return True
else: else:
@ -3182,12 +3180,12 @@ class FdfParser(object):
# #
# Get whether a section could have string # Get whether a section could have string
# #
# @param self The object pointer
# @param SectionType The section type to check # @param SectionType The section type to check
# @retval True section could have string # @retval True section could have string
# @retval False section never have string # @retval False section never have string
# #
def __RuleSectionCouldHaveString(self, SectionType): @staticmethod
def __RuleSectionCouldHaveString(SectionType):
if SectionType in ("UI", "VERSION"): if SectionType in ("UI", "VERSION"):
return True return True
else: else:

25
BaseTools/Source/Python/GenFds/FdfParser.py
View File

@ -704,7 +704,8 @@ class FdfParser:
# Preprocess done. # Preprocess done.
self.Rewind() self.Rewind()
def __GetIfListCurrentItemStat(self, IfList): @staticmethod
def __GetIfListCurrentItemStat(IfList):
if len(IfList) == 0: if len(IfList) == 0:
return True return True
@ -2625,13 +2626,12 @@ class FdfParser:
# #
# Check whether reloc strip flag can be set for a file type. # Check whether reloc strip flag can be set for a file type.
# #
# @param self The object pointer
# @param FileType The file type to check with # @param FileType The file type to check with
# @retval True This type could have relocation strip flag # @retval True This type could have relocation strip flag
# @retval False No way to have it # @retval False No way to have it
# #
@staticmethod
def __FileCouldHaveRelocFlag (self, FileType): def __FileCouldHaveRelocFlag (FileType):
if FileType in ('SEC', 'PEI_CORE', 'PEIM', 'PEI_DXE_COMBO'): if FileType in ('SEC', 'PEI_CORE', 'PEIM', 'PEI_DXE_COMBO'):
return True return True
else: else:
@ -2641,13 +2641,12 @@ class FdfParser:
# #
# Check whether reloc strip flag can be set for a section type. # Check whether reloc strip flag can be set for a section type.
# #
# @param self The object pointer
# @param SectionType The section type to check with # @param SectionType The section type to check with
# @retval True This type could have relocation strip flag # @retval True This type could have relocation strip flag
# @retval False No way to have it # @retval False No way to have it
# #
@staticmethod
def __SectionCouldHaveRelocFlag (self, SectionType): def __SectionCouldHaveRelocFlag (SectionType):
if SectionType in ('TE', 'PE32'): if SectionType in ('TE', 'PE32'):
return True return True
else: else:
@ -3986,12 +3985,12 @@ class FdfParser:
# #
# Get whether a section could be optional # Get whether a section could be optional
# #
# @param self The object pointer
# @param SectionType The section type to check # @param SectionType The section type to check
# @retval True section could be optional # @retval True section could be optional
# @retval False section never optional # @retval False section never optional
# #
def __RuleSectionCouldBeOptional(self, SectionType): @staticmethod
def __RuleSectionCouldBeOptional(SectionType):
if SectionType in ("DXE_DEPEX", "UI", "VERSION", "PEI_DEPEX", "RAW", "SMM_DEPEX"): if SectionType in ("DXE_DEPEX", "UI", "VERSION", "PEI_DEPEX", "RAW", "SMM_DEPEX"):
return True return True
else: else:
@ -4001,12 +4000,12 @@ class FdfParser:
# #
# Get whether a section could have build number information # Get whether a section could have build number information
# #
# @param self The object pointer
# @param SectionType The section type to check # @param SectionType The section type to check
# @retval True section could have build number information # @retval True section could have build number information
# @retval False section never have build number information # @retval False section never have build number information
# #
def __RuleSectionCouldHaveBuildNum(self, SectionType): @staticmethod
def __RuleSectionCouldHaveBuildNum(SectionType):
if SectionType in ("VERSION"): if SectionType in ("VERSION"):
return True return True
else: else:
@ -4016,12 +4015,12 @@ class FdfParser:
# #
# Get whether a section could have string # Get whether a section could have string
# #
# @param self The object pointer
# @param SectionType The section type to check # @param SectionType The section type to check
# @retval True section could have string # @retval True section could have string
# @retval False section never have string # @retval False section never have string
# #
def __RuleSectionCouldHaveString(self, SectionType): @staticmethod
def __RuleSectionCouldHaveString(SectionType):
if SectionType in ("UI", "VERSION"): if SectionType in ("UI", "VERSION"):
return True return True
else: else: