Compare commits
2 Commits
bb43611f67
...
1a20e6927d
Author | SHA1 | Date | |
---|---|---|---|
1a20e6927d | |||
7649928be8 |
@ -64,25 +64,10 @@ class Token(object):
|
|||||||
yield self
|
yield self
|
||||||
|
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
return f"<{self.__class__.__name__} {self.__txt__}>"
|
return f"<{self.__class__.__name__} {renders['txt'](self._mo)}>"
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
if self.RENDER == "tex":
|
return renders[self.RENDER](self._mo)
|
||||||
return self.__tex__
|
|
||||||
elif self.RENDER == "txt":
|
|
||||||
return self.__txt__
|
|
||||||
else:
|
|
||||||
raise ValueError(f"Unknow render {self.RENDER}")
|
|
||||||
|
|
||||||
# return renders[self.RENDER](self._mo)
|
|
||||||
|
|
||||||
@property
|
|
||||||
def __txt__(self):
|
|
||||||
return self._mo.__txt__
|
|
||||||
|
|
||||||
@property
|
|
||||||
def __tex__(self):
|
|
||||||
return self._mo.__tex__
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def raw(self):
|
def raw(self):
|
||||||
@ -265,7 +250,6 @@ class Token(object):
|
|||||||
"""
|
"""
|
||||||
return self._operate(other, "^")
|
return self._operate(other, "^")
|
||||||
|
|
||||||
|
|
||||||
def _roperate(self, other, operation):
|
def _roperate(self, other, operation):
|
||||||
""" Make a operation between 2 Tokens """
|
""" Make a operation between 2 Tokens """
|
||||||
from ..expression import Expression
|
from ..expression import Expression
|
||||||
@ -315,6 +299,7 @@ class Token(object):
|
|||||||
<Linear x - 3>
|
<Linear x - 3>
|
||||||
"""
|
"""
|
||||||
return self._roperate(other, "-")
|
return self._roperate(other, "-")
|
||||||
|
|
||||||
def __rmul__(self, other):
|
def __rmul__(self, other):
|
||||||
""" Multiply 2 Tokens or a Token and a Expression
|
""" Multiply 2 Tokens or a Token and a Expression
|
||||||
|
|
||||||
@ -342,7 +327,6 @@ class Token(object):
|
|||||||
"""
|
"""
|
||||||
return self._roperate(other, "/")
|
return self._roperate(other, "/")
|
||||||
|
|
||||||
|
|
||||||
def _get_soul(self, other=None):
|
def _get_soul(self, other=None):
|
||||||
""" Get the builtin soul of self or other """
|
""" Get the builtin soul of self or other """
|
||||||
if isinstance(other, Token):
|
if isinstance(other, Token):
|
||||||
|
Loading…
Reference in New Issue
Block a user