BaseTools: Refactor python except statements

[mirror_edk2.git] / BaseTools / Source / Python / Common / RangeExpression.py

diff --git a/BaseTools/Source/Python/Common/RangeExpression.py b/BaseTools/Source/Python/Common/RangeExpression.py
index 4d07bd752330efb80d2ce80d9f896ccd4dbcbbff..b6f99447057c411e632ac33513c9bfa5742d1553 100644 (file)
--- a/BaseTools/Source/Python/Common/RangeExpression.py
+++ b/BaseTools/Source/Python/Common/RangeExpression.py
@@ -16,7 +16,7 @@ from Common.GlobalData import *
 from CommonDataClass.Exceptions import BadExpression\r
 from CommonDataClass.Exceptions import WrnExpression\r
 import uuid\r
-from Common.Expression import PcdPattern\r
+from Common.Expression import PcdPattern,BaseExpression\r
 from Common.DataType import *\r
 \r
 ERR_STRING_EXPR = 'This operator cannot be used in string expression: [%s].'\r
@@ -186,7 +186,7 @@ def GetOperatorObject(Operator):
     else:\r
         raise BadExpression("Bad Operator")\r
 \r
-class RangeExpression(object):\r
+class RangeExpression(BaseExpression):\r
     # Logical operator mapping\r
     LogicalOperators = {\r
         '&&' : 'and', '||' : 'or',\r
@@ -347,6 +347,7 @@ class RangeExpression(object):
 \r
 \r
     def __init__(self, Expression, PcdDataType, SymbolTable = {}):\r
+        super(RangeExpression, self).__init__(self, Expression, PcdDataType, SymbolTable)\r
         self._NoProcess = False\r
         if type(Expression) != type(''):\r
             self._Expr = Expression\r
@@ -415,48 +416,48 @@ class RangeExpression(object):
 \r
     # Template function to parse binary operators which have same precedence\r
     # Expr [Operator Expr]*\r
-    def _ExprFuncTemplate(self, EvalFunc, OpLst):\r
+    def _ExprFuncTemplate(self, EvalFunc, OpSet):\r
         Val = EvalFunc()\r
-        while self._IsOperator(OpLst):\r
+        while self._IsOperator(OpSet):\r
             Op = self._Token\r
             try:\r
                 Val = self.Eval(Op, Val, EvalFunc())\r
-            except WrnExpression, Warn:\r
+            except WrnExpression as Warn:\r
                 self._WarnExcept = Warn\r
                 Val = Warn.result\r
         return Val\r
 \r
     # A [|| B]*\r
     def _OrExpr(self):\r
-        return self._ExprFuncTemplate(self._AndExpr, ["OR", "or"])\r
+        return self._ExprFuncTemplate(self._AndExpr, {"OR", "or"})\r
 \r
     # A [&& B]*\r
     def _AndExpr(self):\r
-        return self._ExprFuncTemplate(self._NeExpr, ["AND", "and"])\r
+        return self._ExprFuncTemplate(self._NeExpr, {"AND", "and"})\r
 \r
     def _NeExpr(self):\r
         Val = self._RelExpr()\r
-        while self._IsOperator([ "!=", "NOT", "not"]):\r
+        while self._IsOperator({"!=", "NOT", "not"}):\r
             Op = self._Token\r
             if Op in ["!", "NOT", "not"]:\r
-                if not self._IsOperator(["IN", "in"]):\r
+                if not self._IsOperator({"IN", "in"}):\r
                     raise BadExpression(ERR_REL_NOT_IN)\r
                 Op += ' ' + self._Token\r
             try:\r
                 Val = self.Eval(Op, Val, self._RelExpr())\r
-            except WrnExpression, Warn:\r
+            except WrnExpression as Warn:\r
                 self._WarnExcept = Warn\r
                 Val = Warn.result\r
         return Val\r
 \r
     # [!]*A\r
     def _RelExpr(self):\r
-        if self._IsOperator(["NOT" , "LE", "GE", "LT", "GT", "EQ", "XOR"]):\r
+        if self._IsOperator({"NOT" , "LE", "GE", "LT", "GT", "EQ", "XOR"}):\r
             Token = self._Token\r
             Val = self._NeExpr()\r
             try:\r
                 return self.Eval(Token, Val)\r
-            except WrnExpression, Warn:\r
+            except WrnExpression as Warn:\r
                 self._WarnExcept = Warn\r
                 return Warn.result\r
         return self._IdenExpr()\r
@@ -693,25 +694,3 @@ class RangeExpression(object):
             raise BadExpression(ERR_OPERATOR_UNSUPPORT % OpToken)\r
         self._Token = OpToken\r
         return OpToken\r
-\r
-    # Check if current token matches the operators given from OpList\r
-    def _IsOperator(self, OpList):\r
-        Idx = self._Idx\r
-        self._GetOperator()\r
-        if self._Token in OpList:\r
-            if self._Token in self.LogicalOperators:\r
-                self._Token = self.LogicalOperators[self._Token]\r
-            return True\r
-        self._Idx = Idx\r
-        return False\r
-\r
-\r
-    \r
-    \r
-    \r
-    \r
-\r
-\r
-\r
-\r
-#    UTRangeList()\r