\r
from Common.BuildToolError import *\r
from Common import EdkLogger\r
-from Common.Misc import PathClass, tdict\r
+from Common.Misc import PathClass, tdict, ProcessDuplicatedInf\r
from Common.StringUtils import NormPath, ReplaceMacro\r
from Common import GlobalData\r
from Common.Expression import *\r
T_CHAR_DOUBLE_QUOTE = '\"'\r
T_CHAR_SINGLE_QUOTE = '\''\r
T_CHAR_STAR = '*'\r
+T_CHAR_BRACE_R = '}'\r
\r
-SEPARATORS = {TAB_EQUAL_SPLIT, TAB_VALUE_SPLIT, TAB_COMMA_SPLIT, '{', '}'}\r
+SEPARATORS = {TAB_EQUAL_SPLIT, TAB_VALUE_SPLIT, TAB_COMMA_SPLIT, '{', T_CHAR_BRACE_R}\r
ALIGNMENTS = {"Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K", "64K", "128K",\r
"256K", "512K", "1M", "2M", "4M", "8M", "16M"}\r
ALIGNMENT_NOAUTO = ALIGNMENTS - {"Auto"}\r
def __str__(self):\r
return self.Message\r
\r
+ # helper functions to facilitate consistency in warnings\r
+ # each function is for a different common warning\r
+ @staticmethod\r
+ def Expected(Str, File, Line):\r
+ return Warning("expected {}".format(Str), File, Line)\r
+ @staticmethod\r
+ def ExpectedEquals(File, Line):\r
+ return Warning.Expected("'='", File, Line)\r
+ @staticmethod\r
+ def ExpectedCurlyOpen(File, Line):\r
+ return Warning.Expected("'{'", File, Line)\r
+ @staticmethod\r
+ def ExpectedCurlyClose(File, Line):\r
+ return Warning.Expected("'}'", File, Line)\r
+ @staticmethod\r
+ def ExpectedBracketClose(File, Line):\r
+ return Warning.Expected("']'", File, Line)\r
+\r
## The Include file content class that used to record file data when parsing include file\r
#\r
# May raise Exception when opening file.\r
\r
return (self.FileName, Line - InsertedLines + 1)\r
\r
-\r
-\r
## The FDF content class that used to record file data when parsing FDF\r
#\r
# May raise Exception when opening file.\r
\r
if self._Token == TAB_DEFINE:\r
if not self._GetNextToken():\r
- raise Warning("expected Macro name", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Macro name", self.FileName, self.CurrentLineNumber)\r
Macro = self._Token\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
Value = self._GetExpression()\r
MacroDict[Macro] = Value\r
\r
IncludeLine = self.CurrentLineNumber\r
IncludeOffset = self.CurrentOffsetWithinLine - len(TAB_INCLUDE)\r
if not self._GetNextToken():\r
- raise Warning("expected include file name", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("include file name", self.FileName, self.CurrentLineNumber)\r
IncFileName = self._Token\r
PreIndex = 0\r
StartPos = IncFileName.find('$(', PreIndex)\r
DefineLine = self.CurrentLineNumber - 1\r
DefineOffset = self.CurrentOffsetWithinLine - len(TAB_DEFINE)\r
if not self._GetNextToken():\r
- raise Warning("expected Macro name", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Macro name", self.FileName, self.CurrentLineNumber)\r
Macro = self._Token\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
Value = self._GetExpression()\r
self._SetMacroValue(Macro, Value)\r
PcdPair = self._GetNextPcdSettings()\r
PcdName = "%s.%s" % (PcdPair[1], PcdPair[0])\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
Value = self._GetExpression()\r
Value = self._EvaluateConditional(Value, self.CurrentLineNumber, 'eval', True)\r
\r
def _GetNextPcdSettings(self):\r
if not self._GetNextWord():\r
- raise Warning("expected format of <PcdTokenSpaceCName>.<PcdCName>", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("<PcdTokenSpaceCName>", self.FileName, self.CurrentLineNumber)\r
pcdTokenSpaceCName = self._Token\r
\r
if not self._IsToken(TAB_SPLIT):\r
- raise Warning("expected format of <PcdTokenSpaceCName>.<PcdCName>", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected(".", self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextWord():\r
- raise Warning
("expected format of <PcdTokenSpaceCName>.<PcdCName>", self.FileName, self.CurrentLineNumber)
\r+ raise Warning
.Expected("<PcdCName>", self.FileName, self.CurrentLineNumber)
\r pcdCName = self._Token\r
\r
Fields = []\r
while self._IsToken(TAB_SPLIT):\r
if not self._GetNextPcdWord():\r
- raise Warning("expected format of <PcdTokenSpaceCName>.<PcdCName>", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Pcd Fields", self.FileName, self.CurrentLineNumber)\r
Fields.append(self._Token)\r
\r
return (pcdCName, pcdTokenSpaceCName,TAB_SPLIT.join(Fields))\r
# @retval False Not able to find a string data, file buffer pointer not changed\r
#\r
def _GetStringData(self):\r
+ QuoteToUse = None\r
if self._Token.startswith(T_CHAR_DOUBLE_QUOTE) or self._Token.startswith("L\""):\r
- self._UndoToken()\r
- self._SkipToToken(T_CHAR_DOUBLE_QUOTE)\r
- currentLineNumber = self.CurrentLineNumber\r
-\r
- if not self._SkipToToken(T_CHAR_DOUBLE_QUOTE):\r
- raise Warning("Missing Quote \" for String", self.FileName, self.CurrentLineNumber)\r
- if currentLineNumber != self.CurrentLineNumber:\r
- raise Warning("Missing Quote \" for String", self.FileName, self.CurrentLineNumber)\r
- self._Token = self._SkippedChars.rstrip(T_CHAR_DOUBLE_QUOTE)\r
- return True\r
-\r
+ QuoteToUse = T_CHAR_DOUBLE_QUOTE\r
elif self._Token.startswith(T_CHAR_SINGLE_QUOTE) or self._Token.startswith("L\'"):\r
- self._UndoToken()\r
- self._SkipToToken(T_CHAR_SINGLE_QUOTE)\r
- currentLineNumber = self.CurrentLineNumber\r
-\r
- if not self._SkipToToken(T_CHAR_SINGLE_QUOTE):\r
- raise Warning("Missing Quote \' for String", self.FileName, self.CurrentLineNumber)\r
- if currentLineNumber != self.CurrentLineNumber:\r
- raise Warning("Missing Quote \' for String", self.FileName, self.CurrentLineNumber)\r
- self._Token = self._SkippedChars.rstrip(T_CHAR_SINGLE_QUOTE)\r
- return True\r
-\r
+ QuoteToUse = T_CHAR_SINGLE_QUOTE\r
else:\r
return False\r
\r
+ self._UndoToken()\r
+ self._SkipToToken(QuoteToUse)\r
+ currentLineNumber = self.CurrentLineNumber\r
+\r
+ if not self._SkipToToken(QuoteToUse):\r
+ raise Warning(QuoteToUse, self.FileName, self.CurrentLineNumber)\r
+ if currentLineNumber != self.CurrentLineNumber:\r
+ raise Warning(QuoteToUse, self.FileName, self.CurrentLineNumber)\r
+ self._Token = self._SkippedChars.rstrip(QuoteToUse)\r
+ return True\r
+\r
## _SkipToToken() method\r
#\r
# Search forward in file buffer for the string\r
FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
#print 'Parsing String: %s in File %s, At line: %d, Offset Within Line: %d' \\r
# % (self.Profile.FileLinesList[self.CurrentLineNumber - 1][self.CurrentOffsetWithinLine:], FileLineTuple[0], FileLineTuple[1], self.CurrentOffsetWithinLine)\r
- raise Warning("expected [DEFINES", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("[DEFINES", self.FileName, self.CurrentLineNumber)\r
\r
if not self._IsToken(TAB_SECTION_END):\r
- raise Warning("expected ']'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedBracketClose(self.FileName, self.CurrentLineNumber)\r
\r
while self._GetNextWord():\r
# handle the SET statement\r
Macro = self._Token\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
if not self._GetNextToken() or self._Token.startswith(TAB_SECTION_START):\r
- raise Warning("expected MACRO value", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("MACRO value", self.FileName, self.CurrentLineNumber)\r
Value = self._Token\r
\r
return False\r
FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
#print 'Parsing String: %s in File %s, At line: %d, Offset Within Line: %d' \\r
# % (self.Profile.FileLinesList[self.CurrentLineNumber - 1][self.CurrentOffsetWithinLine:], FileLineTuple[0], FileLineTuple[1], self.CurrentOffsetWithinLine)\r
- raise Warning("expected [FD.]", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("[FD.]", self.FileName, self.CurrentLineNumber)\r
\r
FdName = self._GetUiName()\r
if FdName == "":\r
FdName = GlobalData.gActivePlatform.PlatformName\r
self.Profile.FdNameNotSet = True\r
else:\r
- raise Warning("expected FdName in [FD.] section", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("FdName in [FD.] section", self.FileName, self.CurrentLineNumber)\r
self.CurrentFdName = FdName.upper()\r
\r
if self.CurrentFdName in self.Profile.FdDict:\r
raise Warning("Unexpected the same FD name", self.FileName, self.CurrentLineNumber)\r
\r
if not self._IsToken(TAB_SECTION_END):\r
- raise Warning("expected ']'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedBracketClose(self.FileName, self.CurrentLineNumber)\r
\r
FdObj = FD()\r
FdObj.FdUiName = self.CurrentFdName\r
self.Profile.FdDict[self.CurrentFdName] = FdObj\r
\r
if len (self.Profile.FdDict) > 1 and self.Profile.FdNameNotSet:\r
- raise Warning("expected all FDs have their name", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("all FDs have their name", self.FileName, self.CurrentLineNumber)\r
\r
Status = self._GetCreateFile(FdObj)\r
if not Status:\r
self._GetSetStatements(FdObj)\r
\r
if not self._GetRegionLayout(FdObj):\r
- raise Warning("expected region layout", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("region layout", self.FileName, self.CurrentLineNumber)\r
\r
while self._GetRegionLayout(FdObj):\r
pass\r
def _GetCreateFile(self, Obj):\r
if self._IsKeyword("CREATE_FILE"):\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected file name", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("file name", self.FileName, self.CurrentLineNumber)\r
\r
FileName = self._Token\r
Obj.CreateFileName = FileName\r
def _GetTokenStatements(self, Obj):\r
if self._IsKeyword("BaseAddress"):\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextHexNumber():\r
- raise Warning("expected Hex base address", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Hex base address", self.FileName, self.CurrentLineNumber)\r
\r
Obj.BaseAddress = self._Token\r
\r
\r
if self._IsKeyword("Size"):\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextHexNumber():\r
- raise Warning("expected Hex size", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Hex size", self.FileName, self.CurrentLineNumber)\r
\r
Size = self._Token\r
if self._IsToken(TAB_VALUE_SPLIT):\r
\r
if self._IsKeyword("ErasePolarity"):\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected Erase Polarity", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Erase Polarity", self.FileName, self.CurrentLineNumber)\r
\r
- if self._Token != "1" and self._Token != "0":\r
- raise Warning("expected 1 or 0 Erase Polarity", self.FileName, self.CurrentLineNumber)\r
+ if not self._Token in {"1", "0"}:\r
+ raise Warning.Expected("1 or 0 Erase Polarity", self.FileName, self.CurrentLineNumber)\r
\r
Obj.ErasePolarity = self._Token\r
return True\r
def _GetAddressStatements(self, Obj):\r
if self._IsKeyword("BsBaseAddress"):\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextDecimalNumber() and not self._GetNextHexNumber():\r
- raise Warning("expected address", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("address", self.FileName, self.CurrentLineNumber)\r
\r
BsAddress = long(self._Token, 0)\r
Obj.BsBaseAddress = BsAddress\r
\r
if self._IsKeyword("RtBaseAddress"):\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextDecimalNumber() and not self._GetNextHexNumber():\r
- raise Warning("expected address", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("address", self.FileName, self.CurrentLineNumber)\r
\r
RtAddress = long(self._Token, 0)\r
Obj.RtBaseAddress = RtAddress\r
\r
Item = Obj.BlockSizeList[-1]\r
if Item[0] is None or Item[1] is None:\r
- raise Warning("expected block statement", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("block statement", self.FileName, self.CurrentLineNumber)\r
return IsBlock\r
\r
## _GetBlockStatement() method\r
return False\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextHexNumber() and not self._GetNextDecimalNumber():\r
- raise Warning("expected Hex or Integer block size", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Hex or Integer block size", self.FileName, self.CurrentLineNumber)\r
\r
BlockSize = self._Token\r
BlockSizePcd = None\r
BlockNumber = None\r
if self._IsKeyword("NumBlocks"):\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextDecimalNumber() and not self._GetNextHexNumber():\r
- raise Warning("expected block numbers", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("block numbers", self.FileName, self.CurrentLineNumber)\r
\r
BlockNumber = long(self._Token, 0)\r
\r
self._GetNextToken()\r
Macro = self._Token\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected value", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("value", self.FileName, self.CurrentLineNumber)\r
\r
Value = self._Token\r
Macro = '$(' + Macro + ')'\r
PcdPair = self._GetNextPcdSettings()\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
Value = self._GetExpression()\r
Value = self._EvaluateConditional(Value, self.CurrentLineNumber, 'eval', True)\r
theFd.RegionList.append(RegionObj)\r
\r
if not self._IsToken(TAB_VALUE_SPLIT):\r
- raise Warning("expected '|'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("'|'", self.FileName, self.CurrentLineNumber)\r
\r
Size = self._CalcRegionExpr()\r
if Size is None:\r
- raise Warning("expected Region Size", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Region Size", self.FileName, self.CurrentLineNumber)\r
RegionObj.Size = Size\r
\r
if not self._GetNextWord():\r
#\r
def _GetRegionFvType(self, RegionObj):\r
if not self._IsKeyword(BINARY_FILE_TYPE_FV):\r
- raise Warning("expected Keyword BINARY_FILE_TYPE_FV", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("'FV'", self.FileName, self.CurrentLineNumber)\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected FV name", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("FV name", self.FileName, self.CurrentLineNumber)\r
\r
RegionObj.RegionType = BINARY_FILE_TYPE_FV\r
RegionObj.RegionDataList.append((self._Token).upper())\r
while self._IsKeyword(BINARY_FILE_TYPE_FV):\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected FV name", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("FV name", self.FileName, self.CurrentLineNumber)\r
\r
RegionObj.RegionDataList.append((self._Token).upper())\r
\r
#\r
def _GetRegionCapType(self, RegionObj):\r
if not self._IsKeyword("CAPSULE"):\r
- raise Warning("expected Keyword 'CAPSULE'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("'CAPSULE'", self.FileName, self.CurrentLineNumber)\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected CAPSULE name", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("CAPSULE name", self.FileName, self.CurrentLineNumber)\r
\r
RegionObj.RegionType = "CAPSULE"\r
RegionObj.RegionDataList.append(self._Token)\r
while self._IsKeyword("CAPSULE"):\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected CAPSULE name", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("CAPSULE name", self.FileName, self.CurrentLineNumber)\r
\r
RegionObj.RegionDataList.append(self._Token)\r
\r
#\r
def _GetRegionFileType(self, RegionObj):\r
if not self._IsKeyword("FILE"):\r
- raise Warning("expected Keyword 'FILE'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("'FILE'", self.FileName, self.CurrentLineNumber)\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected File name", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("File name", self.FileName, self.CurrentLineNumber)\r
\r
RegionObj.RegionType = "FILE"\r
RegionObj.RegionDataList.append(self._Token)\r
while self._IsKeyword("FILE"):\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected FILE name", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("FILE name", self.FileName, self.CurrentLineNumber)\r
\r
RegionObj.RegionDataList.append(self._Token)\r
\r
#\r
def _GetRegionDataType(self, RegionObj):\r
if not self._IsKeyword("DATA"):\r
- raise Warning("expected Region Data type", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Region Data type", self.FileName, self.CurrentLineNumber)\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._IsToken("{"):\r
- raise Warning("expected '{'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedCurlyOpen(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextHexNumber():\r
- raise Warning("expected Hex byte", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Hex byte", self.FileName, self.CurrentLineNumber)\r
\r
if len(self._Token) > 18:\r
raise Warning("Hex string can't be converted to a valid UINT64 value", self.FileName, self.CurrentLineNumber)\r
DataString += self._Token\r
DataString += TAB_COMMA_SPLIT\r
\r
- if not self._IsToken("}"):\r
- raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
+ if not self._IsToken(T_CHAR_BRACE_R):\r
+ raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
\r
DataString = DataString.rstrip(TAB_COMMA_SPLIT)\r
RegionObj.RegionType = "DATA"\r
while self._IsKeyword("DATA"):\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._IsToken("{"):\r
- raise Warning("expected '{'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedCurlyOpen(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextHexNumber():\r
- raise Warning("expected Hex byte", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Hex byte", self.FileName, self.CurrentLineNumber)\r
\r
if len(self._Token) > 18:\r
raise Warning("Hex string can't be converted to a valid UINT64 value", self.FileName, self.CurrentLineNumber)\r
DataString += self._Token\r
DataString += TAB_COMMA_SPLIT\r
\r
- if not self._IsToken("}"):\r
- raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
+ if not self._IsToken(T_CHAR_BRACE_R):\r
+ raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
\r
DataString = DataString.rstrip(TAB_COMMA_SPLIT)\r
RegionObj.RegionDataList.append(DataString)\r
self.CurrentFvName = FvName.upper()\r
\r
if not self._IsToken(TAB_SECTION_END):\r
- raise Warning("expected ']'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedBracketClose(self.FileName, self.CurrentLineNumber)\r
\r
FvObj = FV(Name=self.CurrentFvName)\r
self.Profile.FvDict[self.CurrentFvName] = FvObj\r
if FvObj.FvNameString == 'TRUE' and not FvObj.FvNameGuid:\r
raise Warning("FvNameString found but FvNameGuid was not found", self.FileName, self.CurrentLineNumber)\r
\r
- self._GetAprioriSection(FvObj, FvObj.DefineVarDict.copy())\r
- self._GetAprioriSection(FvObj, FvObj.DefineVarDict.copy())\r
+ self._GetAprioriSection(FvObj)\r
+ self._GetAprioriSection(FvObj)\r
\r
while True:\r
isInf = self._GetInfStatement(FvObj)\r
- isFile = self._GetFileStatement(FvObj, MacroDict = FvObj.DefineVarDict.copy())\r
+ isFile = self._GetFileStatement(FvObj)\r
if not isInf and not isFile:\r
break\r
\r
return False\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected alignment value", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("alignment value", self.FileName, self.CurrentLineNumber)\r
\r
if self._Token.upper() not in {"1", "2", "4", "8", "16", "32", "64", "128", "256", "512", \\r
"1K", "2K", "4K", "8K", "16K", "32K", "64K", "128K", "256K", "512K", \\r
return False\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected FV base address value", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("FV base address value", self.FileName, self.CurrentLineNumber)\r
\r
if not BaseAddrValuePattern.match(self._Token.upper()):\r
raise Warning("Unknown FV base address value '%s'" % self._Token, self.FileName, self.CurrentLineNumber)\r
return False\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected FvForceRebase value", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("FvForceRebase value", self.FileName, self.CurrentLineNumber)\r
\r
if self._Token.upper() not in {"TRUE", "FALSE", "0", "0X0", "0X00", "1", "0X1", "0X01"}:\r
raise Warning("Unknown FvForceRebase value '%s'" % self._Token, self.FileName, self.CurrentLineNumber)\r
return False\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken() or self._Token.upper() not in {"TRUE", "FALSE", "1", "0"}:\r
- raise Warning("expected TRUE/FALSE (1/0)", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("TRUE/FALSE (1/0)", self.FileName, self.CurrentLineNumber)\r
\r
FvObj.FvAttributeDict[name] = self._Token\r
\r
return False\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextGuid():\r
- raise Warning("expected FV GUID value", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("GUID value", self.FileName, self.CurrentLineNumber)\r
\r
FvObj.FvNameGuid = self._Token\r
\r
return False\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
- if not self._GetNextToken() or self._Token not in {'TRUE', 'FALSE'}:\r
- raise Warning("expected TRUE or FALSE for FvNameString", self.FileName, self.CurrentLineNumber)\r
+ if not self._GetNextToken() or self._Token.upper() not in {'TRUE', 'FALSE'}:\r
+ raise Warning.Expected("TRUE or FALSE for FvNameString", self.FileName, self.CurrentLineNumber)\r
\r
FvObj.FvNameString = self._Token\r
\r
return False\r
\r
if not self._IsKeyword ("TYPE"):\r
- raise Warning("expected 'TYPE'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("'TYPE'", self.FileName, self.CurrentLineNumber)\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextHexNumber() and not self._GetNextDecimalNumber():\r
- raise Warning("expected Hex FV extension entry type value At Line ", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Hex FV extension entry type value At Line ", self.FileName, self.CurrentLineNumber)\r
\r
FvObj.FvExtEntryTypeValue.append(self._Token)\r
\r
if not self._IsToken("{"):\r
- raise Warning("expected '{'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedCurlyOpen(self.FileName, self.CurrentLineNumber)\r
\r
- if not self._IsKeyword ("FILE") and not self._IsKeyword ("DATA"):\r
- raise Warning("expected 'FILE' or 'DATA'", self.FileName, self.CurrentLineNumber)\r
+ if not self._IsKeyword("FILE") and not self._IsKeyword("DATA"):\r
+ raise Warning.Expected("'FILE' or 'DATA'", self.FileName, self.CurrentLineNumber)\r
\r
FvObj.FvExtEntryType.append(self._Token)\r
\r
if self._Token == 'DATA':\r
-\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._IsToken("{"):\r
- raise Warning("expected '{'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedCurlyOpen(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextHexNumber():\r
- raise Warning("expected Hex byte", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Hex byte", self.FileName, self.CurrentLineNumber)\r
\r
if len(self._Token) > 4:\r
raise Warning("Hex byte(must be 2 digits) too long", self.FileName, self.CurrentLineNumber)\r
DataString += self._Token\r
DataString += TAB_COMMA_SPLIT\r
\r
- if not self._IsToken("}"):\r
- raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
+ if not self._IsToken(T_CHAR_BRACE_R):\r
+ raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
\r
- if not self._IsToken("}"):\r
- raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
+ if not self._IsToken(T_CHAR_BRACE_R):\r
+ raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
\r
DataString = DataString.rstrip(TAB_COMMA_SPLIT)\r
FvObj.FvExtEntryData.append(DataString)\r
\r
if self._Token == 'FILE':\r
-\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected FV Extension Entry file path At Line ", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("FV Extension Entry file path At Line ", self.FileName, self.CurrentLineNumber)\r
\r
FvObj.FvExtEntryData.append(self._Token)\r
\r
- if not self._IsToken("}"):\r
- raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
+ if not self._IsToken(T_CHAR_BRACE_R):\r
+ raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
\r
return True\r
\r
#\r
# @param self The object pointer\r
# @param FvObj for whom apriori is got\r
- # @param MacroDict dictionary used to replace macro\r
# @retval True Successfully find apriori statement\r
# @retval False Not able to find apriori statement\r
#\r
- def _GetAprioriSection(self, FvObj, MacroDict = {}):\r
+ def _GetAprioriSection(self, FvObj):\r
if not self._IsKeyword("APRIORI"):\r
return False\r
\r
if not self._IsKeyword("PEI") and not self._IsKeyword("DXE"):\r
- raise Warning("expected Apriori file type", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Apriori file type", self.FileName, self.CurrentLineNumber)\r
AprType = self._Token\r
\r
if not self._IsToken("{"):\r
- raise Warning("expected '{'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedCurlyOpen(self.FileName, self.CurrentLineNumber)\r
\r
AprSectionObj = AprioriSection()\r
AprSectionObj.AprioriType = AprType\r
\r
self._GetDefineStatements(AprSectionObj)\r
- MacroDict.update(AprSectionObj.DefineVarDict)\r
\r
while True:\r
IsInf = self._GetInfStatement(AprSectionObj)\r
if not IsInf and not IsFile:\r
break\r
\r
- if not self._IsToken("}"):\r
- raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
+ if not self._IsToken(T_CHAR_BRACE_R):\r
+ raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
\r
FvObj.AprioriSectionList.append(AprSectionObj)\r
return True\r
self._GetInfOptions(ffsInf)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected INF file path", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("INF file path", self.FileName, self.CurrentLineNumber)\r
ffsInf.InfFileName = self._Token\r
if not ffsInf.InfFileName.endswith('.inf'):\r
- raise Warning("expected .inf file path", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected(".inf file path", self.FileName, self.CurrentLineNumber)\r
\r
ffsInf.CurrentLineNum = self.CurrentLineNumber\r
ffsInf.CurrentLineContent = self._CurrentLine()\r
if ErrorCode != 0:\r
EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
\r
- if not ffsInf.InfFileName in self.Profile.InfList:\r
- self.Profile.InfList.append(ffsInf.InfFileName)\r
+ NewFileName = ffsInf.InfFileName\r
+ if ffsInf.OverrideGuid:\r
+ NewFileName = ProcessDuplicatedInf(PathClass(ffsInf.InfFileName,GenFdsGlobalVariable.WorkSpaceDir), ffsInf.OverrideGuid, GenFdsGlobalVariable.WorkSpaceDir).Path\r
+\r
+ if not NewFileName in self.Profile.InfList:\r
+ self.Profile.InfList.append(NewFileName)\r
FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
self.Profile.InfFileLineList.append(FileLineTuple)\r
if ffsInf.UseArch:\r
def _GetInfOptions(self, FfsInfObj):\r
if self._IsKeyword("FILE_GUID"):\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
if not self._GetNextGuid():\r
- raise Warning("expected GUID value", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("GUID value", self.FileName, self.CurrentLineNumber)\r
FfsInfObj.OverrideGuid = self._Token\r
\r
if self._IsKeyword("RuleOverride"):\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
if not self._GetNextToken():\r
- raise Warning("expected Rule name", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Rule name", self.FileName, self.CurrentLineNumber)\r
FfsInfObj.Rule = self._Token\r
\r
if self._IsKeyword("VERSION"):\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
if not self._GetNextToken():\r
- raise Warning("expected Version", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Version", self.FileName, self.CurrentLineNumber)\r
\r
if self._GetStringData():\r
FfsInfObj.Version = self._Token\r
\r
if self._IsKeyword(BINARY_FILE_TYPE_UI):\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
if not self._GetNextToken():\r
- raise Warning("expected UI name", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("UI name", self.FileName, self.CurrentLineNumber)\r
\r
if self._GetStringData():\r
FfsInfObj.Ui = self._Token\r
\r
if self._IsKeyword("USE"):\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
if not self._GetNextToken():\r
- raise Warning("expected ARCH name", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("ARCH name", self.FileName, self.CurrentLineNumber)\r
FfsInfObj.UseArch = self._Token\r
\r
\r
\r
while self._GetNextToken():\r
if not p.match(self._Token):\r
- raise Warning("expected KeyString \"Target_Tag_Arch\"", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("KeyString \"Target_Tag_Arch\"", self.FileName, self.CurrentLineNumber)\r
FfsInfObj.KeyStringList.append(self._Token)\r
\r
if not self._IsToken(TAB_COMMA_SPLIT):\r
#\r
# @param self The object pointer\r
# @param Obj for whom FILE statement is got\r
- # @param MacroDict dictionary used to replace macro\r
# @retval True Successfully find FILE statement\r
# @retval False Not able to find FILE statement\r
#\r
- def _GetFileStatement(self, Obj, ForCapsule = False, MacroDict = {}):\r
+ def _GetFileStatement(self, Obj, ForCapsule = False):\r
if not self._IsKeyword("FILE"):\r
return False\r
\r
if not self._GetNextWord():\r
- raise Warning("expected FFS type", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("FFS type", self.FileName, self.CurrentLineNumber)\r
\r
if ForCapsule and self._Token == 'DATA':\r
self._UndoToken()\r
FfsFileObj.FvFileType = self._Token\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextGuid():\r
if not self._GetNextWord():\r
- raise Warning("expected File GUID", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("File GUID", self.FileName, self.CurrentLineNumber)\r
if self._Token == 'PCD':\r
if not self._IsToken("("):\r
- raise Warning("expected '('", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("'('", self.FileName, self.CurrentLineNumber)\r
PcdPair = self._GetNextPcdSettings()\r
if not self._IsToken(")"):\r
- raise Warning("expected ')'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("')'", self.FileName, self.CurrentLineNumber)\r
self._Token = 'PCD('+PcdPair[1]+TAB_SPLIT+PcdPair[0]+')'\r
\r
FfsFileObj.NameGuid = self._Token\r
\r
- self._GetFilePart(FfsFileObj, MacroDict.copy())\r
+ self._GetFilePart(FfsFileObj)\r
\r
if ForCapsule:\r
capsuleFfs = CapsuleFfs()\r
#\r
# @param self The object pointer\r
# @param FfsFileObj for whom component is got\r
- # @param MacroDict dictionary used to replace macro\r
#\r
- def _GetFilePart(self, FfsFileObj, MacroDict = {}):\r
+ def _GetFilePart(self, FfsFileObj):\r
self._GetFileOpts(FfsFileObj)\r
\r
if not self._IsToken("{"):\r
raise Warning("File type %s could not have reloc strip flag%d" % (FfsFileObj.FvFileType, self.CurrentLineNumber), self.FileName, self.CurrentLineNumber)\r
\r
if not self._IsToken("{"):\r
- raise Warning("expected '{'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedCurlyOpen(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected File name or section data", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("File name or section data", self.FileName, self.CurrentLineNumber)\r
\r
if self._Token == BINARY_FILE_TYPE_FV:\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
if not self._GetNextToken():\r
- raise Warning("expected FV name", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("FV name", self.FileName, self.CurrentLineNumber)\r
FfsFileObj.FvName = self._Token\r
\r
elif self._Token == "FD":\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
if not self._GetNextToken():\r
- raise Warning("expected FD name", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("FD name", self.FileName, self.CurrentLineNumber)\r
FfsFileObj.FdName = self._Token\r
\r
elif self._Token in {TAB_DEFINE, "APRIORI", "SECTION"}:\r
self._UndoToken()\r
- self._GetSectionData(FfsFileObj, MacroDict)\r
+ self._GetSectionData(FfsFileObj)\r
\r
elif hasattr(FfsFileObj, 'FvFileType') and FfsFileObj.FvFileType == 'RAW':\r
self._UndoToken()\r
- self._GetRAWData(FfsFileObj, MacroDict)\r
+ self._GetRAWData(FfsFileObj)\r
\r
else:\r
FfsFileObj.CurrentLineNum = self.CurrentLineNumber\r
FfsFileObj.FileName = self._Token.replace('$(SPACE)', ' ')\r
self._VerifyFile(FfsFileObj.FileName)\r
\r
- if not self._IsToken("}"):\r
- raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
+ if not self._IsToken(T_CHAR_BRACE_R):\r
+ raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
\r
## _GetRAWData() method\r
#\r
#\r
# @param self The object pointer\r
# @param FfsFileObj for whom section is got\r
- # @param MacroDict dictionary used to replace macro\r
#\r
- def _GetRAWData(self, FfsFileObj, MacroDict = {}):\r
+ def _GetRAWData(self, FfsFileObj):\r
FfsFileObj.FileName = []\r
FfsFileObj.SubAlignment = []\r
while True:\r
if not self._Token == "Auto":\r
AlignValue = self._Token\r
if not self._GetNextToken():\r
- raise Warning("expected Filename value", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Filename value", self.FileName, self.CurrentLineNumber)\r
\r
FileName = self._Token.replace('$(SPACE)', ' ')\r
- if FileName == '}':\r
+ if FileName == T_CHAR_BRACE_R:\r
self._UndoToken()\r
- raise Warning("expected Filename value", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Filename value", self.FileName, self.CurrentLineNumber)\r
\r
self._VerifyFile(FileName)\r
File = PathClass(NormPath(FileName), GenFdsGlobalVariable.WorkSpaceDir)\r
FfsFileObj.FileName.append(File.Path)\r
FfsFileObj.SubAlignment.append(AlignValue)\r
\r
- if self._IsToken("}"):\r
+ if self._IsToken(T_CHAR_BRACE_R):\r
self._UndoToken()\r
break\r
\r
if self._IsToken(TAB_COMMA_SPLIT):\r
while self._GetNextToken():\r
if not TokenFindPattern.match(self._Token):\r
- raise Warning("expected KeyString \"Target_Tag_Arch\"", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("KeyString \"Target_Tag_Arch\"", self.FileName, self.CurrentLineNumber)\r
FfsFileObj.KeyStringList.append(self._Token)\r
\r
if not self._IsToken(TAB_COMMA_SPLIT):\r
def _GetAlignment(self):\r
if self._IsKeyword("Align", True):\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected alignment value", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("alignment value", self.FileName, self.CurrentLineNumber)\r
return True\r
\r
return False\r
\r
- ## _GetFilePart() method\r
+ ## _GetSectionData() method\r
#\r
# Get section data for FILE statement\r
#\r
# @param self The object pointer\r
# @param FfsFileObj for whom section is got\r
- # @param MacroDict dictionary used to replace macro\r
#\r
- def _GetSectionData(self, FfsFileObj, MacroDict = {}):\r
- Dict = {}\r
- Dict.update(MacroDict)\r
-\r
+ def _GetSectionData(self, FfsFileObj):\r
self._GetDefineStatements(FfsFileObj)\r
\r
- Dict.update(FfsFileObj.DefineVarDict)\r
- self._GetAprioriSection(FfsFileObj, Dict.copy())\r
- self._GetAprioriSection(FfsFileObj, Dict.copy())\r
-\r
while True:\r
- IsLeafSection = self._GetLeafSection(FfsFileObj, Dict)\r
+ IsLeafSection = self._GetLeafSection(FfsFileObj)\r
IsEncapSection = self._GetEncapsulationSec(FfsFileObj)\r
if not IsLeafSection and not IsEncapSection:\r
break\r
#\r
# @param self The object pointer\r
# @param Obj for whom leaf section is got\r
- # @param MacroDict dictionary used to replace macro\r
# @retval True Successfully find section statement\r
# @retval False Not able to find section statement\r
#\r
- def _GetLeafSection(self, Obj, MacroDict = {}):\r
+ def _GetLeafSection(self, Obj):\r
OldPos = self.GetFileBufferPos()\r
\r
if not self._IsKeyword("SECTION"):\r
if len(Obj.SectionList) == 0:\r
- raise Warning("expected SECTION", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("SECTION", self.FileName, self.CurrentLineNumber)\r
else:\r
return False\r
\r
BuildNum = None\r
if self._IsKeyword("BUILD_NUM"):\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected Build number value", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Build number value", self.FileName, self.CurrentLineNumber)\r
\r
BuildNum = self._Token\r
\r
if AlignValue == 'Auto':\r
raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
if not self._GetNextToken():\r
- raise Warning("expected version", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("version", self.FileName, self.CurrentLineNumber)\r
VerSectionObj = VerSection()\r
VerSectionObj.Alignment = AlignValue\r
VerSectionObj.BuildNum = BuildNum\r
if AlignValue == 'Auto':\r
raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
if not self._GetNextToken():\r
- raise Warning("expected UI", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("UI", self.FileName, self.CurrentLineNumber)\r
UiSectionObj = UiSection()\r
UiSectionObj.Alignment = AlignValue\r
if self._GetStringData():\r
if AlignValue == 'Auto':\r
raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
if not self._GetNextToken():\r
- raise Warning("expected FV name or FV file path", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("FV name or FV file path", self.FileName, self.CurrentLineNumber)\r
\r
FvName = self._Token\r
FvObj = None\r
FvObj = FV()\r
FvObj.UiFvName = FvName.upper()\r
self._GetDefineStatements(FvObj)\r
- MacroDict.update(FvObj.DefineVarDict)\r
+\r
self._GetBlockStatement(FvObj)\r
self._GetSetStatements(FvObj)\r
self._GetFvAlignment(FvObj)\r
self._GetFvAttributes(FvObj)\r
- self._GetAprioriSection(FvObj, MacroDict.copy())\r
- self._GetAprioriSection(FvObj, MacroDict.copy())\r
\r
while True:\r
IsInf = self._GetInfStatement(FvObj)\r
- IsFile = self._GetFileStatement(FvObj, MacroDict.copy())\r
+ IsFile = self._GetFileStatement(FvObj)\r
if not IsInf and not IsFile:\r
break\r
\r
- if not self._IsToken("}"):\r
- raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
+ if not self._IsToken(T_CHAR_BRACE_R):\r
+ raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
\r
FvImageSectionObj = FvImageSection()\r
FvImageSectionObj.Alignment = AlignValue\r
DepexSectionObj.DepexType = self._Token\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
if not self._IsToken("{"):\r
- raise Warning("expected '{'", self.FileName, self.CurrentLineNumber)\r
- if not self._SkipToToken("}"):\r
- raise Warning("expected Depex expression ending '}'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedCurlyOpen(self.FileName, self.CurrentLineNumber)\r
+ if not self._SkipToToken(T_CHAR_BRACE_R):\r
+ raise Warning.Expected("Depex expression ending '}'", self.FileName, self.CurrentLineNumber)\r
\r
- DepexSectionObj.Expression = self._SkippedChars.rstrip('}')\r
+ DepexSectionObj.Expression = self._SkippedChars.rstrip(T_CHAR_BRACE_R)\r
Obj.SectionList.append(DepexSectionObj)\r
\r
else:\r
if not self._GetNextWord():\r
- raise Warning("expected section type", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("section type", self.FileName, self.CurrentLineNumber)\r
\r
# Encapsulation section appear, UndoToken and return\r
if self._Token == "COMPRESS" or self._Token == "GUIDED":\r
\r
if self._IsToken(TAB_EQUAL_SPLIT):\r
if not self._GetNextToken():\r
- raise Warning("expected section file path", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("section file path", self.FileName, self.CurrentLineNumber)\r
DataSectionObj.SectFileName = self._Token\r
self._VerifyFile(DataSectionObj.SectFileName)\r
else:\r
type = self._Token\r
\r
if not self._IsToken("{"):\r
- raise Warning("expected '{'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedCurlyOpen(self.FileName, self.CurrentLineNumber)\r
\r
CompressSectionObj = CompressSection()\r
CompressSectionObj.Alignment = AlignValue\r
break\r
\r
\r
- if not self._IsToken("}"):\r
- raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
+ if not self._IsToken(T_CHAR_BRACE_R):\r
+ raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
Obj.SectionList.append(CompressSectionObj)\r
-\r
-# else:\r
-# raise Warning("Compress type not known")\r
-\r
return True\r
\r
elif self._IsKeyword("GUIDED"):\r
\r
AttribDict = self._GetGuidAttrib()\r
if not self._IsToken("{"):\r
- raise Warning("expected '{'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedCurlyOpen(self.FileName, self.CurrentLineNumber)\r
GuidSectionObj = GuidSection()\r
GuidSectionObj.Alignment = AlignValue\r
GuidSectionObj.NameGuid = GuidValue\r
if not IsLeafSection and not IsEncapSection:\r
break\r
\r
- if not self._IsToken("}"):\r
- raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
+ if not self._IsToken(T_CHAR_BRACE_R):\r
+ raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
Obj.SectionList.append(GuidSectionObj)\r
\r
return True\r
AttribKey = self._Token\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected TRUE(1)/FALSE(0)/Number", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("TRUE(1)/FALSE(0)/Number", self.FileName, self.CurrentLineNumber)\r
elif AttribKey == "EXTRA_HEADER_SIZE":\r
Base = 10\r
if self._Token[0:2].upper() == "0X":\r
AttribDict[AttribKey] = int(self._Token, Base)\r
continue\r
except ValueError:\r
- raise Warning("expected Number", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Number", self.FileName, self.CurrentLineNumber)\r
elif self._Token.upper() not in {"TRUE", "FALSE", "1", "0"}:\r
- raise Warning("expected TRUE/FALSE (1/0)", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("TRUE/FALSE (1/0)", self.FileName, self.CurrentLineNumber)\r
AttribDict[AttribKey] = self._Token\r
\r
return AttribDict\r
OldPos = self.GetFileBufferPos()\r
if not self._IsKeyword("SECTION"):\r
if len(FfsFileObj.SectionList) == 0:\r
- raise Warning("expected SECTION", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("SECTION", self.FileName, self.CurrentLineNumber)\r
else:\r
return False\r
\r
FmpData.UiName = FmpUiName\r
\r
if not self._IsToken(TAB_SECTION_END):\r
- raise Warning("expected ']'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedBracketClose(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
raise Warning("The FMP payload section is empty!", self.FileName, self.CurrentLineNumber)\r
Name = self._Token\r
FmpKeyList.remove(Name)\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
if Name == 'IMAGE_TYPE_ID':\r
if not self._GetNextGuid():\r
- raise Warning("expected GUID value for IMAGE_TYPE_ID.", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("GUID value for IMAGE_TYPE_ID.", self.FileName, self.CurrentLineNumber)\r
FmpData.ImageTypeId = self._Token\r
elif Name == 'CERTIFICATE_GUID':\r
if not self._GetNextGuid():\r
- raise Warning("expected GUID value for CERTIFICATE_GUID.", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("GUID value for CERTIFICATE_GUID.", self.FileName, self.CurrentLineNumber)\r
FmpData.Certificate_Guid = self._Token\r
if UUID(FmpData.Certificate_Guid) != EFI_CERT_TYPE_RSA2048_SHA256_GUID and UUID(FmpData.Certificate_Guid) != EFI_CERT_TYPE_PKCS7_GUID:\r
raise Warning("Only support EFI_CERT_TYPE_RSA2048_SHA256_GUID or EFI_CERT_TYPE_PKCS7_GUID for CERTIFICATE_GUID.", self.FileName, self.CurrentLineNumber)\r
else:\r
if not self._GetNextToken():\r
- raise Warning("expected value of %s" % Name, self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("value of %s" % Name, self.FileName, self.CurrentLineNumber)\r
Value = self._Token\r
if Name == 'IMAGE_HEADER_INIT_VERSION':\r
if FdfParser._Verify(Name, Value, 'UINT8'):\r
\r
# Only the IMAGE_TYPE_ID is required item\r
if FmpKeyList and 'IMAGE_TYPE_ID' in FmpKeyList:\r
- raise Warning("Missing keywords IMAGE_TYPE_ID in FMP payload section.", self.FileName, self.CurrentLineNumber)\r
+ raise Warning("'IMAGE_TYPE_ID' in FMP payload section.", self.FileName, self.CurrentLineNumber)\r
# get the Image file and Vendor code file\r
self._GetFMPCapsuleData(FmpData)\r
if not FmpData.ImageFile:\r
raise Warning("Missing image file in FMP payload section.", self.FileName, self.CurrentLineNumber)\r
# check whether more than one Vendor code file\r
if len(FmpData.VendorCodeFile) > 1:\r
- raise Warning("At most one Image file and one Vendor code file are allowed in FMP payload section.", self.FileName, self.CurrentLineNumber)\r
+ raise Warning("Vendor code file max of 1 per FMP payload section.", self.FileName, self.CurrentLineNumber)\r
self.Profile.FmpPayloadDict[FmpUiName] = FmpData\r
return True\r
\r
FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
#print 'Parsing String: %s in File %s, At line: %d, Offset Within Line: %d' \\r
# % (self.Profile.FileLinesList[self.CurrentLineNumber - 1][self.CurrentOffsetWithinLine:], FileLineTuple[0], FileLineTuple[1], self.CurrentOffsetWithinLine)\r
- raise Warning("expected [Capsule.]", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("[Capsule.]", self.FileName, self.CurrentLineNumber)\r
\r
CapsuleObj = Capsule()\r
\r
CapsuleName = self._GetUiName()\r
if not CapsuleName:\r
- raise Warning("expected capsule name", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("capsule name", self.FileName, self.CurrentLineNumber)\r
\r
CapsuleObj.UiCapsuleName = CapsuleName.upper()\r
\r
if not self._IsToken(TAB_SECTION_END):\r
- raise Warning("expected ']'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedBracketClose(self.FileName, self.CurrentLineNumber)\r
\r
if self._IsKeyword("CREATE_FILE"):\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected file name", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("file name", self.FileName, self.CurrentLineNumber)\r
\r
CapsuleObj.CreateFile = self._Token\r
\r
while self._Token in {"CAPSULE_GUID", "CAPSULE_HEADER_SIZE", "CAPSULE_FLAGS", "OEM_CAPSULE_FLAGS", "CAPSULE_HEADER_INIT_VERSION"}:\r
Name = self._Token.strip()\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
if not self._GetNextToken():\r
- raise Warning("expected value", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("value", self.FileName, self.CurrentLineNumber)\r
if Name == 'CAPSULE_FLAGS':\r
if not self._Token in {"PersistAcrossReset", "PopulateSystemTable", "InitiateReset"}:\r
- raise Warning("expected PersistAcrossReset, PopulateSystemTable, or InitiateReset", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("PersistAcrossReset, PopulateSystemTable, or InitiateReset", self.FileName, self.CurrentLineNumber)\r
Value = self._Token.strip()\r
while self._IsToken(TAB_COMMA_SPLIT):\r
Value += TAB_COMMA_SPLIT\r
if not self._GetNextToken():\r
- raise Warning("expected value", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("value", self.FileName, self.CurrentLineNumber)\r
if not self._Token in {"PersistAcrossReset", "PopulateSystemTable", "InitiateReset"}:\r
- raise Warning("expected PersistAcrossReset, PopulateSystemTable, or InitiateReset", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("PersistAcrossReset, PopulateSystemTable, or InitiateReset", self.FileName, self.CurrentLineNumber)\r
Value += self._Token.strip()\r
elif Name == 'OEM_CAPSULE_FLAGS':\r
Value = self._Token.strip()\r
if not Value.upper().startswith('0X'):\r
- raise Warning("expected hex value between 0x0000 and 0xFFFF", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("hex value starting with 0x", self.FileName, self.CurrentLineNumber)\r
try:\r
Value = int(Value, 0)\r
except ValueError:\r
- raise Warning("expected hex value between 0x0000 and 0xFFFF", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("hex string failed to convert to value", self.FileName, self.CurrentLineNumber)\r
if not 0x0000 <= Value <= 0xFFFF:\r
- raise Warning("expected hex value between 0x0000 and 0xFFFF", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("hex value between 0x0000 and 0xFFFF", self.FileName, self.CurrentLineNumber)\r
Value = self._Token.strip()\r
else:\r
Value = self._Token.strip()\r
return False\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected FV name", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("FV name", self.FileName, self.CurrentLineNumber)\r
\r
if self._Token.upper() not in self.Profile.FvDict:\r
raise Warning("FV name does not exist", self.FileName, self.CurrentLineNumber)\r
return False\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected FD name", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("FD name", self.FileName, self.CurrentLineNumber)\r
\r
if self._Token.upper() not in self.Profile.FdDict:\r
raise Warning("FD name does not exist", self.FileName, self.CurrentLineNumber)\r
return False\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected payload name after FMP_PAYLOAD =", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("payload name after FMP_PAYLOAD =", self.FileName, self.CurrentLineNumber)\r
Payload = self._Token.upper()\r
if Payload not in self.Profile.FmpPayloadDict:\r
raise Warning("This FMP Payload does not exist: %s" % self._Token, self.FileName, self.CurrentLineNumber)\r
return None\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected File name", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("File name", self.FileName, self.CurrentLineNumber)\r
\r
AnyFileName = self._Token\r
self._VerifyFile(AnyFileName)\r
return False\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected Afile name", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Afile name", self.FileName, self.CurrentLineNumber)\r
\r
AfileName = self._Token\r
AfileBaseName = os.path.basename(AfileName)\r
FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
#print 'Parsing String: %s in File %s, At line: %d, Offset Within Line: %d' \\r
# % (self.Profile.FileLinesList[self.CurrentLineNumber - 1][self.CurrentOffsetWithinLine:], FileLineTuple[0], FileLineTuple[1], self.CurrentOffsetWithinLine)\r
- raise Warning("expected [Rule.]", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("[Rule.]", self.FileName, self.CurrentLineNumber)\r
\r
if not self._SkipToToken(TAB_SPLIT):\r
- raise Warning("expected '.'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("'.'", self.FileName, self.CurrentLineNumber)\r
\r
Arch = self._SkippedChars.rstrip(TAB_SPLIT)\r
if Arch.upper() not in ARCH_SET_FULL:\r
TemplateName = ""\r
if self._IsToken(TAB_SPLIT):\r
if not self._GetNextWord():\r
- raise Warning("expected template name", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("template name", self.FileName, self.CurrentLineNumber)\r
TemplateName = self._Token\r
\r
if not self._IsToken(TAB_SECTION_END):\r
- raise Warning("expected ']'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedBracketClose(self.FileName, self.CurrentLineNumber)\r
\r
RuleObj = self._GetRuleFileStatements()\r
RuleObj.Arch = Arch.upper()\r
#\r
def _GetModuleType(self):\r
if not self._GetNextWord():\r
- raise Warning("expected Module type", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Module type", self.FileName, self.CurrentLineNumber)\r
if self._Token.upper() not in {\r
SUP_MODULE_SEC, SUP_MODULE_PEI_CORE, SUP_MODULE_PEIM,\r
SUP_MODULE_DXE_CORE, SUP_MODULE_DXE_DRIVER,\r
#\r
def _GetFileExtension(self):\r
if not self._IsToken(TAB_SPLIT):\r
- raise Warning("expected '.'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("'.'", self.FileName, self.CurrentLineNumber)\r
\r
Ext = ""\r
if self._GetNextToken():\r
raise Warning("Unknown file extension '%s'" % self._Token, self.FileName, self.CurrentLineNumber)\r
\r
else:\r
- raise Warning("expected file extension", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("file extension", self.FileName, self.CurrentLineNumber)\r
\r
## _GetRuleFileStatement() method\r
#\r
#\r
def _GetRuleFileStatements(self):\r
if not self._IsKeyword("FILE"):\r
- raise Warning("expected FILE", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("FILE", self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextWord():\r
- raise Warning("expected FFS type", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("FFS type", self.FileName, self.CurrentLineNumber)\r
\r
Type = self._Token.strip().upper()\r
if Type not in {"RAW", "FREEFORM", SUP_MODULE_SEC, SUP_MODULE_PEI_CORE, SUP_MODULE_PEIM,\r
raise Warning("Unknown FV type '%s'" % self._Token, self.FileName, self.CurrentLineNumber)\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._IsKeyword("$(NAMED_GUID)"):\r
if not self._GetNextWord():\r
- raise Warning("expected $(NAMED_GUID)", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("$(NAMED_GUID)", self.FileName, self.CurrentLineNumber)\r
if self._Token == 'PCD':\r
if not self._IsToken("("):\r
- raise Warning("expected '('", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("'('", self.FileName, self.CurrentLineNumber)\r
PcdPair = self._GetNextPcdSettings()\r
if not self._IsToken(")"):\r
- raise Warning("expected ')'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("')'", self.FileName, self.CurrentLineNumber)\r
self._Token = 'PCD('+PcdPair[1]+TAB_SPLIT+PcdPair[0]+')'\r
\r
NameGuid = self._Token\r
if self._IsToken(TAB_COMMA_SPLIT):\r
while self._GetNextToken():\r
if not TokenFindPattern.match(self._Token):\r
- raise Warning("expected KeyString \"Target_Tag_Arch\"", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("KeyString \"Target_Tag_Arch\"", self.FileName, self.CurrentLineNumber)\r
KeyStringList.append(self._Token)\r
\r
if not self._IsToken(TAB_COMMA_SPLIT):\r
if not IsEncapsulate and not IsLeaf:\r
break\r
\r
- if not self._IsToken("}"):\r
- raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
+ if not self._IsToken(T_CHAR_BRACE_R):\r
+ raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
\r
return NewRule\r
\r
else:\r
# Simple file rule expected\r
if not self._GetNextWord():\r
- raise Warning("expected leaf section type", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("leaf section type", self.FileName, self.CurrentLineNumber)\r
\r
SectionName = self._Token\r
\r
if self._IsToken(TAB_VALUE_SPLIT):\r
Ext = self._GetFileExtension()\r
elif not self._GetNextToken():\r
- raise Warning("expected File name", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("File name", self.FileName, self.CurrentLineNumber)\r
\r
NewRule = RuleSimpleFile()\r
NewRule.SectionType = SectionName\r
if not IsInf and not IsFile:\r
break\r
\r
- if not self._IsToken("}"):\r
- raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
+ if not self._IsToken(T_CHAR_BRACE_R):\r
+ raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
FvImageSectionObj.Fv = FvObj\r
FvImageSectionObj.FvName = None\r
\r
else:\r
if not self._IsKeyword(BINARY_FILE_TYPE_FV):\r
- raise Warning("expected 'FV'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("'FV'", self.FileName, self.CurrentLineNumber)\r
FvImageSectionObj.FvFileType = self._Token\r
\r
if self._GetAlignment():\r
FvImageSectionObj.FvFileExtension = self._GetFileExtension()\r
elif self._GetNextToken():\r
if self._Token not in {\r
- "}", "COMPAT16", BINARY_FILE_TYPE_PE32,\r
+ T_CHAR_BRACE_R, "COMPAT16", BINARY_FILE_TYPE_PE32,\r
BINARY_FILE_TYPE_PIC, BINARY_FILE_TYPE_TE,\r
"FV_IMAGE", "RAW", BINARY_FILE_TYPE_DXE_DEPEX,\r
BINARY_FILE_TYPE_UI, "VERSION",\r
else:\r
self._UndoToken()\r
else:\r
- raise Warning("expected FV file name", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("FV file name", self.FileName, self.CurrentLineNumber)\r
\r
Obj.SectionList.append(FvImageSectionObj)\r
return True\r
EfiSectionObj.SectionType = SectionName\r
\r
if not self._GetNextToken():\r
- raise Warning("expected file type", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("file type", self.FileName, self.CurrentLineNumber)\r
\r
if self._Token == "STRING":\r
if not self._RuleSectionCouldHaveString(EfiSectionObj.SectionType):\r
raise Warning("%s section could NOT have string data%d" % (EfiSectionObj.SectionType, self.CurrentLineNumber), self.FileName, self.CurrentLineNumber)\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected Quoted String", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Quoted String", self.FileName, self.CurrentLineNumber)\r
\r
if self._GetStringData():\r
EfiSectionObj.StringData = self._Token\r
raise Warning("%s section could NOT have BUILD_NUM%d" % (EfiSectionObj.SectionType, self.CurrentLineNumber), self.FileName, self.CurrentLineNumber)\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
if not self._GetNextToken():\r
- raise Warning("expected Build number", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Build number", self.FileName, self.CurrentLineNumber)\r
EfiSectionObj.BuildNum = self._Token\r
\r
else:\r
raise Warning("%s section could NOT have BUILD_NUM%d" % (EfiSectionObj.SectionType, self.CurrentLineNumber), self.FileName, self.CurrentLineNumber)\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
if not self._GetNextToken():\r
- raise Warning("expected Build number", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Build number", self.FileName, self.CurrentLineNumber)\r
EfiSectionObj.BuildNum = self._Token\r
\r
if self._GetAlignment():\r
EfiSectionObj.FileExtension = self._GetFileExtension()\r
elif self._GetNextToken():\r
if self._Token not in {\r
- "}", "COMPAT16", BINARY_FILE_TYPE_PE32,\r
+ T_CHAR_BRACE_R, "COMPAT16", BINARY_FILE_TYPE_PE32,\r
BINARY_FILE_TYPE_PIC, BINARY_FILE_TYPE_TE,\r
"FV_IMAGE", "RAW", BINARY_FILE_TYPE_DXE_DEPEX,\r
BINARY_FILE_TYPE_UI, "VERSION",\r
\r
if self._Token == 'PCD':\r
if not self._IsToken("("):\r
- raise Warning("expected '('", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("'('", self.FileName, self.CurrentLineNumber)\r
PcdPair = self._GetNextPcdSettings()\r
if not self._IsToken(")"):\r
- raise Warning("expected ')'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("')'", self.FileName, self.CurrentLineNumber)\r
self._Token = 'PCD('+PcdPair[1]+TAB_SPLIT+PcdPair[0]+')'\r
\r
EfiSectionObj.FileName = self._Token\r
else:\r
self._UndoToken()\r
else:\r
- raise Warning("expected section file name", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("section file name", self.FileName, self.CurrentLineNumber)\r
\r
Obj.SectionList.append(EfiSectionObj)\r
return True\r
# @param FileType The file type to check\r
#\r
def _CheckRuleSectionFileType(self, SectionType, FileType):\r
+ WarningString = "Incorrect section file type '%s'"\r
if SectionType == "COMPAT16":\r
if FileType not in {"COMPAT16", "SEC_COMPAT16"}:\r
- raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)\r
+ raise Warning(WarningString % FileType, self.FileName, self.CurrentLineNumber)\r
elif SectionType == BINARY_FILE_TYPE_PE32:\r
if FileType not in {BINARY_FILE_TYPE_PE32, "SEC_PE32"}:\r
- raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)\r
+ raise Warning(WarningString % FileType, self.FileName, self.CurrentLineNumber)\r
elif SectionType == BINARY_FILE_TYPE_PIC:\r
if FileType not in {BINARY_FILE_TYPE_PIC, BINARY_FILE_TYPE_PIC}:\r
- raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)\r
+ raise Warning(WarningString % FileType, self.FileName, self.CurrentLineNumber)\r
elif SectionType == BINARY_FILE_TYPE_TE:\r
if FileType not in {BINARY_FILE_TYPE_TE, "SEC_TE"}:\r
- raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)\r
+ raise Warning(WarningString % FileType, self.FileName, self.CurrentLineNumber)\r
elif SectionType == "RAW":\r
if FileType not in {BINARY_FILE_TYPE_BIN, "SEC_BIN", "RAW", "ASL", "ACPI"}:\r
- raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)\r
+ raise Warning(WarningString % FileType, self.FileName, self.CurrentLineNumber)\r
elif SectionType == BINARY_FILE_TYPE_DXE_DEPEX or SectionType == BINARY_FILE_TYPE_SMM_DEPEX:\r
if FileType not in {BINARY_FILE_TYPE_DXE_DEPEX, "SEC_DXE_DEPEX", BINARY_FILE_TYPE_SMM_DEPEX}:\r
- raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)\r
+ raise Warning(WarningString % FileType, self.FileName, self.CurrentLineNumber)\r
elif SectionType == BINARY_FILE_TYPE_UI:\r
if FileType not in {BINARY_FILE_TYPE_UI, "SEC_UI"}:\r
- raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)\r
+ raise Warning(WarningString % FileType, self.FileName, self.CurrentLineNumber)\r
elif SectionType == "VERSION":\r
if FileType not in {"VERSION", "SEC_VERSION"}:\r
- raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)\r
+ raise Warning(WarningString % FileType, self.FileName, self.CurrentLineNumber)\r
elif SectionType == BINARY_FILE_TYPE_PEI_DEPEX:\r
if FileType not in {BINARY_FILE_TYPE_PEI_DEPEX, "SEC_PEI_DEPEX"}:\r
- raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)\r
+ raise Warning(WarningString % FileType, self.FileName, self.CurrentLineNumber)\r
elif SectionType == BINARY_FILE_TYPE_GUID:\r
if FileType not in {BINARY_FILE_TYPE_PE32, "SEC_GUID"}:\r
- raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)\r
+ raise Warning(WarningString % FileType, self.FileName, self.CurrentLineNumber)\r
\r
## _GetRuleEncapsulationSection() method\r
#\r
Type = self._Token\r
\r
if not self._IsToken("{"):\r
- raise Warning("expected '{'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedCurlyOpen(self.FileName, self.CurrentLineNumber)\r
\r
CompressSectionObj = CompressSection()\r
\r
if not IsEncapsulate and not IsLeaf:\r
break\r
\r
- if not self._IsToken("}"):\r
- raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
+ if not self._IsToken(T_CHAR_BRACE_R):\r
+ raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
theRule.SectionList.append(CompressSectionObj)\r
\r
return True\r
AttribDict = self._GetGuidAttrib()\r
\r
if not self._IsToken("{"):\r
- raise Warning("expected '{'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedCurlyOpen(self.FileName, self.CurrentLineNumber)\r
GuidSectionObj = GuidSection()\r
GuidSectionObj.NameGuid = GuidValue\r
GuidSectionObj.SectionType = "GUIDED"\r
if not IsEncapsulate and not IsLeaf:\r
break\r
\r
- if not self._IsToken("}"):\r
- raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
+ if not self._IsToken(T_CHAR_BRACE_R):\r
+ raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
theRule.SectionList.append(GuidSectionObj)\r
\r
return True\r
FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
#print 'Parsing String: %s in File %s, At line: %d, Offset Within Line: %d' \\r
# % (self.Profile.FileLinesList[self.CurrentLineNumber - 1][self.CurrentOffsetWithinLine:], FileLineTuple[0], FileLineTuple[1], self.CurrentOffsetWithinLine)\r
- raise Warning("expected [VTF.]", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("[VTF.]", self.FileName, self.CurrentLineNumber)\r
\r
if not self._SkipToToken(TAB_SPLIT):\r
- raise Warning("expected '.'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("'.'", self.FileName, self.CurrentLineNumber)\r
\r
Arch = self._SkippedChars.rstrip(TAB_SPLIT).upper()\r
if Arch not in HW_ARCH_SET:\r
raise Warning("Unknown Arch '%s'" % Arch, self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextWord():\r
- raise Warning("expected VTF name", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("VTF name", self.FileName, self.CurrentLineNumber)\r
Name = self._Token.upper()\r
\r
VtfObj = Vtf()\r
\r
if self._IsToken(TAB_COMMA_SPLIT):\r
if not self._GetNextWord():\r
- raise Warning("expected Arch list", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Arch list", self.FileName, self.CurrentLineNumber)\r
if self._Token.upper() not in HW_ARCH_SET:\r
raise Warning("Unknown Arch '%s'" % self._Token, self.FileName, self.CurrentLineNumber)\r
VtfObj.ArchList = self._Token.upper()\r
\r
if not self._IsToken(TAB_SECTION_END):\r
- raise Warning("expected ']'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedBracketClose(self.FileName, self.CurrentLineNumber)\r
\r
if self._IsKeyword("IA32_RST_BIN"):\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected Reset file", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Reset file", self.FileName, self.CurrentLineNumber)\r
\r
VtfObj.ResetBin = self._Token\r
if VtfObj.ResetBin.replace(TAB_WORKSPACE, '').find('$') == -1:\r
return False\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextWord():\r
- raise Warning("expected Component Name", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Component Name", self.FileName, self.CurrentLineNumber)\r
\r
CompStatementObj = ComponentStatement()\r
CompStatementObj.CompName = self._Token\r
\r
if not self._IsKeyword("COMP_LOC"):\r
- raise Warning("expected COMP_LOC", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("COMP_LOC", self.FileName, self.CurrentLineNumber)\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
CompStatementObj.CompLoc = ""\r
if self._GetNextWord():\r
CompStatementObj.CompLoc = self._Token\r
if self._IsToken(TAB_VALUE_SPLIT):\r
if not self._GetNextWord():\r
- raise Warning("Expected Region Name", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Region Name", self.FileName, self.CurrentLineNumber)\r
\r
if self._Token not in {"F", "N", "S"}: #, "H", "L", "PH", "PL"): not support\r
raise Warning("Unknown location type '%s'" % self._Token, self.FileName, self.CurrentLineNumber)\r
self.CurrentOffsetWithinLine = 0\r
\r
if not self._IsKeyword("COMP_TYPE"):\r
- raise Warning("expected COMP_TYPE", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("COMP_TYPE", self.FileName, self.CurrentLineNumber)\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected Component type", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Component type", self.FileName, self.CurrentLineNumber)\r
if self._Token not in {"FIT", "PAL_B", "PAL_A", "OEM"}:\r
if not self._Token.startswith("0x") or len(self._Token) < 3 or len(self._Token) > 4 or \\r
not self._Token[2] in hexdigits or not self._Token[-1] in hexdigits:\r
CompStatementObj.CompType = self._Token\r
\r
if not self._IsKeyword("COMP_VER"):\r
- raise Warning("expected COMP_VER", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("COMP_VER", self.FileName, self.CurrentLineNumber)\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected Component version", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Component version", self.FileName, self.CurrentLineNumber)\r
\r
Pattern = compile('-$|[0-9a-fA-F]{1,2}\.[0-9a-fA-F]{1,2}$', DOTALL)\r
if Pattern.match(self._Token) is None:\r
CompStatementObj.CompVer = self._Token\r
\r
if not self._IsKeyword("COMP_CS"):\r
- raise Warning("expected COMP_CS", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("COMP_CS", self.FileName, self.CurrentLineNumber)\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected Component CS", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Component CS", self.FileName, self.CurrentLineNumber)\r
if self._Token not in {"1", "0"}:\r
- raise Warning("Unknown Component CS '%s'" % self._Token, self.FileName, self.CurrentLineNumber)\r
+ raise Warning("Unknown Component CS '%s'" % self._Token, self.FileName, self.CurrentLineNumber)\r
CompStatementObj.CompCs = self._Token\r
\r
\r
if not self._IsKeyword("COMP_BIN"):\r
- raise Warning("expected COMP_BIN", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("COMP_BIN", self.FileName, self.CurrentLineNumber)\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected Component file", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Component file", self.FileName, self.CurrentLineNumber)\r
\r
CompStatementObj.CompBin = self._Token\r
if CompStatementObj.CompBin != '-' and CompStatementObj.CompBin.replace(TAB_WORKSPACE, '').find('$') == -1:\r
EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
\r
if not self._IsKeyword("COMP_SYM"):\r
- raise Warning("expected COMP_SYM", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("COMP_SYM", self.FileName, self.CurrentLineNumber)\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected Component symbol file", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Component symbol file", self.FileName, self.CurrentLineNumber)\r
\r
CompStatementObj.CompSym = self._Token\r
if CompStatementObj.CompSym != '-' and CompStatementObj.CompSym.replace(TAB_WORKSPACE, '').find('$') == -1:\r
EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
\r
if not self._IsKeyword("COMP_SIZE"):\r
- raise Warning("expected COMP_SIZE", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("COMP_SIZE", self.FileName, self.CurrentLineNumber)\r
\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
\r
if self._IsToken("-"):\r
CompStatementObj.CompSize = self._Token\r
OptRomName = self._GetUiName()\r
\r
if not self._IsToken(TAB_SECTION_END):\r
- raise Warning("expected ']'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedBracketClose(self.FileName, self.CurrentLineNumber)\r
\r
OptRomObj = OPTIONROM(OptRomName)\r
self.Profile.OptRomDict[OptRomName] = OptRomObj\r
self._GetInfOptions(ffsInf)\r
\r
if not self._GetNextToken():\r
- raise Warning("expected INF file path", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("INF file path", self.FileName, self.CurrentLineNumber)\r
ffsInf.InfFileName = self._Token\r
if ffsInf.InfFileName.replace(TAB_WORKSPACE, '').find('$') == -1:\r
#check for file path\r
if ErrorCode != 0:\r
EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
\r
- if not ffsInf.InfFileName in self.Profile.InfList:\r
- self.Profile.InfList.append(ffsInf.InfFileName)\r
+ NewFileName = ffsInf.InfFileName\r
+ if ffsInf.OverrideGuid:\r
+ NewFileName = ProcessDuplicatedInf(PathClass(ffsInf.InfFileName,GenFdsGlobalVariable.WorkSpaceDir), ffsInf.OverrideGuid, GenFdsGlobalVariable.WorkSpaceDir).Path\r
+\r
+ if not NewFileName in self.Profile.InfList:\r
+ self.Profile.InfList.append(NewFileName)\r
FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
self.Profile.InfFileLineList.append(FileLineTuple)\r
if ffsInf.UseArch:\r
while True:\r
if self._IsKeyword("PCI_VENDOR_ID"):\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
if not self._GetNextHexNumber():\r
- raise Warning("expected Hex vendor id", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Hex vendor id", self.FileName, self.CurrentLineNumber)\r
Overrides.PciVendorId = self._Token\r
continue\r
\r
if self._IsKeyword("PCI_CLASS_CODE"):\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
if not self._GetNextHexNumber():\r
- raise Warning("expected Hex class code", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Hex class code", self.FileName, self.CurrentLineNumber)\r
Overrides.PciClassCode = self._Token\r
continue\r
\r
if self._IsKeyword("PCI_DEVICE_ID"):\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
- if not self._GetNextHexNumber():\r
- raise Warning("expected Hex device id", self.FileName, self.CurrentLineNumber)\r
-\r
- Overrides.PciDeviceId = self._Token\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
+ # Get a list of PCI IDs\r
+ Overrides.PciDeviceId = ""\r
+ while (self._GetNextHexNumber()):\r
+ Overrides.PciDeviceId = "{} {}".format(Overrides.PciDeviceId, self._Token)\r
+ if not Overrides.PciDeviceId:\r
+ raise Warning.Expected("one or more Hex device ids", self.FileName, self.CurrentLineNumber)\r
continue\r
\r
if self._IsKeyword("PCI_REVISION"):\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
if not self._GetNextHexNumber():\r
- raise Warning("expected Hex revision", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Hex revision", self.FileName, self.CurrentLineNumber)\r
Overrides.PciRevision = self._Token\r
continue\r
\r
if self._IsKeyword("PCI_COMPRESS"):\r
if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
if not self._GetNextToken():\r
- raise Warning("expected TRUE/FALSE for compress", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("TRUE/FALSE for compress", self.FileName, self.CurrentLineNumber)\r
Overrides.NeedCompress = self._Token.upper() == 'TRUE'\r
continue\r
\r
- if self._IsToken("}"):\r
+ if self._IsToken(T_CHAR_BRACE_R):\r
break\r
else:\r
EdkLogger.error("FdfParser", FORMAT_INVALID, File=self.FileName, Line=self.CurrentLineNumber)\r
FfsFileObj = OptRomFileStatement()\r
\r
if not self._IsKeyword("EFI") and not self._IsKeyword(BINARY_FILE_TYPE_BIN):\r
- raise Warning("expected Binary type (EFI/BIN)", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("Binary type (EFI/BIN)", self.FileName, self.CurrentLineNumber)\r
FfsFileObj.FileType = self._Token\r
\r
if not self._GetNextToken():\r
- raise Warning("expected File path", self.FileName, self.CurrentLineNumber)\r
+ raise Warning.Expected("File path", self.FileName, self.CurrentLineNumber)\r
FfsFileObj.FileName = self._Token\r
if FfsFileObj.FileName.replace(TAB_WORKSPACE, '').find('$') == -1:\r
#check for file path\r
projects / mirror_edk2.git / blobdiff