From 6a5de8b3e2b6ed5bcf05401bdd26a6c078bc6655 Mon Sep 17 00:00:00 2001 From: Garritt McCune Date: Fri, 24 Apr 2020 02:45:12 -0500 Subject: [PATCH] Fixed negative number bug in the tokenizer related to open parenthesises. --- tokenizer.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/tokenizer.py b/tokenizer.py index 71c276e..1468910 100644 --- a/tokenizer.py +++ b/tokenizer.py @@ -27,19 +27,14 @@ def get_tokens_from_expression_string(expression_string): elif c == '-' and not parsing_number: 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 - print(tokens[-1].value) - tokens.append(token.Token('+', token.TokenType.add)) + if token.TokenType.get_operator(tokens[-1].value) != token.TokenType.unknown:#tokens[-1].type == token.TokenType + #print(tokens[-1].value) + #tokens.append(token.Token('+', token.TokenType.add)) parsing_number = True tmp = "-" - '''if tokens[-1].type == token.TokenType.exp_end: - tokens.append(token.Token(c, token.TokenType.get_operator(c))) - parsing_number = False - tmp = "" - else: - #tokens.append(token.Token('+', token.TokenType.add)) + elif tokens[-1].type == token.TokenType.exp_start: + parsing_number = True tmp = "-" - parsing_number = True''' else: tokens.append(token.Token(c, token.TokenType.get_operator(c))) parsing_number = False