sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools: Enhance expression to support some more operation

Browse Source 
Enhance expression to support some more operation that allowed in the
spec, eg: *, /, %, <<, >>, ~.

Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Yonghong Zhu
2017-03-31 21:47:59 +08:00
parent 3edd771929
commit 5e06f1a00b
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
BaseTools/Source/Python/Common/Expression.py
View File

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