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

Enable to initialize Expression with Expression

Browse Source
This commit is contained in:
Lafrite 2015-02-28 23:02:41 +01:00
parent 79033c74ce
commit 20c9c20836
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pymath/expression.py
View File

@ -71,6 +71,8 @@ class Expression(Explicable):
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]) expression.postfix_tokens = flatten_list([tok.postfix_tokens if Expression.isExpression(tok) else tok for tok in exp])
elif type(exp) == Expression:
return exp
else: else:
raise ValueError("Can't build Expression with {} object".format(type(exp))) raise ValueError("Can't build Expression with {} object".format(type(exp)))
@ -95,7 +97,6 @@ class Expression(Explicable):
methods_attr = {'simplify':simplify, '_isPolynom': is_polynom, 'postfix_tokens': [token]} methods_attr = {'simplify':simplify, '_isPolynom': is_polynom, 'postfix_tokens': [token]}
fake_token = type('fake_str', (str,Explicable, ), methods_attr)(token) fake_token = type('fake_str', (str,Explicable, ), methods_attr)(token)
return fake_token return fake_token
else: else:
raise ValueError("Unknow type in Expression: {}".format(type(token))) raise ValueError("Unknow type in Expression: {}".format(type(token)))