sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools: Workspace/MetaFileParser - refactor dicts

Browse Source 
make defaultdict to avoid initialize inner items
to empty the dict, call clear instead of making a new object

v2 - to empty the dict, dont re-run constructor, just call .clear()
in post process API also.

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-04-27 22:04:14 +08:00
committed by Yonghong Zhu
parent a802b26906
commit 50874612be
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
BaseTools/Source/Python/Workspace/MetaFileParser.py
View File

@ -31,7 +31,7 @@ from Common.Misc import GuidStructureStringToGuidString, CheckPcdDatum, PathClas
from Common.Expression import * from Common.Expression import *
from CommonDataClass.Exceptions import * from CommonDataClass.Exceptions import *
from Common.LongFilePathSupport import OpenLongFilePath as open from Common.LongFilePathSupport import OpenLongFilePath as open
from collections import defaultdict
from MetaFileTable import MetaFileStorage from MetaFileTable import MetaFileStorage
from MetaFileCommentParser import CheckInfComment from MetaFileCommentParser import CheckInfComment
@ -163,7 +163,7 @@ class MetaFileParser(object):
self._FileDir = self.MetaFile.Dir self._FileDir = self.MetaFile.Dir
self._Defines = {} self._Defines = {}
self._FileLocalMacros = {} self._FileLocalMacros = {}
self._SectionsMacroDict = {} self._SectionsMacroDict = defaultdict(dict)
# for recursive parsing # for recursive parsing
self._Owner = [Owner] self._Owner = [Owner]
@ -421,17 +421,16 @@ class MetaFileParser(object):
def _ConstructSectionMacroDict(self, Name, Value): def _ConstructSectionMacroDict(self, Name, Value):
ScopeKey = [(Scope[0], Scope[1],Scope[2]) for Scope in self._Scope] ScopeKey = [(Scope[0], Scope[1],Scope[2]) for Scope in self._Scope]
ScopeKey = tuple(ScopeKey) ScopeKey = tuple(ScopeKey)
SectionDictKey = self._SectionType, ScopeKey
# #
# DecParser SectionType is a list, will contain more than one item only in Pcd Section # DecParser SectionType is a list, will contain more than one item only in Pcd Section
# As Pcd section macro usage is not alllowed, so here it is safe # As Pcd section macro usage is not alllowed, so here it is safe
# #
if type(self) == DecParser: if type(self) == DecParser:
SectionDictKey = self._SectionType[0], ScopeKey SectionDictKey = self._SectionType[0], ScopeKey
if SectionDictKey not in self._SectionsMacroDict: else:
self._SectionsMacroDict[SectionDictKey] = {} SectionDictKey = self._SectionType, ScopeKey
SectionLocalMacros = self._SectionsMacroDict[SectionDictKey]
SectionLocalMacros[Name] = Value self._SectionsMacroDict[SectionDictKey][Name] = Value
## Get section Macros that are applicable to current line, which may come from other sections ## Get section Macros that are applicable to current line, which may come from other sections
## that share the same name while scope is wider ## that share the same name while scope is wider
@ -936,7 +935,7 @@ class DscParser(MetaFileParser):
self._SubsectionType = MODEL_UNKNOWN self._SubsectionType = MODEL_UNKNOWN
self._SubsectionName = '' self._SubsectionName = ''
self._Owner[-1] = -1 self._Owner[-1] = -1
OwnerId = {} OwnerId.clear()
continue continue
# subsection header # subsection header
elif Line[0] == TAB_OPTION_START and Line[-1] == TAB_OPTION_END: elif Line[0] == TAB_OPTION_START and Line[-1] == TAB_OPTION_END:
@ -1296,7 +1295,7 @@ class DscParser(MetaFileParser):
self._DirectiveEvalStack = [] self._DirectiveEvalStack = []
self._FileWithError = self.MetaFile self._FileWithError = self.MetaFile
self._FileLocalMacros = {} self._FileLocalMacros = {}
self._SectionsMacroDict = {} self._SectionsMacroDict.clear()
GlobalData.gPlatformDefines = {} GlobalData.gPlatformDefines = {}
# Get all macro and PCD which has straitforward value # Get all macro and PCD which has straitforward value