From: Jaben Carsey <jaben.carsey@intel.com>
To: edk2-devel@lists.01.org
Cc: Yonghong Zhu <yonghong.zhu@intel.com>, Liming Gao <liming.gao@intel.com>
Subject: [PATCH v1 1/5] BaseTools: Expression - remove redundant variable
Date: Tue, 13 Mar 2018 16:11:31 -0700 [thread overview]
Message-ID: <b3150989605dd666a49d82cbb8a5373aa04206ad.1520982577.git.jaben.carsey@intel.com> (raw)
In-Reply-To: <cover.1520982577.git.jaben.carsey@intel.com>
In-Reply-To: <cover.1520982577.git.jaben.carsey@intel.com>
Str is created and not needed.
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/Common/Expression.py | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py
index e76f09c367c1..bcb27ec11fd5 100644
--- a/BaseTools/Source/Python/Common/Expression.py
+++ b/BaseTools/Source/Python/Common/Expression.py
@@ -46,14 +46,13 @@ ERR_IN_OPERAND = 'Macro after IN operator can only be: $(FAMILY), $(ARC
#
def SplitString(String):
# There might be escaped quote: "abc\"def\\\"ghi", 'abc\'def\\\'ghi'
- Str = String
RetList = []
InSingleQuote = False
InDoubleQuote = False
Item = ''
- for i, ch in enumerate(Str):
+ for i, ch in enumerate(String):
if ch == '"' and not InSingleQuote:
- if Str[i - 1] != '\\':
+ if String[i - 1] != '\\':
InDoubleQuote = not InDoubleQuote
if not InDoubleQuote:
Item += String[i]
@@ -64,7 +63,7 @@ def SplitString(String):
RetList.append(Item)
Item = ''
elif ch == "'" and not InDoubleQuote:
- if Str[i - 1] != '\\':
+ if String[i - 1] != '\\':
InSingleQuote = not InSingleQuote
if not InSingleQuote:
Item += String[i]
@@ -84,13 +83,12 @@ def SplitString(String):
def SplitPcdValueString(String):
# There might be escaped comma in GUID() or DEVICE_PATH() or " "
# or ' ' or L' ' or L" "
- Str = String
RetList = []
InParenthesis = 0
InSingleQuote = False
InDoubleQuote = False
Item = ''
- for i, ch in enumerate(Str):
+ for i, ch in enumerate(String):
if ch == '(':
InParenthesis += 1
if ch == ')':
--
2.16.2.windows.1
next prev parent reply other threads:[~2018-03-13 23:05 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-13 23:11 [PATCH v1 0/5] BaseTools - some simple cleanups for BaseTools Jaben Carsey
2018-03-13 23:11 ` Jaben Carsey [this message]
2018-03-13 23:11 ` [PATCH v1 2/5] BaseTools: Expression refactor function Jaben Carsey
2018-03-13 23:11 ` [PATCH v1 3/5] BaseTools: Expression - change from series of if to elif Jaben Carsey
2018-03-13 23:11 ` [PATCH v1 4/5] BaseTools: Expression - remove variable Jaben Carsey
2018-03-13 23:11 ` [PATCH v1 5/5] BaseTools: RangeExpression - remove unused variable Jaben Carsey
2018-03-16 6:52 ` [PATCH v1 0/5] BaseTools - some simple cleanups for BaseTools 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=b3150989605dd666a49d82cbb8a5373aa04206ad.1520982577.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