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

Updated exceptions to be more fitting, fixed a parse bug in the tokenizer and added the start of the calc engine.

Browse Source
This commit is contained in:
glm94
2020-04-08 00:08:20 -05:00
parent c760dc04b5
commit 528098d913
3 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tokenizer.py
+2 -16
View File
@@ -14,7 +14,7 @@ def get_tokens_from_expression_string(expression_string):
c = expression_string[i]
if c == '.' or c.isdigit():
if tmp.count('.') == 1:
raise ValueError("Invalid grammar, to many periods in number!")
raise SyntaxError("Invalid grammar, to many periods in number. Found at position " + str (i) + ".")
if len(tokens) > 1:
lookBehind = tokens[-1]
if lookBehind.type == token.TokenType.exp_end:
@@ -49,7 +49,7 @@ def get_tokens_from_expression_string(expression_string):
elif c != ' ':
if len(tokens) > 1:
lookBehind = tokens[-1]
if lookBehind.type == TokenType.exp_end:
if lookBehind.type == token.TokenType.exp_end:
tokens.append(token.CToken("^", token.TokenType.power))
if (i + 1) < len(expression_string):
lookAHead = expression_string[i + 1]
@@ -72,17 +72,3 @@ def get_tokens_from_expression_string(expression_string):
return tokens
def operate(n1, n2, tokenType):
if tokenType == token.TokenType.add:
print("Adding %d and %d to get %d." %(n1, n2, n1 + n2))
elif tokenType == token.TokenType.subtract:
print("Subtracting %d and %d to get %d." %(n1, n2, n1 - n2))
elif tokenType == token.TokenType.multiply:
print("Multiplying %d and %d to get %d" %(n1, n2, n1 * n2))
elif tokenType == token.TokenType.divide:
print("Dividing %d and %d to get %d" %(n1, n2, n1 / n2))
elif tokenType == token.TokenType.power:
print("Raising %d to the power of %d to get %d" %(n1, n2, n1**n2))
else:
raise ValueError("Invalid operator value.")