* [PATCH v2 1/9] BaseTools: FdfParser and FdfParserLite share reg exp
@ 2018-03-28 16:04 Jaben Carsey
2018-03-28 16:04 ` [PATCH v2 6/9] BaseTools: Add new RegExp for future use Jaben Carsey
2018-03-29 0:22 ` [PATCH v2 1/9] BaseTools: FdfParser and FdfParserLite share reg exp Zhu, Yonghong
0 siblings, 2 replies; 4+ messages in thread
From: Jaben Carsey @ 2018-03-28 16:04 UTC (permalink / raw)
To: edk2-devel; +Cc: Yonghong Zhu, Liming Gao
FdfParser can share regular expression from FdfParserLite.
reduce overlap and reduce recompile of the same expression.
v2: fix missed replacement of Pattern with shared variable
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 | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/BaseTools/Source/Python/Common/FdfParserLite.py b/BaseTools/Source/Python/Common/FdfParserLite.py
index df287414db6f..806fdd8aa5bb 100644
--- a/BaseTools/Source/Python/Common/FdfParserLite.py
+++ b/BaseTools/Source/Python/Common/FdfParserLite.py
@@ -47,6 +47,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 e35057931f03..08429cd72aff 100644
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -60,6 +60,7 @@ 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.RangeExpression import RangeExpression
+from Common.FdfParserLite import FileExtensionPattern
##define T_CHAR_SPACE ' '
##define T_CHAR_NULL '\0'
@@ -3691,8 +3692,7 @@ class FdfParser:
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:
--
2.16.2.windows.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH v2 6/9] BaseTools: Add new RegExp for future use
2018-03-28 16:04 [PATCH v2 1/9] BaseTools: FdfParser and FdfParserLite share reg exp Jaben Carsey
@ 2018-03-28 16:04 ` Jaben Carsey
2018-03-29 0:21 ` Zhu, Yonghong
2018-03-29 0:22 ` [PATCH v2 1/9] BaseTools: FdfParser and FdfParserLite share reg exp Zhu, Yonghong
1 sibling, 1 reply; 4+ messages in thread
From: Jaben Carsey @ 2018-03-28 16:04 UTC (permalink / raw)
To: edk2-devel; +Cc: Yonghong Zhu, Liming Gao
Add a precompiled RegExp for 4 hex chars.
v2: fixed incorrect numbers of {}
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/GlobalData.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/BaseTools/Source/Python/Common/GlobalData.py b/BaseTools/Source/Python/Common/GlobalData.py
index 4d0833a55b52..972ae3e2253c 100644
--- a/BaseTools/Source/Python/Common/GlobalData.py
+++ b/BaseTools/Source/Python/Common/GlobalData.py
@@ -59,6 +59,8 @@ _GuidPattern = r"{Hex}{8}-{Hex}{4}-{Hex}{4}-{Hex}{4}-{Hex}{12}".format(Hex=_HexC
gGuidPattern = re.compile(r'{}'.format(_GuidPattern))
gGuidPatternEnd = re.compile(r'{}$'.format(_GuidPattern))
+g4HexChar = re.compile(r'{}{{4}}'.format(_HexChar))
+
#
# A global variable for whether current build in AutoGen phase or not.
#
--
2.16.2.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
GitPatchExtractor 1.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v2 6/9] BaseTools: Add new RegExp for future use
2018-03-28 16:04 ` [PATCH v2 6/9] BaseTools: Add new RegExp for future use Jaben Carsey
@ 2018-03-29 0:21 ` Zhu, Yonghong
0 siblings, 0 replies; 4+ messages in thread
From: Zhu, Yonghong @ 2018-03-29 0:21 UTC (permalink / raw)
To: Carsey, Jaben, edk2-devel@lists.01.org; +Cc: Gao, Liming, Zhu, Yonghong
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
Best Regards,
Zhu Yonghong
-----Original Message-----
From: Carsey, Jaben
Sent: Thursday, March 29, 2018 12:05 AM
To: edk2-devel@lists.01.org
Cc: Zhu, Yonghong <yonghong.zhu@intel.com>; Gao, Liming <liming.gao@intel.com>
Subject: [edk2] [PATCH v2 6/9] BaseTools: Add new RegExp for future use
Add a precompiled RegExp for 4 hex chars.
v2: fixed incorrect numbers of {}
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/GlobalData.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/BaseTools/Source/Python/Common/GlobalData.py b/BaseTools/Source/Python/Common/GlobalData.py
index 4d0833a55b52..972ae3e2253c 100644
--- a/BaseTools/Source/Python/Common/GlobalData.py
+++ b/BaseTools/Source/Python/Common/GlobalData.py
@@ -59,6 +59,8 @@ _GuidPattern = r"{Hex}{8}-{Hex}{4}-{Hex}{4}-{Hex}{4}-{Hex}{12}".format(Hex=_HexC
gGuidPattern = re.compile(r'{}'.format(_GuidPattern))
gGuidPatternEnd = re.compile(r'{}$'.format(_GuidPattern))
+g4HexChar = re.compile(r'{}{{4}}'.format(_HexChar))
+
#
# A global variable for whether current build in AutoGen phase or not.
#
--
2.16.2.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
GitPatchExtractor 1.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/9] BaseTools: FdfParser and FdfParserLite share reg exp
2018-03-28 16:04 [PATCH v2 1/9] BaseTools: FdfParser and FdfParserLite share reg exp Jaben Carsey
2018-03-28 16:04 ` [PATCH v2 6/9] BaseTools: Add new RegExp for future use Jaben Carsey
@ 2018-03-29 0:22 ` Zhu, Yonghong
1 sibling, 0 replies; 4+ messages in thread
From: Zhu, Yonghong @ 2018-03-29 0:22 UTC (permalink / raw)
To: Carsey, Jaben, edk2-devel@lists.01.org; +Cc: Gao, Liming, Zhu, Yonghong
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
Best Regards,
Zhu Yonghong
-----Original Message-----
From: Carsey, Jaben
Sent: Thursday, March 29, 2018 12:05 AM
To: edk2-devel@lists.01.org
Cc: Zhu, Yonghong <yonghong.zhu@intel.com>; Gao, Liming <liming.gao@intel.com>
Subject: [PATCH v2 1/9] BaseTools: FdfParser and FdfParserLite share reg exp
FdfParser can share regular expression from FdfParserLite.
reduce overlap and reduce recompile of the same expression.
v2: fix missed replacement of Pattern with shared variable
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 | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/BaseTools/Source/Python/Common/FdfParserLite.py b/BaseTools/Source/Python/Common/FdfParserLite.py
index df287414db6f..806fdd8aa5bb 100644
--- a/BaseTools/Source/Python/Common/FdfParserLite.py
+++ b/BaseTools/Source/Python/Common/FdfParserLite.py
@@ -47,6 +47,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 e35057931f03..08429cd72aff 100644
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -60,6 +60,7 @@ 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.RangeExpression import RangeExpression
+from Common.FdfParserLite import FileExtensionPattern
##define T_CHAR_SPACE ' '
##define T_CHAR_NULL '\0'
@@ -3691,8 +3692,7 @@ class FdfParser:
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:
--
2.16.2.windows.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-03-29 0:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-28 16:04 [PATCH v2 1/9] BaseTools: FdfParser and FdfParserLite share reg exp Jaben Carsey
2018-03-28 16:04 ` [PATCH v2 6/9] BaseTools: Add new RegExp for future use Jaben Carsey
2018-03-29 0:21 ` Zhu, Yonghong
2018-03-29 0:22 ` [PATCH v2 1/9] BaseTools: FdfParser and FdfParserLite share reg exp Zhu, Yonghong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox