rework: AST now uses an arena for allocation
For now it works but i dont really like that i use ParseResult, i mean is necessary but i think i will try to make it cleaner so that i can just directly use like parse and pass tath into evaluate, that would require to move the main evaluate funciton into evaluate_tree or something and evaluate takes the arena, uses evaluate_tree and frees the arena, will try that the next commit but for now this version works perfectly.
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
#include "evaluator.h"
|
||||
#include "lexer.h"
|
||||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
|
||||
int64_t evaluate(ASTNode *tree) {
|
||||
if (tree->type == NODE_BINARY_OP) {
|
||||
@@ -9,8 +9,6 @@ int64_t evaluate(ASTNode *tree) {
|
||||
ASTNode *left = tree->data.binary.left;
|
||||
ASTNode *right = tree->data.binary.right;
|
||||
|
||||
free(tree);
|
||||
|
||||
switch (op) {
|
||||
case OP_ADD:
|
||||
return evaluate(left) + evaluate(right);
|
||||
@@ -24,7 +22,6 @@ int64_t evaluate(ASTNode *tree) {
|
||||
}
|
||||
} else {
|
||||
int64_t return_val = tree->data.integer;
|
||||
free(tree);
|
||||
return return_val;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#include "arena.h"
|
||||
#include "evaluator.h"
|
||||
#include "lexer.h"
|
||||
#include "parser.h"
|
||||
@@ -21,8 +22,10 @@ int main(void) {
|
||||
ASTNodeArray context;
|
||||
tokenize(buf, &context);
|
||||
|
||||
AST tree = parse(&context);
|
||||
ParseResult par = parse(&context);
|
||||
AST tree = par.tree;
|
||||
int64_t result = evaluate(tree.head);
|
||||
arena_destroy(par.arena);
|
||||
|
||||
|
||||
printf("El resultado es: %" PRIi64 "\n", result);
|
||||
|
||||
27
src/parser.c
27
src/parser.c
@@ -1,6 +1,7 @@
|
||||
#include "parser.h"
|
||||
#include "lexer.h"
|
||||
#include "arena.h"
|
||||
#include <stdalign.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
@@ -61,19 +62,33 @@ bool ASTNodeSlice_is_valid(ASTNodeSlice *slice) {
|
||||
return true;
|
||||
}
|
||||
|
||||
AST parse(ASTNodeArray *arr) {
|
||||
ParseResult parse(ASTNodeArray *arr) {
|
||||
AST tree;
|
||||
ASTNodeSlice context = {
|
||||
.arr = arr,
|
||||
.pos = 0,
|
||||
};
|
||||
Arena arena = arena_init(sizeof(ASTNode) * arr->len).arena;
|
||||
|
||||
tree.head = parse_expr(&context, 0);
|
||||
return tree;
|
||||
tree.head = parse_expr(&context, &arena, 0);
|
||||
return (ParseResult) {.arena = &arena, .tree = tree};
|
||||
}
|
||||
|
||||
ASTNode *parse_expr(ASTNodeSlice *slice, uint8_t min_bp) {
|
||||
ASTNode *left_side = malloc(sizeof(ASTNode));
|
||||
ASTNode *parse_expr(ASTNodeSlice *slice, Arena *arena, uint8_t min_bp) {
|
||||
arena_ensure_capacity(
|
||||
arena,
|
||||
sizeof(ASTNode),
|
||||
alignof(ASTNode)
|
||||
);
|
||||
|
||||
ASTNode *left_side = arena_unwrap_pointer(
|
||||
arena_alloc(
|
||||
arena,
|
||||
sizeof(ASTNode),
|
||||
alignof(ASTNode)
|
||||
)
|
||||
);
|
||||
|
||||
*left_side = ASTNodeSlice_next(slice);
|
||||
|
||||
while (true) {
|
||||
@@ -90,7 +105,7 @@ ASTNode *parse_expr(ASTNodeSlice *slice, uint8_t min_bp) {
|
||||
}
|
||||
|
||||
ASTNodeSlice_next(slice);
|
||||
ASTNode *right_side = parse_expr(slice, rbp);
|
||||
ASTNode *right_side = parse_expr(slice, arena, rbp);
|
||||
|
||||
ASTNode *new_node = malloc(sizeof(ASTNode));
|
||||
*new_node = operator;
|
||||
|
||||
Reference in New Issue
Block a user