Re-fixed an oversight in the tokenizer dealing with closed parentheses. Minor code clean up on the Calc Engine.

2020-04-24 04:00:58 -05:00
parent 6a5de8b3e2
commit 00bd817a99
2 changed files with 11 additions and 24 deletions
@@ -27,6 +27,7 @@ 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():
+				print(tokens[-1].value)
 				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))
@@ -35,6 +36,10 @@ def get_tokens_from_expression_string(expression_string):
 				elif tokens[-1].type == token.TokenType.exp_start:
 					parsing_number = True
 					tmp = "-"
+				elif 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(c, token.TokenType.get_operator(c)))
 				parsing_number = False