Fixed a grammar check bug in the tokenizer.
This commit is contained in:
@@ -1,27 +1,28 @@
|
||||
import token
|
||||
import tokenizer
|
||||
import expression
|
||||
#import expression
|
||||
import calc_engine
|
||||
import json
|
||||
#import jsonpickle
|
||||
|
||||
#fileLocation = input('File Path to JSON: ')
|
||||
#json = json.loads(open(fileLocation).read())
|
||||
|
||||
|
||||
userInput = input('Enter your formula: ')
|
||||
tokens = tokenizer.get_tokens_from_expression_string(userInput)
|
||||
#userInput = input('Enter your formula: ')
|
||||
tokens = tokenizer.get_tokens_from_expression_string("5000(2(2(1.08^10)-1)/0.08)")
|
||||
#with open("expression.json", "r") as f:
|
||||
# j = json.load(f)
|
||||
# exp = expression.Expression(json.loads(j))
|
||||
# exp = jsonpickle.decode(f.read())
|
||||
#exp = expression.Expression.from_json(json.loads(json.load(f)))
|
||||
# print(exp)
|
||||
#results = calc_engine.calculate_results(tokens.copy())
|
||||
#print(results)
|
||||
results = calc_engine.calculate_results(tokens.copy())
|
||||
print(results)
|
||||
|
||||
tokens = tokenizer.replace_variables(tokens, [23, 46, 89])
|
||||
#tokens = tokenizer.replace_variables(tokens, [23, 46, 89])
|
||||
|
||||
for t in tokens:
|
||||
print("%s (%s) " %(t.value, token.TokenType.get_token_type_name(t.type)), end = "")
|
||||
print()
|
||||
#for t in tokens:
|
||||
# print("%s (%s) " %(t.value, token.TokenType.get_token_type_name(t.type)), end = "")
|
||||
#print()
|
||||
|
||||
|
||||
#def factors(factor_object, starting_point, variable_type)
|
||||
|
||||
Reference in New Issue
Block a user