lafrite/Mapytex
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

allow to user "+" and other operation in Expression initialisation

Browse Source
This commit is contained in:
lafrite
2015-05-19 16:06:03 +02:00
parent 82e051423c
commit fc4d8d19f3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pymath/expression.py
View File

@@ -89,7 +89,8 @@ class Expression(Explicable):
if type(exp) == str: if type(exp) == str:
expression.postfix_tokens = str2tokens(exp) expression.postfix_tokens = str2tokens(exp)
elif type(exp) == list: elif type(exp) == list:
expression.postfix_tokens = flatten_list([tok.postfix_tokens if Expression.isExpression(tok) else tok for tok in exp]) exp_mod_op = [op.get_op(i) if (str(i) in "+-*/^" and not isOperator(i)) else i for i in exp]
expression.postfix_tokens = flatten_list([tok.postfix_tokens if Expression.isExpression(tok) else tok for tok in exp_mod_op])
elif type(exp) == Expression: elif type(exp) == Expression:
return exp return exp
else: else: