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:
2026-04-13 07:57:36 -06:00
parent fb27e1e34c
commit e4ec102cb9
8 changed files with 46 additions and 16 deletions

View File

@@ -3,6 +3,7 @@ find_package(cmocka REQUIRED)
add_executable(test_nodeArray test_ASTNodeArray.c)
add_executable(test_lexer test_lexer.c)
add_executable(test_parser test_parser.c)
add_executable(test_evaluator test_evaluator.c)
target_link_libraries(test_nodeArray
calculator_lib
@@ -19,6 +20,12 @@ target_link_libraries(test_parser
cmocka::cmocka
)
target_link_libraries(test_evaluator
calculator_lib
cmocka::cmocka
)
add_test(NAME nodeArray_tests COMMAND test_nodeArray)
add_test(NAME lexer_tests COMMAND test_lexer)
add_test(NAME parser_tests COMMAND test_parser)
add_test(NAME evaluator_tests COMMAND test_evaluator)

View File

@@ -16,7 +16,8 @@ static void test_basic_evaluation(void** state) {
ASTNodeArray context;
tokenize(expr, &context);
AST tree = parse(&context);
ParseResult result = parse(&context);
AST tree = result.tree;
uint64_t value = evaluate(tree.head);
assert_int_equal(value, 82);

View File

@@ -1,3 +1,4 @@
#include "arena.h"
#include "lexer.h"
#include "parser.h"
#include <stdarg.h>
@@ -17,7 +18,8 @@ static void test_parsing_basic_expression(void **state) {
assert_int_equal(tokenize(expr, &tokens), LEXER_OK);
assert_int_equal(tokens.len, 7);
AST tree = parse(&tokens);
ParseResult result = parse(&tokens);
AST tree = result.tree;
// Assert head is +
assert_int_equal(tree.head->type, NODE_BINARY_OP);
assert_int_equal(tree.head->data.binary.op, OP_ADD);
@@ -68,6 +70,7 @@ static void test_parsing_basic_expression(void **state) {
tree.head->data.binary.right->data.binary.left->data.binary.left->data.integer,
3
);
arena_destroy(result.arena);
}
int main(void) {