glm94/calc_engine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed negative number bug in the tokenizer related to open parenthesises.

Browse Source
This commit is contained in:
glm94
2020-04-24 02:45:12 -05:00
parent d93de4d3d6
commit 6a5de8b3e2
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tokenizer.py
+5 -10
View File
@@ -27,19 +27,14 @@ def get_tokens_from_expression_string(expression_string):
elif c == '-' and not parsing_number: elif c == '-' and not parsing_number:
if expression_string[i + 1] == '.' or expression_string[i + 1].isdigit(): if expression_string[i + 1] == '.' or expression_string[i + 1].isdigit():
if token.TokenType.get_operator(tokens[-1].value) == token.TokenType.unknown:#tokens[-1].type == token.TokenType if token.TokenType.get_operator(tokens[-1].value) != token.TokenType.unknown:#tokens[-1].type == token.TokenType
print(tokens[-1].value) #print(tokens[-1].value)
tokens.append(token.Token('+', token.TokenType.add)) #tokens.append(token.Token('+', token.TokenType.add))
parsing_number = True parsing_number = True
tmp = "-" tmp = "-"
'''if tokens[-1].type == token.TokenType.exp_end: elif tokens[-1].type == token.TokenType.exp_start:
tokens.append(token.Token(c, token.TokenType.get_operator(c))) parsing_number = True
parsing_number = False
tmp = ""
else:
#tokens.append(token.Token('+', token.TokenType.add))
tmp = "-" tmp = "-"
parsing_number = True'''
else: else:
tokens.append(token.Token(c, token.TokenType.get_operator(c))) tokens.append(token.Token(c, token.TokenType.get_operator(c)))
parsing_number = False parsing_number = False