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/9] BaseTools: FdfParser and FdfParserLite share reg exp
Date: Fri, 16 Mar 2018 16:27:38 -0700 [thread overview]
Message-ID: <6fb495a81dfe4fb8d9cf1b6072607364a416639e.1521242771.git.jaben.carsey@intel.com> (raw)
In-Reply-To: <cover.1521242771.git.jaben.carsey@intel.com>
In-Reply-To: <cover.1521242771.git.jaben.carsey@intel.com>
FdfParser can share regular expression from FdfParserLite.
reduce overlap and reduce recompile of the same expression.
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/FdfParserLite.py | 5 +++--
BaseTools/Source/Python/GenFds/FdfParser.py | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/BaseTools/Source/Python/Common/FdfParserLite.py b/BaseTools/Source/Python/Common/FdfParserLite.py
index 7d129bfcab59..330422ad59d2 100644
--- a/BaseTools/Source/Python/Common/FdfParserLite.py
+++ b/BaseTools/Source/Python/Common/FdfParserLite.py
@@ -46,6 +46,8 @@ InputMacroDict = {}
# All Macro values when parsing file, not replace existing Macro
AllMacroList = []
+FileExtensionPattern = re.compile(r'([a-zA-Z][a-zA-Z0-9]*)')
+
def GetRealFileLine (File, Line):
InsertedLines = 0
@@ -2842,8 +2844,7 @@ class FdfParser(object):
Ext = ""
if self.__GetNextToken():
- Pattern = re.compile(r'([a-zA-Z][a-zA-Z0-9]*)')
- if Pattern.match(self.__Token):
+ if FileExtensionPattern.match(self.__Token):
Ext = self.__Token
return '.' + Ext
else:
diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index dda7ed4ce798..03183e398bdb 100644
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -59,6 +59,7 @@ import Common.LongFilePathOs as os
from Common.LongFilePathSupport import OpenLongFilePath as open
from Capsule import EFI_CERT_TYPE_PKCS7_GUID
from Capsule import EFI_CERT_TYPE_RSA2048_SHA256_GUID
+from Common.FdfParserLite import FileExtensionPattern
##define T_CHAR_SPACE ' '
##define T_CHAR_NULL '\0'
@@ -3706,7 +3707,6 @@ class FdfParser:
Ext = ""
if self.__GetNextToken():
- Pattern = re.compile(r'([a-zA-Z][a-zA-Z0-9]*)')
if Pattern.match(self.__Token):
Ext = self.__Token
return '.' + Ext
--
2.16.2.windows.1
next prev parent reply other threads:[~2018-03-16 23:21 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-16 23:27 [PATCH v1 0/9] BaseTools: refactor variables and regular expressions Jaben Carsey
2018-03-16 23:27 ` Jaben Carsey [this message]
2018-03-28 13:05 ` [PATCH v1 1/9] BaseTools: FdfParser and FdfParserLite share reg exp Zhu, Yonghong
2018-03-16 23:27 ` [PATCH v1 2/9] BaseTools: GlobalData share same MACRO name definition Jaben Carsey
2018-03-16 23:27 ` [PATCH v1 3/9] BaseTools: add GUID pattern to global data Jaben Carsey
2018-03-16 23:27 ` [PATCH v1 4/9] BaseTools: use new shared GUID regular expressions Jaben Carsey
2018-03-16 23:27 ` [PATCH v1 5/9] BaseTools: Regular Expressions refactor out the hex char for later reuse Jaben Carsey
2018-03-16 23:27 ` [PATCH v1 6/9] BaseTools: Add new RegExp for future use Jaben Carsey
2018-03-16 23:27 ` [PATCH v1 7/9] BaseTools: Use precompiled RegExp Jaben Carsey
2018-03-16 23:27 ` [PATCH v1 8/9] BaseTools: GlobalData Add a regular expression for a hex number Jaben Carsey
2018-03-16 23:27 ` [PATCH v1 9/9] BaseTools: remove local hex number regular expression Jaben Carsey
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=6fb495a81dfe4fb8d9cf1b6072607364a416639e.1521242771.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