## @file\r
# This file is used to parse meta files\r
#\r
-# Copyright (c) 2008 - 2017, Intel Corporation. All rights reserved.<BR>\r
-# (C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>\r
+# Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>\r
+# (C) Copyright 2015-2018 Hewlett Packard Enterprise Development LP<BR>\r
# This program and the accompanying materials\r
# are licensed and made available under the terms and conditions of the BSD License\r
# which accompanies this distribution. The full text of the license may be found at\r
\r
from CommonDataClass.DataClass import *\r
from Common.DataType import *\r
-from Common.String import *\r
-from Common.Misc import GuidStructureStringToGuidString, CheckPcdDatum, PathClass, AnalyzePcdData, AnalyzeDscPcd, AnalyzePcdExpression\r
+from Common.StringUtils import *\r
+from Common.Misc import GuidStructureStringToGuidString, CheckPcdDatum, PathClass, AnalyzePcdData, AnalyzeDscPcd, AnalyzePcdExpression, ParseFieldValue\r
from Common.Expression import *\r
from CommonDataClass.Exceptions import *\r
from Common.LongFilePathSupport import OpenLongFilePath as open\r
-\r
+from collections import defaultdict\r
from MetaFileTable import MetaFileStorage\r
from MetaFileCommentParser import CheckInfComment\r
\r
+## RegEx for finding file versions\r
+hexVersionPattern = re.compile(r'0[xX][\da-f-A-F]{5,8}')\r
+decVersionPattern = re.compile(r'\d+\.\d+')\r
+\r
## A decorator used to parse macro definition\r
def ParseMacro(Parser):\r
def MacroParser(self):\r
self._FileDir = self.MetaFile.Dir\r
self._Defines = {}\r
self._FileLocalMacros = {}\r
- self._SectionsMacroDict = {}\r
+ self._SectionsMacroDict = defaultdict(dict)\r
\r
# for recursive parsing\r
self._Owner = [Owner]\r
self._PostProcessed = False\r
# Different version of meta-file has different way to parse.\r
self._Version = 0\r
+ self._GuidDict = {} # for Parser PCD value {GUID(gTokeSpaceGuidName)}\r
\r
## Store the parsed data in table\r
def _Store(self, *Args):\r
NewRecordList = []\r
for Record in RecordList:\r
Arch = Record[3]\r
- if Arch == 'COMMON' or Arch == FilterArch:\r
+ if Arch == TAB_ARCH_COMMON or Arch == FilterArch:\r
NewRecordList.append(Record)\r
return NewRecordList\r
\r
self.Start()\r
\r
# No specific ARCH or Platform given, use raw data\r
- if self._RawTable and (len(DataInfo) == 1 or DataInfo[1] == None):\r
+ if self._RawTable and (len(DataInfo) == 1 or DataInfo[1] is None):\r
return self._FilterRecordList(self._RawTable.Query(*DataInfo), self._Arch)\r
\r
# Do post-process if necessary\r
for Item in GetSplitValueList(self._CurrentLine[1:-1], TAB_COMMA_SPLIT):\r
if Item == '':\r
continue\r
- ItemList = GetSplitValueList(Item, TAB_SPLIT,2)\r
+ ItemList = GetSplitValueList(Item, TAB_SPLIT,3)\r
# different section should not mix in one section\r
if self._SectionName != '' and self._SectionName != ItemList[0].upper():\r
EdkLogger.error('Parser', FORMAT_INVALID, "Different section names in the same section",\r
if self._SectionName in self.DataType:\r
self._SectionType = self.DataType[self._SectionName]\r
# Check if the section name is valid\r
- if self._SectionName not in SECTIONS_HAVE_ITEM_AFTER_ARCH and len(ItemList) > 3:\r
+ if self._SectionName not in SECTIONS_HAVE_ITEM_AFTER_ARCH_SET and len(ItemList) > 3:\r
EdkLogger.error("Parser", FORMAT_UNKNOWN_ERROR, "%s is not a valid section name" % Item,\r
self.MetaFile, self._LineIndex + 1, self._CurrentLine)\r
elif self._Version >= 0x00010005:\r
if len(ItemList) > 1:\r
S1 = ItemList[1].upper()\r
else:\r
- S1 = 'COMMON'\r
+ S1 = TAB_ARCH_COMMON\r
ArchList.add(S1)\r
\r
# S2 may be Platform or ModuleType\r
if len(ItemList) > 2:\r
- if self._SectionName.upper() in SECTIONS_HAVE_ITEM_PCD:\r
+ if self._SectionName.upper() in SECTIONS_HAVE_ITEM_PCD_SET:\r
S2 = ItemList[2]\r
else:\r
S2 = ItemList[2].upper()\r
else:\r
- S2 = 'COMMON'\r
- self._Scope.append([S1, S2])\r
+ S2 = TAB_COMMON\r
+ if len(ItemList) > 3:\r
+ S3 = ItemList[3]\r
+ else:\r
+ S3 = TAB_COMMON\r
+ self._Scope.append([S1, S2, S3])\r
\r
# 'COMMON' must not be used with specific ARCHs at the same section\r
- if 'COMMON' in ArchList and len(ArchList) > 1:\r
+ if TAB_ARCH_COMMON in ArchList and len(ArchList) > 1:\r
EdkLogger.error('Parser', FORMAT_INVALID, "'common' ARCH must not be used with specific ARCHs",\r
File=self.MetaFile, Line=self._LineIndex + 1, ExtraData=self._CurrentLine)\r
# If the section information is needed later, it should be stored in database\r
EdkLogger.error("Parser", FORMAT_INVALID, "%s not defined" % (Macro), ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1)\r
# Sometimes, we need to make differences between EDK and EDK2 modules \r
if Name == 'INF_VERSION':\r
- if re.match(r'0[xX][\da-f-A-F]{5,8}', Value):\r
+ if hexVersionPattern.match(Value):\r
self._Version = int(Value, 0) \r
- elif re.match(r'\d+\.\d+', Value):\r
+ elif decVersionPattern.match(Value):\r
ValueList = Value.split('.')\r
Major = '%04o' % int(ValueList[0], 0)\r
Minor = '%04o' % int(ValueList[1], 0)\r
\r
## Construct section Macro dict \r
def _ConstructSectionMacroDict(self, Name, Value):\r
- ScopeKey = [(Scope[0], Scope[1]) for Scope in self._Scope]\r
+ ScopeKey = [(Scope[0], Scope[1],Scope[2]) for Scope in self._Scope]\r
ScopeKey = tuple(ScopeKey)\r
- SectionDictKey = self._SectionType, ScopeKey\r
#\r
# DecParser SectionType is a list, will contain more than one item only in Pcd Section\r
# As Pcd section macro usage is not alllowed, so here it is safe\r
#\r
if type(self) == DecParser:\r
SectionDictKey = self._SectionType[0], ScopeKey\r
- if SectionDictKey not in self._SectionsMacroDict:\r
- self._SectionsMacroDict[SectionDictKey] = {}\r
- SectionLocalMacros = self._SectionsMacroDict[SectionDictKey]\r
- SectionLocalMacros[Name] = Value\r
+ else:\r
+ SectionDictKey = self._SectionType, ScopeKey\r
+\r
+ self._SectionsMacroDict[SectionDictKey][Name] = Value\r
\r
## Get section Macros that are applicable to current line, which may come from other sections \r
## that share the same name while scope is wider\r
continue\r
\r
for ActiveScope in self._Scope:\r
- Scope0, Scope1 = ActiveScope[0], ActiveScope[1]\r
- if(Scope0, Scope1) not in Scope:\r
+ Scope0, Scope1 ,Scope2= ActiveScope[0], ActiveScope[1],ActiveScope[2]\r
+ if(Scope0, Scope1,Scope2) not in Scope:\r
break\r
else:\r
SpeSpeMacroDict.update(self._SectionsMacroDict[(SectionType, Scope)])\r
\r
for ActiveScope in self._Scope:\r
- Scope0, Scope1 = ActiveScope[0], ActiveScope[1]\r
- if(Scope0, Scope1) not in Scope and (Scope0, "COMMON") not in Scope and ("COMMON", Scope1) not in Scope:\r
+ Scope0, Scope1,Scope2 = ActiveScope[0], ActiveScope[1],ActiveScope[2]\r
+ if(Scope0, Scope1,Scope2) not in Scope and (Scope0, TAB_COMMON, TAB_COMMON) not in Scope and (TAB_COMMON, Scope1, TAB_COMMON) not in Scope:\r
break\r
else:\r
ComSpeMacroDict.update(self._SectionsMacroDict[(SectionType, Scope)])\r
\r
- if ("COMMON", "COMMON") in Scope:\r
+ if (TAB_COMMON, TAB_COMMON, TAB_COMMON) in Scope:\r
ComComMacroDict.update(self._SectionsMacroDict[(SectionType, Scope)])\r
\r
Macros.update(ComComMacroDict)\r
if Line[0] == TAB_SECTION_START and Line[-1] == TAB_SECTION_END:\r
if not GetHeaderComment:\r
for Cmt, LNo in Comments:\r
- self._Store(MODEL_META_DATA_HEADER_COMMENT, Cmt, '', '', 'COMMON',\r
- 'COMMON', self._Owner[-1], LNo, -1, LNo, -1, 0)\r
+ self._Store(MODEL_META_DATA_HEADER_COMMENT, Cmt, '', '', TAB_COMMON,\r
+ TAB_COMMON, self._Owner[-1], LNo, -1, LNo, -1, 0)\r
GetHeaderComment = True\r
else:\r
TailComments.extend(SectionComments + Comments)\r
self._ValueList = ['', '', '']\r
# parse current line, result will be put in self._ValueList\r
self._SectionParser[self._SectionType](self)\r
- if self._ValueList == None or self._ItemType == MODEL_META_DATA_DEFINE:\r
+ if self._ValueList is None or self._ItemType == MODEL_META_DATA_DEFINE:\r
self._ItemType = -1\r
Comments = []\r
continue\r
# Model, Value1, Value2, Value3, Arch, Platform, BelongsToItem=-1,\r
# LineBegin=-1, ColumnBegin=-1, LineEnd=-1, ColumnEnd=-1, Enabled=-1\r
#\r
- for Arch, Platform in self._Scope:\r
+ for Arch, Platform,_ in self._Scope:\r
LastItem = self._Store(self._SectionType,\r
self._ValueList[0],\r
self._ValueList[1],\r
\r
# If there are tail comments in INF file, save to database whatever the comments are\r
for Comment in TailComments:\r
- self._Store(MODEL_META_DATA_TAIL_COMMENT, Comment[0], '', '', 'COMMON',\r
- 'COMMON', self._Owner[-1], -1, -1, -1, -1, 0)\r
+ self._Store(MODEL_META_DATA_TAIL_COMMENT, Comment[0], '', '', TAB_COMMON,\r
+ TAB_COMMON, self._Owner[-1], -1, -1, -1, -1, 0)\r
self._Done()\r
\r
## Data parser for the format in which there's path\r
# DSC file supported data types (one type per section)\r
DataType = {\r
TAB_SKUIDS.upper() : MODEL_EFI_SKU_ID,\r
+ TAB_DEFAULT_STORES.upper() : MODEL_EFI_DEFAULT_STORES,\r
TAB_LIBRARIES.upper() : MODEL_EFI_LIBRARY_INSTANCE,\r
TAB_LIBRARY_CLASSES.upper() : MODEL_EFI_LIBRARY_CLASS,\r
TAB_BUILD_OPTIONS.upper() : MODEL_META_DATA_BUILD_OPTION,\r
TAB_ELSE.upper() : MODEL_META_DATA_CONDITIONAL_STATEMENT_ELSE,\r
TAB_END_IF.upper() : MODEL_META_DATA_CONDITIONAL_STATEMENT_ENDIF,\r
TAB_USER_EXTENSIONS.upper() : MODEL_META_DATA_USER_EXTENSION,\r
+ TAB_ERROR.upper() : MODEL_META_DATA_CONDITIONAL_STATEMENT_ERROR,\r
}\r
\r
# Valid names in define section\r
self._SubsectionType = MODEL_UNKNOWN\r
self._SubsectionName = ''\r
self._Owner[-1] = -1\r
- OwnerId = {}\r
+ OwnerId.clear()\r
continue\r
# subsection header\r
elif Line[0] == TAB_OPTION_START and Line[-1] == TAB_OPTION_END:\r
\r
self._ValueList = ['', '', '']\r
self._SectionParser[SectionType](self)\r
- if self._ValueList == None:\r
+ if self._ValueList is None:\r
continue\r
#\r
# Model, Value1, Value2, Value3, Arch, ModuleType, BelongsToItem=-1, BelongsToFile=-1,\r
# LineBegin=-1, ColumnBegin=-1, LineEnd=-1, ColumnEnd=-1, Enabled=-1\r
#\r
- for Arch, ModuleType in self._Scope:\r
+ for Arch, ModuleType, DefaultStore in self._Scope:\r
Owner = self._Owner[-1]\r
if self._SubsectionType != MODEL_UNKNOWN:\r
Owner = OwnerId[Arch]\r
self._ValueList[2],\r
Arch,\r
ModuleType,\r
+ DefaultStore,\r
Owner,\r
self._From,\r
self._LineIndex + 1,\r
ExtraData=self._CurrentLine)\r
\r
ItemType = self.DataType[DirectiveName]\r
- Scope = [['COMMON', 'COMMON']]\r
+ Scope = [[TAB_COMMON, TAB_COMMON, TAB_COMMON]]\r
if ItemType == MODEL_META_DATA_INCLUDE:\r
Scope = self._Scope\r
+ elif ItemType == MODEL_META_DATA_CONDITIONAL_STATEMENT_ERROR:\r
+ Scope = self._Scope\r
if ItemType == MODEL_META_DATA_CONDITIONAL_STATEMENT_ENDIF:\r
# Remove all directives between !if and !endif, including themselves\r
while self._DirectiveStack:\r
EdkLogger.error("Parser", FORMAT_INVALID, "Redundant '!endif'",\r
File=self.MetaFile, Line=self._LineIndex + 1,\r
ExtraData=self._CurrentLine)\r
- elif ItemType != MODEL_META_DATA_INCLUDE:\r
+ elif ItemType not in {MODEL_META_DATA_INCLUDE, MODEL_META_DATA_CONDITIONAL_STATEMENT_ERROR}:\r
# Break if there's a !else is followed by a !elseif\r
if ItemType == MODEL_META_DATA_CONDITIONAL_STATEMENT_ELSEIF and \\r
self._DirectiveStack and \\r
# Model, Value1, Value2, Value3, Arch, ModuleType, BelongsToItem=-1, BelongsToFile=-1,\r
# LineBegin=-1, ColumnBegin=-1, LineEnd=-1, ColumnEnd=-1, Enabled=-1\r
#\r
- for Arch, ModuleType in Scope:\r
+ for Arch, ModuleType, DefaultStore in Scope:\r
self._LastItem = self._Store(\r
ItemType,\r
self._ValueList[0],\r
self._ValueList[2],\r
Arch,\r
ModuleType,\r
+ DefaultStore,\r
self._Owner[-1],\r
self._From,\r
self._LineIndex + 1,\r
\r
@ParseMacro\r
def _SkuIdParser(self):\r
+ TokenList = GetSplitValueList(self._CurrentLine, TAB_VALUE_SPLIT)\r
+ if len(TokenList) not in (2,3):\r
+ EdkLogger.error('Parser', FORMAT_INVALID, "Correct format is '<Number>|<UiName>[|<UiName>]'",\r
+ ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1)\r
+ self._ValueList[0:len(TokenList)] = TokenList\r
+ @ParseMacro\r
+ def _DefaultStoresParser(self):\r
TokenList = GetSplitValueList(self._CurrentLine, TAB_VALUE_SPLIT)\r
if len(TokenList) != 2:\r
- EdkLogger.error('Parser', FORMAT_INVALID, "Correct format is '<Integer>|<UiName>'",\r
+ EdkLogger.error('Parser', FORMAT_INVALID, "Correct format is '<Number>|<UiName>'",\r
ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1)\r
self._ValueList[0:len(TokenList)] = TokenList\r
\r
self._ValueList[0], self._ValueList[1] = PcdNameTockens[0], PcdNameTockens[1]\r
elif len(PcdNameTockens) == 3:\r
self._ValueList[0], self._ValueList[1] = ".".join((PcdNameTockens[0], PcdNameTockens[1])), PcdNameTockens[2]\r
+ elif len(PcdNameTockens) > 3:\r
+ self._ValueList[0], self._ValueList[1] = ".".join((PcdNameTockens[0], PcdNameTockens[1])), ".".join(PcdNameTockens[2:])\r
if len(TokenList) == 2:\r
self._ValueList[2] = TokenList[1]\r
if self._ValueList[0] == '' or self._ValueList[1] == '':\r
File=self.MetaFile, Line=self._LineIndex + 1)\r
if self._ValueList[2] == '':\r
#\r
- # The PCD values are optional for FIXEDATBUILD and PATCHABLEINMODULE\r
+ # The PCD values are optional for FIXEDATBUILD, PATCHABLEINMODULE, Dynamic/DynamicEx default\r
#\r
- if self._SectionType in (MODEL_PCD_FIXED_AT_BUILD, MODEL_PCD_PATCHABLE_IN_MODULE):\r
+ if self._SectionType in (MODEL_PCD_FIXED_AT_BUILD, MODEL_PCD_PATCHABLE_IN_MODULE, MODEL_PCD_DYNAMIC_DEFAULT, MODEL_PCD_DYNAMIC_EX_DEFAULT):\r
return\r
EdkLogger.error('Parser', FORMAT_INVALID, "No PCD value given",\r
ExtraData=self._CurrentLine + " (<TokenSpaceGuidCName>.<TokenCName>|<PcdValue>)",\r
# PCD cannot be referenced in macro definition\r
if self._ItemType not in [MODEL_META_DATA_DEFINE, MODEL_META_DATA_GLOBAL_DEFINE]:\r
Macros.update(self._Symbols)\r
+ if GlobalData.BuildOptionPcd:\r
+ for Item in GlobalData.BuildOptionPcd:\r
+ if type(Item) is tuple:\r
+ continue\r
+ PcdName, TmpValue = Item.split("=")\r
+ TmpValue = BuildOptionValue(TmpValue, self._GuidDict)\r
+ Macros[PcdName.strip()] = TmpValue\r
return Macros\r
\r
def _PostProcess(self):\r
MODEL_META_DATA_CONDITIONAL_STATEMENT_ENDIF : self.__ProcessDirective,\r
MODEL_META_DATA_CONDITIONAL_STATEMENT_ELSEIF : self.__ProcessDirective,\r
MODEL_EFI_SKU_ID : self.__ProcessSkuId,\r
+ MODEL_EFI_DEFAULT_STORES : self.__ProcessDefaultStores,\r
MODEL_EFI_LIBRARY_INSTANCE : self.__ProcessLibraryInstance,\r
MODEL_EFI_LIBRARY_CLASS : self.__ProcessLibraryClass,\r
MODEL_PCD_FIXED_AT_BUILD : self.__ProcessPcd,\r
MODEL_META_DATA_BUILD_OPTION : self.__ProcessBuildOption,\r
MODEL_UNKNOWN : self._Skip,\r
MODEL_META_DATA_USER_EXTENSION : self._SkipUserExtension,\r
+ MODEL_META_DATA_CONDITIONAL_STATEMENT_ERROR : self._ProcessError,\r
}\r
\r
self._Table = MetaFileStorage(self._RawTable.Cur, self.MetaFile, MODEL_FILE_DSC, True)\r
self._DirectiveEvalStack = []\r
self._FileWithError = self.MetaFile\r
self._FileLocalMacros = {}\r
- self._SectionsMacroDict = {}\r
+ self._SectionsMacroDict.clear()\r
GlobalData.gPlatformDefines = {}\r
\r
# Get all macro and PCD which has straitforward value\r
self._ContentIndex = 0\r
self._InSubsection = False\r
while self._ContentIndex < len(self._Content) :\r
- Id, self._ItemType, V1, V2, V3, S1, S2, Owner, self._From, \\r
+ Id, self._ItemType, V1, V2, V3, S1, S2, S3,Owner, self._From, \\r
LineStart, ColStart, LineEnd, ColEnd, Enabled = self._Content[self._ContentIndex]\r
\r
if self._From < 0:\r
\r
self._ContentIndex += 1\r
\r
- self._Scope = [[S1, S2]]\r
+ self._Scope = [[S1, S2, S3]]\r
#\r
# For !include directive, handle it specially,\r
# merge arch and module type in case of duplicate items\r
if self._ContentIndex >= len(self._Content):\r
break\r
Record = self._Content[self._ContentIndex]\r
- if LineStart == Record[9] and LineEnd == Record[11]:\r
- if [Record[5], Record[6]] not in self._Scope:\r
- self._Scope.append([Record[5], Record[6]])\r
+ if LineStart == Record[10] and LineEnd == Record[12]:\r
+ if [Record[5], Record[6],Record[7]] not in self._Scope:\r
+ self._Scope.append([Record[5], Record[6],Record[7]])\r
self._ContentIndex += 1\r
else:\r
break\r
self._InSubsection = False\r
try:\r
Processer[self._ItemType]()\r
- except EvaluationException, Excpt:\r
+ except EvaluationException as Excpt:\r
# \r
# Only catch expression evaluation error here. We need to report\r
# the precise number of line on which the error occurred\r
EdkLogger.error('Parser', FORMAT_INVALID, "Invalid expression: %s" % str(Excpt),\r
File=self._FileWithError, ExtraData=' '.join(self._ValueList),\r
Line=self._LineIndex + 1)\r
- except MacroException, Excpt:\r
+ except MacroException as Excpt:\r
EdkLogger.error('Parser', FORMAT_INVALID, str(Excpt),\r
File=self._FileWithError, ExtraData=' '.join(self._ValueList),\r
Line=self._LineIndex + 1)\r
\r
- if self._ValueList == None:\r
+ if self._ValueList is None:\r
continue\r
\r
NewOwner = self._IdMapping.get(Owner, -1)\r
self._ValueList[2],\r
S1,\r
S2,\r
+ S3,\r
NewOwner,\r
self._From,\r
self._LineIndex + 1,\r
GlobalData.gPlatformDefines.update(self._FileLocalMacros)\r
self._PostProcessed = True\r
self._Content = None\r
+ def _ProcessError(self):\r
+ if not self._Enabled:\r
+ return\r
+ EdkLogger.error('Parser', ERROR_STATEMENT, self._ValueList[1], File=self.MetaFile, Line=self._LineIndex + 1)\r
\r
def __ProcessSectionHeader(self):\r
self._SectionName = self._ValueList[0]\r
MODEL_PCD_DYNAMIC_VPD, MODEL_PCD_DYNAMIC_EX_DEFAULT, MODEL_PCD_DYNAMIC_EX_HII,\r
MODEL_PCD_DYNAMIC_EX_VPD):\r
Records = self._RawTable.Query(PcdType, BelongsToItem= -1.0)\r
- for TokenSpaceGuid, PcdName, Value, Dummy2, Dummy3, ID, Line in Records:\r
+ for TokenSpaceGuid, PcdName, Value, Dummy2, Dummy3, Dummy4,ID, Line in Records:\r
Name = TokenSpaceGuid + '.' + PcdName\r
if Name not in GlobalData.gPlatformOtherPcds:\r
PcdLine = Line\r
Macros.update(GlobalData.gGlobalDefines)\r
try:\r
Result = ValueExpression(self._ValueList[1], Macros)()\r
- except SymbolNotFound, Exc:\r
+ except SymbolNotFound as Exc:\r
EdkLogger.debug(EdkLogger.DEBUG_5, str(Exc), self._ValueList[1])\r
Result = False\r
- except WrnExpression, Excpt:\r
+ except WrnExpression as Excpt:\r
# \r
# Catch expression evaluation warning here. We need to report\r
# the precise number of line and return the evaluation result\r
# Allow using system environment variables in path after !include\r
#\r
__IncludeMacros['WORKSPACE'] = GlobalData.gGlobalDefines['WORKSPACE']\r
- if "ECP_SOURCE" in GlobalData.gGlobalDefines.keys():\r
+ if "ECP_SOURCE" in GlobalData.gGlobalDefines:\r
__IncludeMacros['ECP_SOURCE'] = GlobalData.gGlobalDefines['ECP_SOURCE']\r
#\r
# During GenFds phase call DSC parser, will go into this branch.\r
#\r
- elif "ECP_SOURCE" in GlobalData.gCommandLineDefines.keys():\r
+ elif "ECP_SOURCE" in GlobalData.gCommandLineDefines:\r
__IncludeMacros['ECP_SOURCE'] = GlobalData.gCommandLineDefines['ECP_SOURCE']\r
\r
__IncludeMacros['EFI_SOURCE'] = GlobalData.gGlobalDefines['EFI_SOURCE']\r
self._FileWithError = IncludedFile1\r
\r
IncludedFileTable = MetaFileStorage(self._Table.Cur, IncludedFile1, MODEL_FILE_DSC, False)\r
- Owner = self._Content[self._ContentIndex - 1][0]\r
+ FromItem = self._Content[self._ContentIndex - 1][0]\r
+ if self._InSubsection:\r
+ Owner = self._Content[self._ContentIndex - 1][8]\r
+ else:\r
+ Owner = self._Content[self._ContentIndex - 1][0]\r
Parser = DscParser(IncludedFile1, self._FileType, self._Arch, IncludedFileTable,\r
- Owner=Owner, From=Owner)\r
+ Owner=Owner, From=FromItem)\r
\r
self.IncludedFiles.add (IncludedFile1)\r
\r
- # Does not allow lower level included file to include upper level included file\r
- if Parser._From != Owner and int(Owner) > int (Parser._From):\r
- EdkLogger.error('parser', FILE_ALREADY_EXIST, File=self._FileWithError,\r
- Line=self._LineIndex + 1, ExtraData="{0} is already included at a higher level.".format(IncludedFile1))\r
-\r
-\r
# set the parser status with current status\r
Parser._SectionName = self._SectionName\r
- Parser._SectionType = self._SectionType\r
+ if self._InSubsection:\r
+ Parser._SectionType = self._SubsectionType\r
+ else:\r
+ Parser._SectionType = self._SectionType\r
Parser._Scope = self._Scope\r
Parser._Enabled = self._Enabled\r
# Parse the included file\r
\r
# update current status with sub-parser's status\r
self._SectionName = Parser._SectionName\r
- self._SectionType = Parser._SectionType\r
+ if not self._InSubsection:\r
+ self._SectionType = Parser._SectionType\r
+ self._SubsectionType = Parser._SubsectionType\r
+ self._InSubsection = Parser._InSubsection\r
+\r
self._Scope = Parser._Scope\r
self._Enabled = Parser._Enabled\r
\r
def __ProcessSkuId(self):\r
self._ValueList = [ReplaceMacro(Value, self._Macros, RaiseError=True)\r
for Value in self._ValueList]\r
+ def __ProcessDefaultStores(self):\r
+ self._ValueList = [ReplaceMacro(Value, self._Macros, RaiseError=True)\r
+ for Value in self._ValueList]\r
\r
def __ProcessLibraryInstance(self):\r
self._ValueList = [ReplaceMacro(Value, self._Macros) for Value in self._ValueList]\r
if PcdValue and "." not in self._ValueList[0]:\r
try:\r
ValList[Index] = ValueExpression(PcdValue, self._Macros)(True)\r
- except WrnExpression, Value:\r
+ except WrnExpression as Value:\r
ValList[Index] = Value.result\r
+ except:\r
+ pass\r
\r
if ValList[Index] == 'True':\r
ValList[Index] = '1'\r
_SectionParser = {\r
MODEL_META_DATA_HEADER : _DefineParser,\r
MODEL_EFI_SKU_ID : _SkuIdParser,\r
+ MODEL_EFI_DEFAULT_STORES : _DefaultStoresParser,\r
MODEL_EFI_LIBRARY_INSTANCE : _LibraryInstanceParser,\r
MODEL_EFI_LIBRARY_CLASS : _LibraryClassParser,\r
MODEL_PCD_FIXED_AT_BUILD : _PcdParser,\r
# section content\r
self._ValueList = ['', '', '']\r
self._SectionParser[self._SectionType[0]](self)\r
- if self._ValueList == None or self._ItemType == MODEL_META_DATA_DEFINE:\r
+ if self._ValueList is None or self._ItemType == MODEL_META_DATA_DEFINE:\r
self._ItemType = -1\r
self._Comments = []\r
continue\r
if len(ItemList) > 1:\r
S1 = ItemList[1].upper()\r
else:\r
- S1 = 'COMMON'\r
+ S1 = TAB_ARCH_COMMON\r
ArchList.add(S1)\r
# S2 may be Platform or ModuleType\r
if len(ItemList) > 2:\r
EdkLogger.error("Parser", FORMAT_INVALID, 'Please use keyword "Private" as section tag modifier.',\r
File=self.MetaFile, Line=self._LineIndex + 1, ExtraData=self._CurrentLine)\r
else:\r
- S2 = 'COMMON'\r
+ S2 = TAB_COMMON\r
PrivateList.add(S2)\r
if [S1, S2, self.DataType[self._SectionName]] not in self._Scope:\r
self._Scope.append([S1, S2, self.DataType[self._SectionName]])\r
\r
# 'COMMON' must not be used with specific ARCHs at the same section\r
- if 'COMMON' in ArchList and len(ArchList) > 1:\r
+ if TAB_ARCH_COMMON in ArchList and len(ArchList) > 1:\r
EdkLogger.error('Parser', FORMAT_INVALID, "'common' ARCH must not be used with specific ARCHs",\r
File=self.MetaFile, Line=self._LineIndex + 1, ExtraData=self._CurrentLine)\r
\r
# It is not permissible to mix section tags without the Private attribute with section tags with the Private attribute\r
- if 'COMMON' in PrivateList and len(PrivateList) > 1:\r
+ if TAB_COMMON in PrivateList and len(PrivateList) > 1:\r
EdkLogger.error('Parser', FORMAT_INVALID, "Can't mix section tags without the Private attribute with section tags with the Private attribute",\r
File=self.MetaFile, Line=self._LineIndex + 1, ExtraData=self._CurrentLine)\r
\r
File=self.MetaFile, Line=self._LineIndex + 1)\r
self._ValueList[0] = TokenList[0]\r
self._ValueList[1] = TokenList[1]\r
+ if self._ValueList[0] not in self._GuidDict:\r
+ self._GuidDict[self._ValueList[0]] = self._ValueList[1]\r
\r
## PCD sections parser\r
#\r
if "|" not in self._CurrentLine:\r
if "<HeaderFiles>" == self._CurrentLine:\r
self._include_flag = True\r
+ self._package_flag = False\r
self._ValueList = None\r
return\r
if "<Packages>" == self._CurrentLine:\r
self._package_flag = True\r
self._ValueList = None\r
+ self._include_flag = False\r
return\r
\r
if self._include_flag:\r
self._ValueList[1] = "<HeaderFiles>_" + md5.new(self._CurrentLine).hexdigest()\r
self._ValueList[2] = self._CurrentLine\r
- self._include_flag = False\r
if self._package_flag and "}" != self._CurrentLine:\r
self._ValueList[1] = "<Packages>_" + md5.new(self._CurrentLine).hexdigest()\r
self._ValueList[2] = self._CurrentLine\r
if self._CurrentLine == "}":\r
self._package_flag = False\r
+ self._include_flag = False\r
self._ValueList = None\r
return\r
else:\r
if len(PcdNames) == 2:\r
self._CurrentStructurePcdName = ""\r
else:\r
- self._ValueList[1] = PcdNames[2]\r
+ if self._CurrentStructurePcdName != TAB_SPLIT.join(PcdNames[:2]):\r
+ EdkLogger.error('Parser', FORMAT_INVALID, "Pcd Name does not match: %s and %s " % (self._CurrentStructurePcdName , TAB_SPLIT.join(PcdNames[:2])),\r
+ File=self.MetaFile, Line=self._LineIndex + 1)\r
+ self._ValueList[1] = TAB_SPLIT.join(PcdNames[2:])\r
self._ValueList[2] = PcdTockens[1]\r
if not self._CurrentStructurePcdName:\r
TokenList = GetSplitValueList(self._CurrentLine, TAB_VALUE_SPLIT, 1)\r
PcdValue = ValueList[0]\r
if PcdValue:\r
try:\r
- ValueList[0] = ValueExpression(PcdValue, self._AllPcdDict)(True)\r
- except WrnExpression, Value:\r
- ValueList[0] = Value.result\r
-\r
- if ValueList[0] == 'True':\r
- ValueList[0] = '1'\r
- if ValueList[0] == 'False':\r
- ValueList[0] = '0'\r
-\r
+ self._GuidDict.update(self._AllPcdDict)\r
+ ValueList[0] = ValueExpressionEx(ValueList[0], ValueList[1], self._GuidDict)(True)\r
+ except BadExpression as Value:\r
+ EdkLogger.error('Parser', FORMAT_INVALID, Value, ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1)\r
# check format of default value against the datum type\r
IsValid, Cause = CheckPcdDatum(ValueList[1], ValueList[0])\r
if not IsValid:\r
projects / mirror_edk2.git / blobdiff