\r
# # Import Modules\r
#\r
+from __future__ import print_function\r
from Common.GlobalData import *\r
from CommonDataClass.Exceptions import BadExpression\r
from CommonDataClass.Exceptions import WrnExpression\r
import uuid\r
from Common.Expression import PcdPattern, BaseExpression\r
from Common.DataType import *\r
+from re import compile\r
\r
ERR_STRING_EXPR = 'This operator cannot be used in string expression: [%s].'\r
ERR_SNYTAX = 'Syntax error, the rest of expression cannot be evaluated: [%s].'\r
\r
NonLetterOpLst = ['+', '-', '&', '|', '^', '!', '=', '>', '<']\r
\r
- RangePattern = re.compile(r'[0-9]+ - [0-9]+')\r
+ RangePattern = compile(r'[0-9]+ - [0-9]+')\r
\r
def preProcessRangeExpr(self, expr):\r
# convert hex to int\r
return rangeid\r
\r
\r
- def NegtiveRange(self, Oprand1):\r
+ def NegativeRange(self, Oprand1):\r
rangeContainer1 = self.operanddict[Oprand1]\r
\r
\r
if Operator in ["!", "NOT", "not"]:\r
if not gGuidPattern.match(Oprand1.strip()):\r
raise BadExpression(ERR_STRING_EXPR % Operator)\r
- return self.NegtiveRange(Oprand1)\r
+ return self.NegativeRange(Oprand1)\r
else:\r
if Operator in ["==", ">=", "<=", ">", "<", '^']:\r
return self.EvalRange(Operator, Oprand1)\r
\r
\r
def __init__(self, Expression, PcdDataType, SymbolTable = {}):\r
- super().__init__(self, Expression, PcdDataType, SymbolTable)\r
+ super(RangeExpression, self).__init__(self, Expression, PcdDataType, SymbolTable)\r
self._NoProcess = False\r
if not isinstance(Expression, type('')):\r
self._Expr = Expression\r