#\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
-# http://opensource.org/licenses/bsd-license.php\r
-#\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+# SPDX-License-Identifier: BSD-2-Clause-Patent\r
#\r
\r
##\r
# Import Modules\r
#\r
from __future__ import print_function\r
+from __future__ import absolute_import\r
import Common.LongFilePathOs as os\r
import re\r
import time\r
import copy\r
-import md5\r
+from hashlib import md5\r
\r
import Common.EdkLogger as EdkLogger\r
import Common.GlobalData as GlobalData\r
from CommonDataClass.DataClass import *\r
from Common.DataType import *\r
from Common.StringUtils import *\r
-from Common.Misc import GuidStructureStringToGuidString, CheckPcdDatum, PathClass, AnalyzePcdData, AnalyzeDscPcd, AnalyzePcdExpression, ParseFieldValue\r
+from Common.Misc import GuidStructureStringToGuidString, CheckPcdDatum, PathClass, AnalyzePcdData, AnalyzeDscPcd, AnalyzePcdExpression, ParseFieldValue, StructPattern\r
from Common.Expression import *\r
from CommonDataClass.Exceptions import *\r
from Common.LongFilePathSupport import OpenLongFilePath as open\r
from collections import defaultdict\r
-from MetaFileTable import MetaFileStorage\r
-from MetaFileCommentParser import CheckInfComment\r
+from .MetaFileTable import MetaFileStorage\r
+from .MetaFileCommentParser import CheckInfComment\r
+from Common.DataType import TAB_COMMENT_EDK_START, TAB_COMMENT_EDK_END\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
+CODEPattern = re.compile(r"{CODE\([a-fA-F0-9Xx\{\},\s]*\)}")\r
\r
## A decorator used to parse macro definition\r
def ParseMacro(Parser):\r
def MacroParser(self):\r
- Match = gMacroDefPattern.match(self._CurrentLine)\r
+ Match = GlobalData.gMacroDefPattern.match(self._CurrentLine)\r
if not Match:\r
# Not 'DEFINE/EDK_GLOBAL' statement, call decorated method\r
Parser(self)\r
EdkLogger.error('Parser', FORMAT_INVALID, "%s can only be defined via environment variable" % Name,\r
ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1)\r
# Only upper case letters, digit and '_' are allowed\r
- if not gMacroNamePattern.match(Name):\r
+ if not GlobalData.gMacroNamePattern.match(Name):\r
EdkLogger.error('Parser', FORMAT_INVALID, "The macro name must be in the pattern [A-Z][A-Z0-9_]*",\r
ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1)\r
\r
self._Version = 0\r
self._GuidDict = {} # for Parser PCD value {GUID(gTokeSpaceGuidName)}\r
\r
+ self._PcdCodeValue = ""\r
+ self._PcdDataTypeCODE = False\r
+ self._CurrentPcdName = ""\r
+\r
## Store the parsed data in table\r
def _Store(self, *Args):\r
return self._Table.Insert(*Args)\r
## Set parsing complete flag in both class and table\r
def _Done(self):\r
self._Finished = True\r
- ## Do not set end flag when processing included files\r
- if self._From == -1:\r
- self._Table.SetEndFlag()\r
+ self._Table.SetEndFlag()\r
\r
def _PostProcess(self):\r
self._PostProcessed = True\r
\r
## Get the parse complete flag\r
- def _GetFinished(self):\r
+ @property\r
+ def Finished(self):\r
return self._Finished\r
\r
## Set the complete flag\r
- def _SetFinished(self, Value):\r
+ @Finished.setter\r
+ def Finished(self, Value):\r
self._Finished = Value\r
\r
## Remove records that do not match given Filter Arch\r
DataInfo = (DataInfo,)\r
\r
# Parse the file first, if necessary\r
- if not self._Finished:\r
- if self._RawTable.IsIntegrity():\r
- self._Finished = True\r
- else:\r
- self._Table = self._RawTable\r
- self._PostProcessed = False\r
- self.Start()\r
+ self.StartParse()\r
\r
# No specific ARCH or Platform given, use raw data\r
if self._RawTable and (len(DataInfo) == 1 or DataInfo[1] is None):\r
\r
return self._FilterRecordList(self._Table.Query(*DataInfo), DataInfo[1])\r
\r
+ def StartParse(self):\r
+ if not self._Finished:\r
+ if self._RawTable.IsIntegrity():\r
+ self._Finished = True\r
+ else:\r
+ self._Table = self._RawTable\r
+ self._PostProcessed = False\r
+ self.Start()\r
## Data parser for the common format in different type of file\r
#\r
# The common format in the meatfile is like\r
S1 = ItemList[1].upper()\r
else:\r
S1 = TAB_ARCH_COMMON\r
+ S1 = ReplaceMacro(S1, self._Macros)\r
ArchList.add(S1)\r
\r
# S2 may be Platform or ModuleType\r
self._Version = int(Value, 0)\r
elif decVersionPattern.match(Value):\r
ValueList = Value.split('.')\r
- Major = '%04o' % int(ValueList[0], 0)\r
- Minor = '%04o' % int(ValueList[1], 0)\r
- self._Version = int('0x' + Major + Minor, 0)\r
+ Major = int(ValueList[0], 0)\r
+ Minor = int(ValueList[1], 0)\r
+ if Major > 0xffff or Minor > 0xffff:\r
+ EdkLogger.error('Parser', FORMAT_INVALID, "Invalid version number",\r
+ ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1)\r
+ self._Version = int('0x{0:04x}{1:04x}'.format(Major, Minor), 0)\r
else:\r
EdkLogger.error('Parser', FORMAT_INVALID, "Invalid version number",\r
ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1)\r
)\r
def GetValidExpression(self, TokenSpaceGuid, PcdCName):\r
return self._Table.GetValidExpression(TokenSpaceGuid, PcdCName)\r
- def _GetMacros(self):\r
+\r
+ @property\r
+ def _Macros(self):\r
Macros = {}\r
Macros.update(self._FileLocalMacros)\r
Macros.update(self._GetApplicableSectionMacro())\r
ScopeKey = tuple(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
+ # As Pcd section macro usage is not allowed, so here it is safe\r
#\r
if isinstance(self, DecParser):\r
SectionDictKey = self._SectionType[0], ScopeKey\r
\r
return Macros\r
\r
- _SectionParser = {}\r
- Finished = property(_GetFinished, _SetFinished)\r
- _Macros = property(_GetMacros)\r
+ def ProcessMultipleLineCODEValue(self,Content):\r
+ CODEBegin = False\r
+ CODELine = ""\r
+ continuelinecount = 0\r
+ newContent = []\r
+ for Index in range(0, len(Content)):\r
+ Line = Content[Index]\r
+ if CODEBegin:\r
+ CODELine = CODELine + Line\r
+ continuelinecount +=1\r
+ if ")}" in Line:\r
+ newContent.append(CODELine)\r
+ for _ in range(continuelinecount):\r
+ newContent.append("")\r
+ CODEBegin = False\r
+ CODELine = ""\r
+ continuelinecount = 0\r
+ else:\r
+ if not Line:\r
+ newContent.append(Line)\r
+ continue\r
+ if "{CODE(" not in Line:\r
+ newContent.append(Line)\r
+ continue\r
+ elif CODEPattern.findall(Line):\r
+ newContent.append(Line)\r
+ continue\r
+ else:\r
+ CODEBegin = True\r
+ CODELine = Line\r
\r
+ return newContent\r
+\r
+ _SectionParser = {}\r
\r
## INF file parser class\r
#\r
NmakeLine = ''\r
Content = ''\r
try:\r
- Content = open(str(self.MetaFile), 'r').readlines()\r
+ with open(str(self.MetaFile), 'r') as File:\r
+ Content = File.readlines()\r
except:\r
EdkLogger.error("Parser", FILE_READ_FAILURE, ExtraData=self.MetaFile)\r
\r
SectionComments.extend(Comments)\r
Comments = []\r
continue\r
- if Line.find(DataType.TAB_COMMENT_EDK_START) > -1:\r
+ if Line.find(TAB_COMMENT_EDK_START) > -1:\r
IsFindBlockComment = True\r
continue\r
- if Line.find(DataType.TAB_COMMENT_EDK_END) > -1:\r
+ if Line.find(TAB_COMMENT_EDK_END) > -1:\r
IsFindBlockComment = False\r
continue\r
if IsFindBlockComment:\r
Value = self._ValueList[Index]\r
if not Value:\r
continue\r
-\r
- if Value.upper().find('$(EFI_SOURCE)\Edk'.upper()) > -1 or Value.upper().find('$(EFI_SOURCE)/Edk'.upper()) > -1:\r
- Value = '$(EDK_SOURCE)' + Value[17:]\r
- if Value.find('$(EFI_SOURCE)') > -1 or Value.find('$(EDK_SOURCE)') > -1:\r
- pass\r
- elif Value.startswith('.'):\r
- pass\r
- elif Value.startswith('$('):\r
- pass\r
- else:\r
- Value = '$(EFI_SOURCE)/' + Value\r
-\r
self._ValueList[Index] = ReplaceMacro(Value, Macros)\r
\r
## Parse [Sources] section\r
if self._ValueList[2] != '':\r
InfPcdValueList = GetSplitValueList(TokenList[1], TAB_VALUE_SPLIT, 1)\r
if InfPcdValueList[0] in ['True', 'true', 'TRUE']:\r
- self._ValueList[2] = TokenList[1].replace(InfPcdValueList[0], '1', 1);\r
+ self._ValueList[2] = TokenList[1].replace(InfPcdValueList[0], '1', 1)\r
elif InfPcdValueList[0] in ['False', 'false', 'FALSE']:\r
- self._ValueList[2] = TokenList[1].replace(InfPcdValueList[0], '0', 1);\r
+ self._ValueList[2] = TokenList[1].replace(InfPcdValueList[0], '0', 1)\r
+ elif isinstance(InfPcdValueList[0], str) and InfPcdValueList[0].find('$(') >= 0:\r
+ Value = ReplaceExprMacro(InfPcdValueList[0],self._Macros)\r
+ if Value != '0':\r
+ self._ValueList[2] = Value\r
if (self._ValueList[0], self._ValueList[1]) not in self.PcdsDict:\r
self.PcdsDict[self._ValueList[0], self._ValueList[1]] = self._SectionType\r
elif self.PcdsDict[self._ValueList[0], self._ValueList[1]] != self._SectionType:\r
TAB_PCDS_DYNAMIC_EX_HII_NULL.upper() : MODEL_PCD_DYNAMIC_EX_HII,\r
TAB_PCDS_DYNAMIC_EX_VPD_NULL.upper() : MODEL_PCD_DYNAMIC_EX_VPD,\r
TAB_COMPONENTS.upper() : MODEL_META_DATA_COMPONENT,\r
- TAB_COMPONENTS_SOURCE_OVERRIDE_PATH.upper() : MODEL_META_DATA_COMPONENT_SOURCE_OVERRIDE_PATH,\r
TAB_DSC_DEFINES.upper() : MODEL_META_DATA_HEADER,\r
TAB_DSC_DEFINES_DEFINE : MODEL_META_DATA_DEFINE,\r
TAB_DSC_DEFINES_EDKGLOBAL : MODEL_META_DATA_GLOBAL_DEFINE,\r
#\r
self._IdMapping = {-1:-1}\r
\r
+ self._Content = None\r
+\r
## Parser starter\r
def Start(self):\r
Content = ''\r
try:\r
- Content = open(str(self.MetaFile), 'r').readlines()\r
+ with open(str(self.MetaFile), 'r') as File:\r
+ Content = File.readlines()\r
except:\r
EdkLogger.error("Parser", FILE_READ_FAILURE, ExtraData=self.MetaFile)\r
\r
OwnerId = {}\r
+\r
+ Content = self.ProcessMultipleLineCODEValue(Content)\r
+\r
for Index in range(0, len(Content)):\r
Line = CleanString(Content[Index])\r
# skip empty line\r
self._ItemType = SectionType\r
\r
self._ValueList = ['', '', '']\r
+ # "SET pcd = pcd_expression" syntax is not supported in Dsc file.\r
+ if self._CurrentLine.upper().strip().startswith("SET "):\r
+ EdkLogger.error('Parser', FORMAT_INVALID, '''"SET pcd = pcd_expression" syntax is not support in Dsc file''',\r
+ ExtraData=self._CurrentLine,\r
+ File=self.MetaFile, Line=self._LineIndex + 1)\r
self._SectionParser[SectionType](self)\r
if self._ValueList is None:\r
continue\r
def _LibraryInstanceParser(self):\r
self._ValueList[0] = self._CurrentLine\r
\r
+\r
+ def _DecodeCODEData(self):\r
+ pass\r
## PCD sections parser\r
#\r
# [PcdsFixedAtBuild]\r
#\r
@ParseMacro\r
def _PcdParser(self):\r
+ if self._PcdDataTypeCODE:\r
+ self._PcdCodeValue = self._PcdCodeValue + "\n " + self._CurrentLine\r
+ if self._CurrentLine.endswith(")}"):\r
+ self._CurrentLine = "|".join((self._CurrentPcdName, self._PcdCodeValue))\r
+ self._PcdDataTypeCODE = False\r
+ self._PcdCodeValue = ""\r
+ else:\r
+ self._ValueList = None\r
+ return\r
TokenList = GetSplitValueList(self._CurrentLine, TAB_VALUE_SPLIT, 1)\r
+ self._CurrentPcdName = TokenList[0]\r
+ if len(TokenList) == 2 and TokenList[1].strip().startswith("{CODE"):\r
+ self._PcdDataTypeCODE = True\r
+ self._PcdCodeValue = TokenList[1].strip()\r
+\r
+ if self._PcdDataTypeCODE:\r
+ if self._CurrentLine.endswith(")}"):\r
+ self._PcdDataTypeCODE = False\r
+ self._PcdCodeValue = ""\r
+ else:\r
+ self._ValueList = None\r
+ return\r
self._ValueList[0:1] = GetSplitValueList(TokenList[0], TAB_SPLIT)\r
PcdNameTockens = GetSplitValueList(TokenList[0], TAB_SPLIT)\r
if len(PcdNameTockens) == 2:\r
\r
self._ValueList[0:len(TokenList)] = TokenList\r
\r
- def _CompponentSourceOverridePathParser(self):\r
- self._ValueList[0] = self._CurrentLine\r
\r
## [BuildOptions] section parser\r
@ParseMacro\r
)\r
\r
## Override parent's method since we'll do all macro replacements in parser\r
- def _GetMacros(self):\r
+ @property\r
+ def _Macros(self):\r
Macros = {}\r
Macros.update(self._FileLocalMacros)\r
Macros.update(self._GetApplicableSectionMacro())\r
MODEL_PCD_DYNAMIC_EX_HII : self.__ProcessPcd,\r
MODEL_PCD_DYNAMIC_EX_VPD : self.__ProcessPcd,\r
MODEL_META_DATA_COMPONENT : self.__ProcessComponent,\r
- MODEL_META_DATA_COMPONENT_SOURCE_OVERRIDE_PATH : self.__ProcessSourceOverridePath,\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._Table.Create()\r
+ self._Table = MetaFileStorage(self._RawTable.DB, self.MetaFile, MODEL_FILE_DSC, True)\r
self._DirectiveStack = []\r
self._DirectiveEvalStack = []\r
self._FileWithError = self.MetaFile\r
self._SubsectionType = MODEL_UNKNOWN\r
\r
def __RetrievePcdValue(self):\r
- Content = open(str(self.MetaFile), 'r').readlines()\r
+ try:\r
+ with open(str(self.MetaFile), 'r') as File:\r
+ Content = File.readlines()\r
+ except:\r
+ EdkLogger.error("Parser", FILE_READ_FAILURE, ExtraData=self.MetaFile)\r
+\r
GlobalData.gPlatformOtherPcds['DSCFILE'] = str(self.MetaFile)\r
for PcdType in (MODEL_PCD_PATCHABLE_IN_MODULE, MODEL_PCD_DYNAMIC_DEFAULT, MODEL_PCD_DYNAMIC_HII,\r
MODEL_PCD_DYNAMIC_VPD, MODEL_PCD_DYNAMIC_EX_DEFAULT, MODEL_PCD_DYNAMIC_EX_HII,\r
# Allow using system environment variables in path after !include\r
#\r
__IncludeMacros['WORKSPACE'] = GlobalData.gGlobalDefines['WORKSPACE']\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:\r
- __IncludeMacros['ECP_SOURCE'] = GlobalData.gCommandLineDefines['ECP_SOURCE']\r
-\r
- __IncludeMacros['EFI_SOURCE'] = GlobalData.gGlobalDefines['EFI_SOURCE']\r
- __IncludeMacros['EDK_SOURCE'] = GlobalData.gGlobalDefines['EDK_SOURCE']\r
#\r
# Allow using MACROs comes from [Defines] section to keep compatible.\r
#\r
Owner = self._Content[self._ContentIndex - 1][8]\r
else:\r
Owner = self._Content[self._ContentIndex - 1][0]\r
- IncludedFileTable = MetaFileStorage(self._Table.Cur, IncludedFile1, MODEL_FILE_DSC, False, FromItem=FromItem)\r
+ IncludedFileTable = MetaFileStorage(self._RawTable.DB, IncludedFile1, MODEL_FILE_DSC, False, FromItem=FromItem)\r
Parser = DscParser(IncludedFile1, self._FileType, self._Arch, IncludedFileTable,\r
Owner=Owner, From=FromItem)\r
\r
Parser._Scope = self._Scope\r
Parser._Enabled = self._Enabled\r
# Parse the included file\r
- Parser.Start()\r
-\r
-\r
+ Parser.StartParse()\r
# Insert all records in the table for the included file into dsc file table\r
Records = IncludedFileTable.GetAll()\r
if Records:\r
\r
ValList, Valid, Index = AnalyzeDscPcd(self._ValueList[2], self._ItemType)\r
if not Valid:\r
+ if self._ItemType in (MODEL_PCD_DYNAMIC_DEFAULT, MODEL_PCD_DYNAMIC_EX_DEFAULT, MODEL_PCD_FIXED_AT_BUILD, MODEL_PCD_PATCHABLE_IN_MODULE):\r
+ if ValList[1] != TAB_VOID and StructPattern.match(ValList[1]) is None and ValList[2]:\r
+ EdkLogger.error('build', FORMAT_INVALID, "Pcd format incorrect. The datum type info should be VOID* or a valid struct name.", File=self._FileWithError,\r
+ Line=self._LineIndex + 1, ExtraData="%s.%s|%s" % (self._ValueList[0], self._ValueList[1], self._ValueList[2]))\r
EdkLogger.error('build', FORMAT_INVALID, "Pcd format incorrect.", File=self._FileWithError, Line=self._LineIndex + 1,\r
ExtraData="%s.%s|%s" % (self._ValueList[0], self._ValueList[1], self._ValueList[2]))\r
PcdValue = ValList[Index]\r
def __ProcessComponent(self):\r
self._ValueList[0] = ReplaceMacro(self._ValueList[0], self._Macros)\r
\r
- def __ProcessSourceOverridePath(self):\r
- self._ValueList[0] = ReplaceMacro(self._ValueList[0], self._Macros)\r
-\r
def __ProcessBuildOption(self):\r
self._ValueList = [ReplaceMacro(Value, self._Macros, RaiseError=False)\r
for Value in self._ValueList]\r
\r
+ def DisableOverrideComponent(self,module_id):\r
+ for ori_id in self._IdMapping:\r
+ if self._IdMapping[ori_id] == module_id:\r
+ self._RawTable.DisableComponent(ori_id)\r
+\r
_SectionParser = {\r
MODEL_META_DATA_HEADER : _DefineParser,\r
MODEL_EFI_SKU_ID : _SkuIdParser,\r
MODEL_PCD_DYNAMIC_EX_HII : _PcdParser,\r
MODEL_PCD_DYNAMIC_EX_VPD : _PcdParser,\r
MODEL_META_DATA_COMPONENT : _ComponentParser,\r
- MODEL_META_DATA_COMPONENT_SOURCE_OVERRIDE_PATH : _CompponentSourceOverridePathParser,\r
MODEL_META_DATA_BUILD_OPTION : _BuildOptionParser,\r
MODEL_UNKNOWN : MetaFileParser._Skip,\r
MODEL_META_DATA_USER_EXTENSION : MetaFileParser._SkipUserExtension,\r
MODEL_META_DATA_SUBSECTION_HEADER : _SubsectionHeaderParser,\r
}\r
\r
- _Macros = property(_GetMacros)\r
-\r
## DEC file parser class\r
#\r
# @param FilePath The path of platform description file\r
self._include_flag = False\r
self._package_flag = False\r
\r
+ self._RestofValue = ""\r
+\r
## Parser starter\r
def Start(self):\r
Content = ''\r
try:\r
- Content = open(str(self.MetaFile), 'r').readlines()\r
+ with open(str(self.MetaFile), 'r') as File:\r
+ Content = File.readlines()\r
except:\r
EdkLogger.error("Parser", FILE_READ_FAILURE, ExtraData=self.MetaFile)\r
\r
+ Content = self.ProcessMultipleLineCODEValue(Content)\r
+\r
self._DefinesCount = 0\r
for Index in range(0, len(Content)):\r
Line, Comment = CleanString2(Content[Index])\r
if self._ValueList[0] not in self._GuidDict:\r
self._GuidDict[self._ValueList[0]] = self._ValueList[1]\r
\r
+ def ParsePcdName(self,namelist):\r
+ if "[" in namelist[1]:\r
+ pcdname = namelist[1][:namelist[1].index("[")]\r
+ arrayindex = namelist[1][namelist[1].index("["):]\r
+ namelist[1] = pcdname\r
+ if len(namelist) == 2:\r
+ namelist.append(arrayindex)\r
+ else:\r
+ namelist[2] = ".".join((arrayindex,namelist[2]))\r
+ return namelist\r
+\r
## PCD sections parser\r
#\r
# [PcdsFixedAtBuild]\r
#\r
@ParseMacro\r
def _PcdParser(self):\r
+\r
if self._CurrentStructurePcdName:\r
self._ValueList[0] = self._CurrentStructurePcdName\r
\r
return\r
\r
if self._include_flag:\r
- self._ValueList[1] = "<HeaderFiles>_" + md5.new(self._CurrentLine).hexdigest()\r
+ self._ValueList[1] = "<HeaderFiles>_" + md5(self._CurrentLine.encode('utf-8')).hexdigest()\r
self._ValueList[2] = self._CurrentLine\r
if self._package_flag and "}" != self._CurrentLine:\r
- self._ValueList[1] = "<Packages>_" + md5.new(self._CurrentLine).hexdigest()\r
+ self._ValueList[1] = "<Packages>_" + md5(self._CurrentLine.encode('utf-8')).hexdigest()\r
self._ValueList[2] = self._CurrentLine\r
if self._CurrentLine == "}":\r
self._package_flag = False\r
return\r
else:\r
PcdTockens = self._CurrentLine.split(TAB_VALUE_SPLIT)\r
- PcdNames = PcdTockens[0].split(TAB_SPLIT)\r
+ PcdNames = self.ParsePcdName(PcdTockens[0].split(TAB_SPLIT))\r
if len(PcdNames) == 2:\r
- self._CurrentStructurePcdName = ""\r
+ if PcdNames[1].strip().endswith("]"):\r
+ PcdName = PcdNames[1][:PcdNames[1].index('[')]\r
+ Index = PcdNames[1][PcdNames[1].index('['):]\r
+ self._ValueList[0] = TAB_SPLIT.join((PcdNames[0],PcdName))\r
+ self._ValueList[1] = Index\r
+ self._ValueList[2] = PcdTockens[1]\r
+ else:\r
+ self._CurrentStructurePcdName = ""\r
else:\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
self._ValueList[1] = TAB_SPLIT.join(PcdNames[2:])\r
self._ValueList[2] = PcdTockens[1]\r
if not self._CurrentStructurePcdName:\r
+ if self._PcdDataTypeCODE:\r
+ if ")}" in self._CurrentLine:\r
+ ValuePart,RestofValue = self._CurrentLine.split(")}")\r
+ self._PcdCodeValue = self._PcdCodeValue + "\n " + ValuePart\r
+ self._CurrentLine = "|".join((self._CurrentPcdName, self._PcdCodeValue,RestofValue))\r
+ self._PcdDataTypeCODE = False\r
+ self._PcdCodeValue = ""\r
+ else:\r
+ self._PcdCodeValue = self._PcdCodeValue + "\n " + self._CurrentLine\r
+ self._ValueList = None\r
+ return\r
TokenList = GetSplitValueList(self._CurrentLine, TAB_VALUE_SPLIT, 1)\r
+ self._CurrentPcdName = TokenList[0]\r
+ if len(TokenList) == 2 and TokenList[1].strip().startswith("{CODE"):\r
+ if ")}" in self._CurrentLine:\r
+ self._PcdDataTypeCODE = False\r
+ self._PcdCodeValue = ""\r
+ else:\r
+ self._PcdDataTypeCODE = True\r
+ self._PcdCodeValue = TokenList[1].strip()\r
+ self._ValueList = None\r
+ return\r
+\r
self._ValueList[0:1] = GetSplitValueList(TokenList[0], TAB_SPLIT)\r
ValueRe = re.compile(r'^[a-zA-Z_][a-zA-Z0-9_]*')\r
# check PCD information\r
projects / mirror_edk2.git / blobdiff