From: Jaben Carsey <jaben.carsey@intel.com>
To: edk2-devel@lists.01.org
Cc: Liming Gao <liming.gao@intel.com>, Yonghong Zhu <yonghong.zhu@intel.com>
Subject: [PATCH v1 3/4] BaseTools: move regular expression compile out of function call.
Date: Tue, 27 Mar 2018 16:42:46 -0700 [thread overview]
Message-ID: <fc14eb65c6cda1e8bc1ab8349c01a631da2f2295.1522194073.git.jaben.carsey@intel.com> (raw)
In-Reply-To: <cover.1522194073.git.jaben.carsey@intel.com>
In-Reply-To: <cover.1522194073.git.jaben.carsey@intel.com>
move to the root of the file and dont recompile.
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
---
BaseTools/Source/Python/Common/Expression.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py
index 3f2b43118553..340c50ebe00f 100644
--- a/BaseTools/Source/Python/Common/Expression.py
+++ b/BaseTools/Source/Python/Common/Expression.py
@@ -41,6 +41,8 @@ ERR_EMPTY_EXPR = 'Empty expression is not allowed.'
ERR_IN_OPERAND = 'Macro after IN operator can only be: $(FAMILY), $(ARCH), $(TOOL_CHAIN_TAG) and $(TARGET).'
__ValidString = re.compile(r'[_a-zA-Z][_0-9a-zA-Z]*$')
+_ReLabel = re.compile('LABEL\((\w+)\)')
+_ReOffset = re.compile('OFFSET_OF\((\w+)\)')
## SplitString
# Split string to list according double quote
@@ -853,13 +855,11 @@ class ValueExpressionEx(ValueExpression):
PcdValueList = SplitPcdValueString(PcdValue.strip()[1:-1])
LabelDict = {}
NewPcdValueList = []
- ReLabel = re.compile('LABEL\((\w+)\)')
- ReOffset = re.compile('OFFSET_OF\((\w+)\)')
LabelOffset = 0
for Index, Item in enumerate(PcdValueList):
# compute byte offset of every LABEL
- LabelList = ReLabel.findall(Item)
- Item = ReLabel.sub('', Item)
+ LabelList = _ReLabel.findall(Item)
+ Item = _ReLabel.sub('', Item)
Item = Item.strip()
if LabelList:
for Label in LabelList:
@@ -886,11 +886,11 @@ class ValueExpressionEx(ValueExpression):
# for LABEL parse
Item = Item.strip()
try:
- Item = ReLabel.sub('', Item)
+ Item = _ReLabel.sub('', Item)
except:
pass
try:
- OffsetList = ReOffset.findall(Item)
+ OffsetList = _ReOffset.findall(Item)
except:
pass
for Offset in OffsetList:
--
2.16.2.windows.1
next prev parent reply other threads:[~2018-03-27 23:36 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-27 23:42 [PATCH v1 0/4] BaseTools: remove code without affect Jaben Carsey
2018-03-27 23:42 ` [PATCH v1 1/4] BaseTools: remove irrelevant code Jaben Carsey
2018-03-28 2:17 ` Zhu, Yonghong
2018-03-28 14:57 ` Carsey, Jaben
2018-03-28 20:22 ` Carsey, Jaben
2018-03-27 23:42 ` [PATCH v1 2/4] BaseTools: expression can use single in instead of 3 API calls Jaben Carsey
2018-03-29 2:55 ` Zhu, Yonghong
2018-03-27 23:42 ` Jaben Carsey [this message]
2018-03-29 2:55 ` [PATCH v1 3/4] BaseTools: move regular expression compile out of function call Zhu, Yonghong
2018-03-27 23:42 ` [PATCH v1 4/4] BaseTools: dont use enumerate when un-needed Jaben Carsey
2018-03-29 2:55 ` 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=fc14eb65c6cda1e8bc1ab8349c01a631da2f2295.1522194073.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