From: Jaben Carsey <jaben.carsey@intel.com>
To: edk2-devel@lists.01.org
Cc: Bob Feng <bob.c.feng@intel.com>,
Yonghong Zhu <yonghong.zhu@intel.com>,
Liming Gao <liming.gao@intel.com>
Subject: [Patch v3 6/6] BaseTools/GenFds: create and use new variable in FdfParser
Date: Tue, 23 Oct 2018 10:29:24 -0700 [thread overview]
Message-ID: <67768109f88780500595107275e7167b2b14aeea.1540315635.git.jaben.carsey@intel.com> (raw)
In-Reply-To: <cover.1540315635.git.jaben.carsey@intel.com>
In-Reply-To: <cover.1540315635.git.jaben.carsey@intel.com>
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>
---
BaseTools/Source/Python/GenFds/FdfParser.py | 45 ++++++++++----------
1 file changed, 23 insertions(+), 22 deletions(-)
diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index d954c0b40b3b..bf6e0bd2286c 100644
--- 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 = '\"'
T_CHAR_SINGLE_QUOTE = '\''
T_CHAR_STAR = '*'
+T_CHAR_BRACE_R = '}'
-SEPARATORS = {TAB_EQUAL_SPLIT, TAB_VALUE_SPLIT, TAB_COMMA_SPLIT, '{', '}'}
+SEPARATORS = {TAB_EQUAL_SPLIT, TAB_VALUE_SPLIT, TAB_COMMA_SPLIT, '{', T_CHAR_BRACE_R}
ALIGNMENTS = {"Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K", "64K", "128K",
"256K", "512K", "1M", "2M", "4M", "8M", "16M"}
ALIGNMENT_NOAUTO = ALIGNMENTS - {"Auto"}
@@ -2021,7 +2022,7 @@ class FdfParser:
DataString += self._Token
DataString += TAB_COMMA_SPLIT
- if not self._IsToken("}"):
+ if not self._IsToken(T_CHAR_BRACE_R):
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)
DataString = DataString.rstrip(TAB_COMMA_SPLIT)
@@ -2061,7 +2062,7 @@ class FdfParser:
DataString += self._Token
DataString += TAB_COMMA_SPLIT
- if not self._IsToken("}"):
+ if not self._IsToken(T_CHAR_BRACE_R):
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)
DataString = DataString.rstrip(TAB_COMMA_SPLIT)
@@ -2330,10 +2331,10 @@ class FdfParser:
DataString += self._Token
DataString += TAB_COMMA_SPLIT
- if not self._IsToken("}"):
+ if not self._IsToken(T_CHAR_BRACE_R):
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)
- if not self._IsToken("}"):
+ if not self._IsToken(T_CHAR_BRACE_R):
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)
DataString = DataString.rstrip(TAB_COMMA_SPLIT)
@@ -2348,7 +2349,7 @@ class FdfParser:
FvObj.FvExtEntryData.append(self._Token)
- if not self._IsToken("}"):
+ if not self._IsToken(T_CHAR_BRACE_R):
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)
return True
@@ -2384,7 +2385,7 @@ class FdfParser:
if not IsInf and not IsFile:
break
- if not self._IsToken("}"):
+ if not self._IsToken(T_CHAR_BRACE_R):
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)
FvObj.AprioriSectionList.append(AprSectionObj)
@@ -2659,7 +2660,7 @@ class FdfParser:
FfsFileObj.FileName = self._Token.replace('$(SPACE)', ' ')
self._VerifyFile(FfsFileObj.FileName)
- if not self._IsToken("}"):
+ if not self._IsToken(T_CHAR_BRACE_R):
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)
## _GetRAWData() method
@@ -2684,7 +2685,7 @@ class FdfParser:
raise Warning.Expected("Filename value", self.FileName, self.CurrentLineNumber)
FileName = self._Token.replace('$(SPACE)', ' ')
- if FileName == '}':
+ if FileName == T_CHAR_BRACE_R:
self._UndoToken()
raise Warning.Expected("Filename value", self.FileName, self.CurrentLineNumber)
@@ -2693,7 +2694,7 @@ class FdfParser:
FfsFileObj.FileName.append(File.Path)
FfsFileObj.SubAlignment.append(AlignValue)
- if self._IsToken("}"):
+ if self._IsToken(T_CHAR_BRACE_R):
self._UndoToken()
break
@@ -2865,7 +2866,7 @@ class FdfParser:
if not IsInf and not IsFile:
break
- if not self._IsToken("}"):
+ if not self._IsToken(T_CHAR_BRACE_R):
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)
FvImageSectionObj = FvImageSection()
@@ -2890,10 +2891,10 @@ class FdfParser:
raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)
if not self._IsToken("{"):
raise Warning.ExpectedCurlyOpen(self.FileName, self.CurrentLineNumber)
- if not self._SkipToToken("}"):
+ if not self._SkipToToken(T_CHAR_BRACE_R):
raise Warning.Expected("Depex expression ending '}'", self.FileName, self.CurrentLineNumber)
- DepexSectionObj.Expression = self._SkippedChars.rstrip('}')
+ DepexSectionObj.Expression = self._SkippedChars.rstrip(T_CHAR_BRACE_R)
Obj.SectionList.append(DepexSectionObj)
else:
@@ -2984,7 +2985,7 @@ class FdfParser:
break
- if not self._IsToken("}"):
+ if not self._IsToken(T_CHAR_BRACE_R):
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)
Obj.SectionList.append(CompressSectionObj)
return True
@@ -3011,7 +3012,7 @@ class FdfParser:
if not IsLeafSection and not IsEncapSection:
break
- if not self._IsToken("}"):
+ if not self._IsToken(T_CHAR_BRACE_R):
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)
Obj.SectionList.append(GuidSectionObj)
@@ -3689,7 +3690,7 @@ class FdfParser:
if not IsEncapsulate and not IsLeaf:
break
- if not self._IsToken("}"):
+ if not self._IsToken(T_CHAR_BRACE_R):
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)
return NewRule
@@ -3789,7 +3790,7 @@ class FdfParser:
if not IsInf and not IsFile:
break
- if not self._IsToken("}"):
+ if not self._IsToken(T_CHAR_BRACE_R):
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)
FvImageSectionObj.Fv = FvObj
FvImageSectionObj.FvName = None
@@ -3808,7 +3809,7 @@ class FdfParser:
FvImageSectionObj.FvFileExtension = self._GetFileExtension()
elif self._GetNextToken():
if self._Token not in {
- "}", "COMPAT16", BINARY_FILE_TYPE_PE32,
+ T_CHAR_BRACE_R, "COMPAT16", BINARY_FILE_TYPE_PE32,
BINARY_FILE_TYPE_PIC, BINARY_FILE_TYPE_TE,
"FV_IMAGE", "RAW", BINARY_FILE_TYPE_DXE_DEPEX,
BINARY_FILE_TYPE_UI, "VERSION",
@@ -3894,7 +3895,7 @@ class FdfParser:
EfiSectionObj.FileExtension = self._GetFileExtension()
elif self._GetNextToken():
if self._Token not in {
- "}", "COMPAT16", BINARY_FILE_TYPE_PE32,
+ T_CHAR_BRACE_R, "COMPAT16", BINARY_FILE_TYPE_PE32,
BINARY_FILE_TYPE_PIC, BINARY_FILE_TYPE_TE,
"FV_IMAGE", "RAW", BINARY_FILE_TYPE_DXE_DEPEX,
BINARY_FILE_TYPE_UI, "VERSION",
@@ -4037,7 +4038,7 @@ class FdfParser:
if not IsEncapsulate and not IsLeaf:
break
- if not self._IsToken("}"):
+ if not self._IsToken(T_CHAR_BRACE_R):
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)
theRule.SectionList.append(CompressSectionObj)
@@ -4069,7 +4070,7 @@ class FdfParser:
if not IsEncapsulate and not IsLeaf:
break
- if not self._IsToken("}"):
+ if not self._IsToken(T_CHAR_BRACE_R):
raise Warning.ExpectedCurlyClose(self.FileName, self.CurrentLineNumber)
theRule.SectionList.append(GuidSectionObj)
@@ -4415,7 +4416,7 @@ class FdfParser:
Overrides.NeedCompress = self._Token.upper() == 'TRUE'
continue
- if self._IsToken("}"):
+ if self._IsToken(T_CHAR_BRACE_R):
break
else:
EdkLogger.error("FdfParser", FORMAT_INVALID, File=self.FileName, Line=self.CurrentLineNumber)
--
2.16.2.windows.1
next prev parent reply other threads:[~2018-10-23 17:29 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-23 17:29 [Patch v3 0/6] BaseTools/GenFds: cleanup GenFds Jaben Carsey
2018-10-23 17:29 ` [Patch v3 1/6] " Jaben Carsey
2018-10-25 13:45 ` Feng, Bob C
2018-10-26 4:53 ` Gary Lin
2018-10-26 5:25 ` Gao, Liming
2018-10-26 6:27 ` Gao, Liming
2018-10-26 6:54 ` Gary Lin
2018-10-23 17:29 ` [Patch v3 2/6] BaseTools/GenFds: change objects to sets Jaben Carsey
2018-10-23 17:29 ` [Patch v3 3/6] Basetools/GenFds: refactor class FV Jaben Carsey
2018-10-23 17:29 ` [Patch v3 4/6] BaseTools/GenFds: remove MacroDict parameter Jaben Carsey
2018-10-23 17:29 ` [Patch v3 5/6] BaseTools/GenFds: refactor FdfParser warnings Jaben Carsey
2018-10-23 17:29 ` Jaben Carsey [this message]
2018-10-25 13:57 ` [Patch v3 6/6] BaseTools/GenFds: create and use new variable in FdfParser Feng, Bob C
2018-10-25 11:55 ` [Patch v3 0/6] BaseTools/GenFds: cleanup GenFds Zhu, Yonghong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=67768109f88780500595107275e7167b2b14aeea.1540315635.git.jaben.carsey@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox