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 2/5] BaseTools: GenFds - move RegEx compile
Date: Tue, 3 Apr 2018 15:34:03 -0700 [thread overview]
Message-ID: <eb38bc1546b91b82760615b5368a4584ae21579f.1522794781.git.jaben.carsey@intel.com> (raw)
In-Reply-To: <cover.1522794781.git.jaben.carsey@intel.com>
In-Reply-To: <cover.1522794781.git.jaben.carsey@intel.com>
compile each RegEx once not in loops/functions
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/GenFds/FdfParser.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index 9b7e898570a3..00e03446421d 100644
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -85,6 +85,7 @@ RegionSizePattern = re.compile("\s*(?P<base>(?:0x|0X)?[a-fA-F0-9]+)\s*\|\s*(?P<s
RegionSizeGuidPattern = re.compile("\s*(?P<base>\w+\.\w+)\s*\|\s*(?P<size>\w+\.\w+)\s*")
RegionOffsetPcdPattern = re.compile("\s*(?P<base>\w+\.\w+)\s*$")
ShortcutPcdPattern = re.compile("\s*\w+\s*=\s*(?P<value>(?:0x|0X)?[a-fA-F0-9]+)\s*\|\s*(?P<name>\w+\.\w+)\s*")
+BaseAddrValuePattern = re.compile('^0[xX][0-9a-fA-F]+')
AllIncludeFileList = []
@@ -2211,9 +2212,7 @@ class FdfParser:
if not self.__GetNextToken():
raise Warning("expected FV base address value", self.FileName, self.CurrentLineNumber)
- IsValidBaseAddrValue = re.compile('^0[x|X][0-9a-fA-F]+')
-
- if not IsValidBaseAddrValue.match(self.__Token.upper()):
+ if not BaseAddrValuePattern.match(self.__Token.upper()):
raise Warning("Unknown FV base address value '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)
Obj.FvBaseAddress = self.__Token
return True
--
2.16.2.windows.1
next prev parent reply other threads:[~2018-04-03 22:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-03 22:34 [PATCH v1 0/5] BaseTools: RegEx refactoring Jaben Carsey
2018-04-03 22:34 ` [PATCH v1 1/5] BaseTools: Autogen - move RegEx compile Jaben Carsey
2018-04-03 22:34 ` Jaben Carsey [this message]
2018-04-03 22:34 ` [PATCH v1 3/5] BaseTools: Add new RegEx pattern to GlobalData Jaben Carsey
2018-04-03 22:34 ` [PATCH v1 4/5] BaseTools: AutoGen - use the new shared RegEx Jaben Carsey
2018-04-03 22:34 ` [PATCH v1 5/5] BaseTools: remove redundant check Jaben Carsey
2018-04-08 7:05 ` [PATCH v1 0/5] BaseTools: RegEx refactoring 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=eb38bc1546b91b82760615b5368a4584ae21579f.1522794781.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