replace lots of '}' and "}" with a shared new consistent variable.
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
T_CHAR_DOUBLE_QUOTE = '\"'\r
T_CHAR_SINGLE_QUOTE = '\''\r
T_CHAR_STAR = '*'\r
T_CHAR_DOUBLE_QUOTE = '\"'\r
T_CHAR_SINGLE_QUOTE = '\''\r
T_CHAR_STAR = '*'\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
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
DataString += self._Token\r
DataString += TAB_COMMA_SPLIT\r
\r
DataString += self._Token\r
DataString += TAB_COMMA_SPLIT\r
\r
- if not self._IsToken("}"):\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
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
\r
DataString = DataString.rstrip(TAB_COMMA_SPLIT)\r
DataString += self._Token\r
DataString += TAB_COMMA_SPLIT\r
\r
DataString += self._Token\r
DataString += TAB_COMMA_SPLIT\r
\r
- if not self._IsToken("}"):\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
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
\r
DataString = DataString.rstrip(TAB_COMMA_SPLIT)\r
DataString += self._Token\r
DataString += TAB_COMMA_SPLIT\r
\r
DataString += self._Token\r
DataString += TAB_COMMA_SPLIT\r
\r
- if not self._IsToken("}"):\r
+ if not self._IsToken(T_CHAR_BRACE_R):\r
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
\r
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
\r
- if not self._IsToken("}"):\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
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
\r
DataString = DataString.rstrip(TAB_COMMA_SPLIT)\r
\r
FvObj.FvExtEntryData.append(self._Token)\r
\r
\r
FvObj.FvExtEntryData.append(self._Token)\r
\r
- if not self._IsToken("}"):\r
+ if not self._IsToken(T_CHAR_BRACE_R):\r
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
\r
return True\r
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
\r
return True\r
if not IsInf and not IsFile:\r
break\r
\r
if not IsInf and not IsFile:\r
break\r
\r
- if not self._IsToken("}"):\r
+ if not self._IsToken(T_CHAR_BRACE_R):\r
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
\r
FvObj.AprioriSectionList.append(AprSectionObj)\r
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
\r
FvObj.AprioriSectionList.append(AprSectionObj)\r
FfsFileObj.FileName = self._Token.replace('$(SPACE)', ' ')\r
self._VerifyFile(FfsFileObj.FileName)\r
\r
FfsFileObj.FileName = self._Token.replace('$(SPACE)', ' ')\r
self._VerifyFile(FfsFileObj.FileName)\r
\r
- if not self._IsToken("}"):\r
+ if not self._IsToken(T_CHAR_BRACE_R):\r
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
\r
## _GetRAWData() method\r
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
\r
## _GetRAWData() method\r
raise Warning.Expected("Filename value", self.FileName, self.CurrentLineNumber)\r
\r
FileName = self._Token.replace('$(SPACE)', ' ')\r
raise Warning.Expected("Filename value", self.FileName, self.CurrentLineNumber)\r
\r
FileName = self._Token.replace('$(SPACE)', ' ')\r
+ if FileName == T_CHAR_BRACE_R:\r
self._UndoToken()\r
raise Warning.Expected("Filename value", self.FileName, self.CurrentLineNumber)\r
\r
self._UndoToken()\r
raise Warning.Expected("Filename value", self.FileName, self.CurrentLineNumber)\r
\r
FfsFileObj.FileName.append(File.Path)\r
FfsFileObj.SubAlignment.append(AlignValue)\r
\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
self._UndoToken()\r
break\r
\r
if not IsInf and not IsFile:\r
break\r
\r
if not IsInf and not IsFile:\r
break\r
\r
- if not self._IsToken("}"):\r
+ if not self._IsToken(T_CHAR_BRACE_R):\r
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
\r
FvImageSectionObj = FvImageSection()\r
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
\r
FvImageSectionObj = FvImageSection()\r
raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
if not self._IsToken("{"):\r
raise Warning.ExpectedCurlyOpen(self.FileName, self.CurrentLineNumber)\r
raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
if not self._IsToken("{"):\r
raise Warning.ExpectedCurlyOpen(self.FileName, self.CurrentLineNumber)\r
- if not self._SkipToToken("}"):\r
+ if not self._SkipToToken(T_CHAR_BRACE_R):\r
raise Warning.Expected("Depex expression ending '}'", self.FileName, self.CurrentLineNumber)\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
Obj.SectionList.append(DepexSectionObj)\r
\r
else:\r
- if not self._IsToken("}"):\r
+ if not self._IsToken(T_CHAR_BRACE_R):\r
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
Obj.SectionList.append(CompressSectionObj)\r
return True\r
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
Obj.SectionList.append(CompressSectionObj)\r
return True\r
if not IsLeafSection and not IsEncapSection:\r
break\r
\r
if not IsLeafSection and not IsEncapSection:\r
break\r
\r
- if not self._IsToken("}"):\r
+ if not self._IsToken(T_CHAR_BRACE_R):\r
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
Obj.SectionList.append(GuidSectionObj)\r
\r
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
Obj.SectionList.append(GuidSectionObj)\r
\r
if not IsEncapsulate and not IsLeaf:\r
break\r
\r
if not IsEncapsulate and not IsLeaf:\r
break\r
\r
- if not self._IsToken("}"):\r
+ if not self._IsToken(T_CHAR_BRACE_R):\r
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
\r
return NewRule\r
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
\r
return NewRule\r
if not IsInf and not IsFile:\r
break\r
\r
if not IsInf and not IsFile:\r
break\r
\r
- if not self._IsToken("}"):\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
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
FvImageSectionObj.Fv = FvObj\r
FvImageSectionObj.FvName = None\r
FvImageSectionObj.FvFileExtension = self._GetFileExtension()\r
elif self._GetNextToken():\r
if self._Token not in {\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
BINARY_FILE_TYPE_PIC, BINARY_FILE_TYPE_TE,\r
"FV_IMAGE", "RAW", BINARY_FILE_TYPE_DXE_DEPEX,\r
BINARY_FILE_TYPE_UI, "VERSION",\r
EfiSectionObj.FileExtension = self._GetFileExtension()\r
elif self._GetNextToken():\r
if self._Token not in {\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
BINARY_FILE_TYPE_PIC, BINARY_FILE_TYPE_TE,\r
"FV_IMAGE", "RAW", BINARY_FILE_TYPE_DXE_DEPEX,\r
BINARY_FILE_TYPE_UI, "VERSION",\r
if not IsEncapsulate and not IsLeaf:\r
break\r
\r
if not IsEncapsulate and not IsLeaf:\r
break\r
\r
- if not self._IsToken("}"):\r
+ if not self._IsToken(T_CHAR_BRACE_R):\r
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
theRule.SectionList.append(CompressSectionObj)\r
\r
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
theRule.SectionList.append(CompressSectionObj)\r
\r
if not IsEncapsulate and not IsLeaf:\r
break\r
\r
if not IsEncapsulate and not IsLeaf:\r
break\r
\r
- if not self._IsToken("}"):\r
+ if not self._IsToken(T_CHAR_BRACE_R):\r
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
theRule.SectionList.append(GuidSectionObj)\r
\r
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)\r
theRule.SectionList.append(GuidSectionObj)\r
\r
Overrides.NeedCompress = self._Token.upper() == 'TRUE'\r
continue\r
\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
break\r
else:\r
EdkLogger.error("FdfParser", FORMAT_INVALID, File=self.FileName, Line=self.CurrentLineNumber)\r