BaseTools/GenFds: create and use new variable in FdfParser

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>

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index d954c0b40b3bc79a6bbff32b94beb6568a65e018..bf6e0bd2286c85bdad04476187a57042fcb8b2c0 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -65,8 +65,9 @@ T_CHAR_TAB = '\t'
 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
@@ -2021,7 +2022,7 @@ class FdfParser:
                 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
@@ -2061,7 +2062,7 @@ class FdfParser:
                     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
@@ -2330,10 +2331,10 @@ class FdfParser:
                 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
-            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
@@ -2348,7 +2349,7 @@ class FdfParser:
 \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
@@ -2384,7 +2385,7 @@ class FdfParser:
             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
@@ -2659,7 +2660,7 @@ class FdfParser:
             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
@@ -2684,7 +2685,7 @@ class FdfParser:
                 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
 \r
@@ -2693,7 +2694,7 @@ class FdfParser:
             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
@@ -2865,7 +2866,7 @@ class FdfParser:
                     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
@@ -2890,10 +2891,10 @@ class FdfParser:
                 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
-            DepexSectionObj.Expression = self._SkippedChars.rstrip('}')\r
+            DepexSectionObj.Expression = self._SkippedChars.rstrip(T_CHAR_BRACE_R)\r
             Obj.SectionList.append(DepexSectionObj)\r
 \r
         else:\r
@@ -2984,7 +2985,7 @@ class FdfParser:
                     break\r
 \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(CompressSectionObj)\r
             return True\r
@@ -3011,7 +3012,7 @@ class FdfParser:
                 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
@@ -3689,7 +3690,7 @@ class FdfParser:
                 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
@@ -3789,7 +3790,7 @@ class FdfParser:
                     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
@@ -3808,7 +3809,7 @@ class FdfParser:
                     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
@@ -3894,7 +3895,7 @@ class FdfParser:
             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
@@ -4037,7 +4038,7 @@ class FdfParser:
                 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
@@ -4069,7 +4070,7 @@ class FdfParser:
                 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
@@ -4415,7 +4416,7 @@ class FdfParser:
                     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