## @file\r
# This file is used to parse and evaluate expression in directive or PCD value.\r
#\r
-# Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>\r
# This program and the accompanying materials\r
# are licensed and made available under the terms and conditions of the BSD License\r
# which accompanies this distribution. The full text of the license may be found at\r
'IN' : 'in'\r
}\r
\r
- NonLetterOpLst = ['+', '-', '&', '|', '^', '!', '=', '>', '<']\r
+ NonLetterOpLst = ['+', '-', '*', '/', '%', '&', '|', '^', '~', '<<', '>>', '!', '=', '>', '<']\r
\r
PcdPattern = re.compile(r'[_a-zA-Z][0-9A-Za-z_]*\.[_a-zA-Z][0-9A-Za-z_]*$')\r
HexPattern = re.compile(r'0[xX][0-9a-fA-F]+$')\r
if type(Oprand1) == type(''):\r
raise BadExpression(ERR_STRING_EXPR % Operator)\r
EvalStr = 'not Oprand1'\r
+ elif Operator in ["~"]:\r
+ if type(Oprand1) == type(''):\r
+ raise BadExpression(ERR_STRING_EXPR % Operator)\r
+ EvalStr = '~ Oprand1'\r
else:\r
if Operator in ["+", "-"] and (type(True) in [type(Oprand1), type(Oprand2)]):\r
# Boolean in '+'/'-' will be evaluated but raise warning\r
\r
# A [ > B]*\r
def _RelExpr(self):\r
- return self._ExprFuncTemplate(self._AddExpr, ["<=", ">=", "<", ">", "LE", "GE", "LT", "GT"])\r
+ return self._ExprFuncTemplate(self._ShiftExpr, ["<=", ">=", "<", ">", "LE", "GE", "LT", "GT"])\r
+\r
+ def _ShiftExpr(self):\r
+ return self._ExprFuncTemplate(self._AddExpr, ["<<", ">>"])\r
\r
# A [ + B]*\r
def _AddExpr(self):\r
- return self._ExprFuncTemplate(self._UnaryExpr, ["+", "-"])\r
+ return self._ExprFuncTemplate(self._MulExpr, ["+", "-"])\r
+\r
+ # A [ * B]*\r
+ def _MulExpr(self):\r
+ return self._ExprFuncTemplate(self._UnaryExpr, ["*", "/", "%"])\r
\r
# [!]*A\r
def _UnaryExpr(self):\r
except WrnExpression, Warn:\r
self._WarnExcept = Warn\r
return Warn.result\r
+ if self._IsOperator(["~"]):\r
+ Val = self._UnaryExpr()\r
+ try:\r
+ return self.Eval('~', Val)\r
+ except WrnExpression, Warn:\r
+ self._WarnExcept = Warn\r
+ return Warn.result\r
return self._IdenExpr()\r
\r
# Parse identifier or encapsulated expression\r
\r
@staticmethod\r
def __IsIdChar(Ch):\r
- return Ch in '._/:' or Ch.isalnum()\r
+ return Ch in '._:' or Ch.isalnum()\r
\r
# Parse operand\r
def _GetSingleToken(self):\r