diff options
Diffstat (limited to 'BaseTools/Source/Python/Common/RangeExpression.py')
-rw-r--r-- | BaseTools/Source/Python/Common/RangeExpression.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/BaseTools/Source/Python/Common/RangeExpression.py b/BaseTools/Source/Python/Common/RangeExpression.py index 00c0c5e94d..7f504d6e31 100644 --- a/BaseTools/Source/Python/Common/RangeExpression.py +++ b/BaseTools/Source/Python/Common/RangeExpression.py @@ -416,9 +416,9 @@ class RangeExpression(BaseExpression): # Template function to parse binary operators which have same precedence
# Expr [Operator Expr]*
- def _ExprFuncTemplate(self, EvalFunc, OpLst):
+ def _ExprFuncTemplate(self, EvalFunc, OpSet):
Val = EvalFunc()
- while self._IsOperator(OpLst):
+ while self._IsOperator(OpSet):
Op = self._Token
try:
Val = self.Eval(Op, Val, EvalFunc())
@@ -429,18 +429,18 @@ class RangeExpression(BaseExpression): # A [|| B]*
def _OrExpr(self):
- return self._ExprFuncTemplate(self._AndExpr, ["OR", "or"])
+ return self._ExprFuncTemplate(self._AndExpr, {"OR", "or"})
# A [&& B]*
def _AndExpr(self):
- return self._ExprFuncTemplate(self._NeExpr, ["AND", "and"])
+ return self._ExprFuncTemplate(self._NeExpr, {"AND", "and"})
def _NeExpr(self):
Val = self._RelExpr()
- while self._IsOperator([ "!=", "NOT", "not"]):
+ while self._IsOperator({"!=", "NOT", "not"}):
Op = self._Token
if Op in ["!", "NOT", "not"]:
- if not self._IsOperator(["IN", "in"]):
+ if not self._IsOperator({"IN", "in"}):
raise BadExpression(ERR_REL_NOT_IN)
Op += ' ' + self._Token
try:
@@ -452,7 +452,7 @@ class RangeExpression(BaseExpression): # [!]*A
def _RelExpr(self):
- if self._IsOperator(["NOT" , "LE", "GE", "LT", "GT", "EQ", "XOR"]):
+ if self._IsOperator({"NOT" , "LE", "GE", "LT", "GT", "EQ", "XOR"}):
Token = self._Token
Val = self._NeExpr()
try:
|