[PATCH v1 1/1] BaseTools: refactor repeated RegExp when no special searching is needed.

[PATCH v1 1/1] BaseTools: refactor repeated RegExp when no special searching is needed.

[Jaben Carsey]

use str.replace and try/except.

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 | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py
index 4f0f377f3788..b7500bff9051 100644
--- a/BaseTools/Source/Python/Common/Expression.py
+++ b/BaseTools/Source/Python/Common/Expression.py
@@ -938,12 +938,13 @@ class ValueExpressionEx(ValueExpression):
                                 OffsetList = ReOffset.findall(Item)
                             except:
                                 pass
+                            # replace each offset, except errors
                             for Offset in OffsetList:
-                                if Offset in LabelDict.keys():
-                                    Re = re.compile('OFFSET_OF\(%s\)' % Offset)
-                                    Item = Re.sub(LabelDict[Offset], Item)
-                                else:
+                                try:
+                                    Item = Item.replace('OFFSET_OF({})'.format(Offset),LabelDict[Offset])
+                                except:
                                     raise BadExpression('%s not defined' % Offset)
+
                             NewPcdValueList.append(Item)
 
                         AllPcdValueList = []
-- 
2.16.2.windows.1

Re: [PATCH v1 1/1] BaseTools: refactor repeated RegExp when no special searching is needed.

[Zhu, Yonghong]

Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com> 

Best Regards,
Zhu Yonghong


-----Original Message-----
From: Carsey, Jaben 
Sent: Tuesday, March 27, 2018 8:33 AM
To: edk2-devel@lists.01.org
Cc: Gao, Liming <liming.gao@intel.com>; Zhu, Yonghong <yonghong.zhu@intel.com>
Subject: [PATCH v1 1/1] BaseTools: refactor repeated RegExp when no special searching is needed.

use str.replace and try/except.

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 | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py
index 4f0f377f3788..b7500bff9051 100644
--- a/BaseTools/Source/Python/Common/Expression.py
+++ b/BaseTools/Source/Python/Common/Expression.py
@@ -938,12 +938,13 @@ class ValueExpressionEx(ValueExpression):
                                 OffsetList = ReOffset.findall(Item)
                             except:
                                 pass
+                            # replace each offset, except errors
                             for Offset in OffsetList:
-                                if Offset in LabelDict.keys():
-                                    Re = re.compile('OFFSET_OF\(%s\)' % Offset)
-                                    Item = Re.sub(LabelDict[Offset], Item)
-                                else:
+                                try:
+                                    Item = Item.replace('OFFSET_OF({})'.format(Offset),LabelDict[Offset])
+                                except:
                                     raise BadExpression('%s not defined' % Offset)
+
                             NewPcdValueList.append(Item)
 
                         AllPcdValueList = []
-- 
2.16.2.windows.1