diff options
Diffstat (limited to 'scalarfloat.py')
| -rw-r--r-- | scalarfloat.py | 56 |
1 files changed, 33 insertions, 23 deletions
diff --git a/scalarfloat.py b/scalarfloat.py index fca8be2..83e0125 100644 --- a/scalarfloat.py +++ b/scalarfloat.py @@ -8,21 +8,21 @@ from .compat import no_limit_int # NOQA if False: # MYPY from typing import Text, Any, Dict, List # NOQA -__all__ = ["ScalarFloat", "ExponentialFloat", "ExponentialCapsFloat"] +__all__ = ['ScalarFloat', 'ExponentialFloat', 'ExponentialCapsFloat'] class ScalarFloat(float): def __new__(cls, *args, **kw): # type: (Any, Any, Any) -> Any - width = kw.pop('width', None) # type: ignore - prec = kw.pop('prec', None) # type: ignore - m_sign = kw.pop('m_sign', None) # type: ignore - m_lead0 = kw.pop('m_lead0', 0) # type: ignore - exp = kw.pop('exp', None) # type: ignore - e_width = kw.pop('e_width', None) # type: ignore - e_sign = kw.pop('e_sign', None) # type: ignore + width = kw.pop('width', None) # type: ignore + prec = kw.pop('prec', None) # type: ignore + m_sign = kw.pop('m_sign', None) # type: ignore + m_lead0 = kw.pop('m_lead0', 0) # type: ignore + exp = kw.pop('exp', None) # type: ignore + e_width = kw.pop('e_width', None) # type: ignore + e_sign = kw.pop('e_sign', None) # type: ignore underscore = kw.pop('underscore', None) # type: ignore - v = float.__new__(cls, *args, **kw) # type: ignore + v = float.__new__(cls, *args, **kw) # type: ignore v._width = width v._prec = prec v._m_sign = m_sign @@ -37,48 +37,58 @@ class ScalarFloat(float): # type: (Any) -> Any return float(self) + a x = type(self)(self + a) - x._width = self._width # type: ignore - x._underscore = self._underscore[:] if self._underscore is not None else None # type: ignore # NOQA + x._width = self._width + x._underscore = self._underscore[:] if self._underscore is not None else None # NOQA return x def __ifloordiv__(self, a): # type: ignore # type: (Any) -> Any return float(self) // a x = type(self)(self // a) - x._width = self._width # type: ignore - x._underscore = self._underscore[:] if self._underscore is not None else None # type: ignore # NOQA + x._width = self._width + x._underscore = self._underscore[:] if self._underscore is not None else None # NOQA return x def __imul__(self, a): # type: ignore # type: (Any) -> Any return float(self) * a x = type(self)(self * a) - x._width = self._width # type: ignore - x._underscore = self._underscore[:] if self._underscore is not None else None # type: ignore # NOQA - x._prec = self._prec # check for others + x._width = self._width + x._underscore = self._underscore[:] if self._underscore is not None else None # NOQA + x._prec = self._prec # check for others return x def __ipow__(self, a): # type: ignore # type: (Any) -> Any return float(self) ** a x = type(self)(self ** a) - x._width = self._width # type: ignore - x._underscore = self._underscore[:] if self._underscore is not None else None # type: ignore # NOQA + x._width = self._width + x._underscore = self._underscore[:] if self._underscore is not None else None # NOQA return x def __isub__(self, a): # type: ignore # type: (Any) -> Any return float(self) - a x = type(self)(self - a) - x._width = self._width # type: ignore - x._underscore = self._underscore[:] if self._underscore is not None else None # type: ignore # NOQA + x._width = self._width + x._underscore = self._underscore[:] if self._underscore is not None else None # NOQA return x def dump(self, out=sys.stdout): # type: (Any) -> Any - print('ScalarFloat({}| w:{}, p:{}, s:{}, lz:{}|{}, w:{}, s:{})'.format( - self, self._width, self._prec, self._m_sign, self._m_lead0, # type: ignore - self._exp, self._e_width, self._e_sign), file=out) # type: ignore + print( + 'ScalarFloat({}| w:{}, p:{}, s:{}, lz:{}|{}, w:{}, s:{})'.format( + self, + self._width, # type: ignore + self._prec, # type: ignore + self._m_sign, # type: ignore + self._m_lead0, # type: ignore + self._exp, # type: ignore + self._e_width, # type: ignore + self._e_sign, # type: ignore + ), + file=out, + ) class ExponentialFloat(ScalarFloat): |