Fix: Rewrite lookfornumber to fix - parsing issue

This commit is contained in:
Bertrand Benjamin 2019-05-08 16:09:00 +02:00
parent 7413a76f8d
commit 5df0b0c21e
2 changed files with 58 additions and 23 deletions

View File

@ -11,7 +11,7 @@ Converting a string with coroutines
"""
from functools import partial
from decimal import Decimal
from decimal import Decimal, InvalidOperation
from .coroutine import *
from .operator import is_operator
from .MO import moify
@ -420,13 +420,13 @@ def lookforNumbers(target):
... str2list.send(i)
Traceback (most recent call last):
...
mapytex.calculus.core.str2.ParsingError: Can't build a number with 2 dots (current is 12.3)
mapytex.calculus.core.str2.ParsingError: Can't build decimal with '12.3'
>>> str2list = lookforNumbers(list_sink)
>>> for i in ".34*67":
... a = str2list.send(i)
Traceback (most recent call last):
...
mapytex.calculus.core.str2.ParsingError: Can't build a number starting with a dot
mapytex.calculus.core.str2.ParsingError: Can't build decimal with ''
>>> str2list = lookforNumbers(list_sink)
>>> for i in "12-34":
@ -468,31 +468,58 @@ def lookforNumbers(target):
int(tok)
except ValueError:
if tok == '.':
if "." in current:
raise ParsingError(f"Can't build a number with 2 dots (current is {current})")
elif not current:
raise ParsingError(f"Can't build a number starting with a dot")
else:
if current.replace("-", "", 1).isdigit():
current += tok
else:
raise ParsingError(f"Can't build decimal with '{current}'")
elif tok == '-':
if current:
if current == "":
current = tok
elif current == ("("):
target_.send(current)
current = "-"
elif is_operator(current):
if current == "-":
current = "+"
else:
target_.send(current)
current = "-"
else:
try:
target_.send(typifiy_numbers(current))
except InvalidOperation:
target_.send(current)
target_.send('+')
current = tok
else:
if current == '-':
target_.send(current)
current = ""
elif current:
target_.send(typifiy_numbers(current))
current = ""
target_.send(tok)
if current == "":
current = tok
elif is_operator(current) and is_operator(tok):
raise ParsingError(f"Can't parse with 2 operators next to each other")
else:
try:
target_.send(typifiy_numbers(current))
except InvalidOperation:
target_.send(current)
current = tok
else:
if current == "":
current = tok
elif current == "-":
current += tok
elif current.replace(".", "", 1).replace("-", "", 1).isdigit():
# make sure no double dotted number can't reach this place!
current += tok
else:
target_.send(current)
current = tok
except STOOOP as err:
if current:
try:
target_.send(typifiy_numbers(current))
except InvalidOperation:
target_.send(current)
yield target_.throw(err)
def typifiy_numbers(number):
@ -681,6 +708,14 @@ def str2(sink, convert_to_mo=True):
> -
| > None
| > a
>>> exp = "a - 3"
>>> t = str2tree(exp)
>>> print(t)
+
> a
> -3
>>> exp = "1-(3+4)"
>>> t = str2tree(exp)
>>> print(t)

View File

@ -218,7 +218,7 @@ class Tree():
>>> Tree.from_any_tree(t)
Traceback (most recent call last):
...
TypeError: Tree can't have empty node or leaf
TypeError: Tree can't have empty node or leaf. Got node = * and right_value = None
>>> t = MutableTree("-", None, 1)
>>> print(t)
-
@ -243,7 +243,7 @@ class Tree():
if node is None or \
right_value is None:
raise TypeError("Tree can't have empty node or leaf")
raise TypeError(f"Tree can't have empty node or leaf. Got node = {node} and right_value = {right_value}")
try:
left_value.IMLEAF