refactor: evaluator incomplete.
SO, i forgot to implement nud and led correctly and the parser cant tell apart from - as unary and - as binary (+ as well), i need to correct that, move Node * to TreeResult so to use NodeResult with nud and led
This commit is contained in:
@@ -2,36 +2,97 @@
|
||||
#include "arena.h"
|
||||
#include "lexer.h"
|
||||
#include "parser.h"
|
||||
#include <stdbool.h>
|
||||
#include <stdint.h>
|
||||
#include <math.h>
|
||||
|
||||
|
||||
int64_t evaluate_tree(ASTNode *tree) {
|
||||
EvaluatorResult evaluate_tree(Node *tree) {
|
||||
if (tree->type == NODE_BINARY_OP) {
|
||||
Operator op = tree->data.binary.op;
|
||||
ASTNode *left = tree->data.binary.left;
|
||||
ASTNode *right = tree->data.binary.right;
|
||||
Operator op = tree->binary.op;
|
||||
Node *left = tree->binary.left;
|
||||
Node *right = tree->binary.right;
|
||||
|
||||
switch (op) {
|
||||
case OP_ADD:
|
||||
return evaluate_tree(left) + evaluate_tree(right);
|
||||
case OP_SUB:
|
||||
return evaluate_tree(left) - evaluate_tree(right);
|
||||
case OP_MUL:
|
||||
return evaluate_tree(left) * evaluate_tree(right);
|
||||
case OP_DIV:
|
||||
return evaluate_tree(left) / evaluate_tree(right);
|
||||
case OP_POW:
|
||||
return pow(evaluate_tree(left), evaluate_tree(right));
|
||||
case OP_ADD: {
|
||||
EvaluatorResult left_result = evaluate_tree(left);
|
||||
EvaluatorResult right_result = evaluate_tree(right);
|
||||
if (!left_result.is_valid || !right_result.is_valid) {
|
||||
return left_result;
|
||||
}
|
||||
return (EvaluatorResult) {
|
||||
.is_valid = true,
|
||||
.val = left_result.val + right_result.val,
|
||||
};
|
||||
}
|
||||
case OP_SUB: {
|
||||
EvaluatorResult left_result = evaluate_tree(left);
|
||||
EvaluatorResult right_result = evaluate_tree(right);
|
||||
if (!left_result.is_valid || !right_result.is_valid) {
|
||||
return left_result;
|
||||
}
|
||||
return (EvaluatorResult) {
|
||||
.is_valid = true,
|
||||
.val = left_result.val - right_result.val,
|
||||
};
|
||||
}
|
||||
case OP_MUL: {
|
||||
EvaluatorResult left_result = evaluate_tree(left);
|
||||
EvaluatorResult right_result = evaluate_tree(right);
|
||||
if (!left_result.is_valid || !right_result.is_valid) {
|
||||
return left_result;
|
||||
}
|
||||
return (EvaluatorResult) {
|
||||
.is_valid = true,
|
||||
.val = left_result.val * right_result.val,
|
||||
};
|
||||
}
|
||||
case OP_DIV: {
|
||||
EvaluatorResult left_result = evaluate_tree(left);
|
||||
EvaluatorResult right_result = evaluate_tree(right);
|
||||
if (!left_result.is_valid || !right_result.is_valid) {
|
||||
return left_result;
|
||||
}
|
||||
return (EvaluatorResult) {
|
||||
.is_valid = true,
|
||||
.val = left_result.val / right_result.val,
|
||||
};
|
||||
}
|
||||
case OP_POW: {
|
||||
EvaluatorResult left_result = evaluate_tree(left);
|
||||
EvaluatorResult right_result = evaluate_tree(right);
|
||||
if (!left_result.is_valid || !right_result.is_valid) {
|
||||
return left_result;
|
||||
}
|
||||
return (EvaluatorResult) {
|
||||
.is_valid = true,
|
||||
.val = pow(left_result.val, right_result.val),
|
||||
};
|
||||
}
|
||||
default:
|
||||
return (EvaluatorResult) {
|
||||
.is_valid = false,
|
||||
.err = EVALUATOR_INVALID_TREE,
|
||||
};
|
||||
}
|
||||
} else if (tree->type == NODE_UNARY_OP) {
|
||||
|
||||
}
|
||||
|
||||
int64_t return_val = tree->data.integer;
|
||||
return return_val;
|
||||
}
|
||||
|
||||
int64_t evaluate(ParseResult context) {
|
||||
int64_t result = evaluate_tree(context.tree);
|
||||
EvaluatorResult evaluate(ParseResult context) {
|
||||
if (!context.is_valid) {
|
||||
return (EvaluatorResult) {
|
||||
.is_valid = false,
|
||||
.err = EVALUATOR_INVALID_PARSING,
|
||||
};
|
||||
}
|
||||
|
||||
EvaluatorResult result = evaluate_tree(context.tree);
|
||||
|
||||
arena_destroy(&context.arena);
|
||||
|
||||
return result;
|
||||
|
||||
Reference in New Issue
Block a user