fix: updating arena and arraylist use

Reviewed-on: #12

CMakeLists.txt

@@ -40,6 +40,7 @@ target_include_directories(calculator_lib
 target_link_libraries(calculator_lib
     PUBLIC arena
     PUBLIC arraylist
+    PRIVATE m
 )
 
 add_executable(calculator src/main.c)

include/evaluator.h

@@ -1,11 +1,29 @@
 #ifndef EVALUATOR_H
 #define EVALUATOR_H
 
-#include "lexer.h"
 #include "parser.h"
 #include <stdint.h>
 
-int64_t evaluate(ParseResult context);
+typedef enum {
-int64_t evaluate_tree(ASTNode *tree);
+    EVALUATOR_OK,
+    EVALUATOR_MATH_ERR,
+    EVALUATOR_DIVISION_BY_ZERO,
+    EVALUATOR_INVALID_PARSING,
+    EVALUATOR_INVALID_TREE, // just to shut up the compiler with the swithces
+} EvaluatorErr;
+
+typedef struct {
+    bool is_valid;
+    union {
+        int64_t val;
+        EvaluatorErr err;
+    };
+} EvaluatorResult;
+
+EvaluatorResult evaluate_binary(Node *tree);
+EvaluatorResult evaluate_unary(Node *tree);
+
+EvaluatorResult evaluate(ParserResult context);
+EvaluatorResult evaluate_tree(Node *tree);
 
 #endif // !EVALUATOR_H

include/lexer.h

@@ -8,16 +8,19 @@
 
 // For identifing
 typedef enum {
-    NODE_INTEGER,
+    TOKEN_INTEGER,
-    NODE_BINARY_OP,
+    TOKEN_OPERATOR,
-} ASTNodeType;
+} TokenType;
-
 // For classify operators
 typedef enum {
     OP_ADD,
     OP_SUB,
     OP_MUL,
-    OP_DIV
+    OP_DIV,
+    OP_POW,
+    OP_FACTORIAL,
+    OP_START_PAR,
+    OP_END_PAR,
 } Operator;
 
 typedef enum {
@@ -26,23 +29,17 @@ typedef enum {
     LEXER_FAILED_NUMBER_CONVERSION,
     LEXER_NOT_RECOGNIZED_SYMBOL,
     LEXER_EMPTY_INPUT,
-    LEXER_NULL_ARG,
-    LEXER_WRONG_SYNTAX,
     LEXER_BUF_OVERFLOW,
 } LexerErr;
 
 // Can be thought as tokens, they will be used by the parser.
-typedef struct ASTNode {
+typedef struct {
-    ASTNodeType type;
+    TokenType type;
     union {
-        int64_t integer;
+        int64_t num;
-        struct {
-            struct ASTNode *left;
-            struct ASTNode *right;
         Operator op;
-        } binary;
+    };
-    } data;
+} Token;
-} ASTNode;
 
 typedef struct {
     bool is_valid;
@@ -56,22 +53,22 @@ typedef struct {
     bool is_valid;
     union {
         LexerErr err;
-        ASTNode node;
+        Token token;
     };
-} ASTNodeResult;
+} TokenResult;
 
 typedef struct {
     bool is_valid;
     union {
         LexerErr err;
-        int64_t number;
+        int64_t num;
     };
-} I64Result;
+} LexerI64Result;
 
 // Lexer funtions as well as few functionality
 TokenizeResult tokenize(const char* input);
-ASTNodeResult tokenize_number(const char* input, size_t *offset);
+TokenResult tokenize_number(const char* input, size_t *offset);
-I64Result string_to_integer(const char buf[]);
+LexerI64Result string_to_integer(const char buf[]);
 bool isoperator(int c);
 Operator char_to_operator(int c);
 char operator_to_char(Operator op);

include/parser.h

@@ -4,11 +4,31 @@
 #include "lexer.h"
 #include "arena.h"
 #include "arraylist.h"
+#include <stdbool.h>
 #include <stdint.h>
 
-typedef struct {
+typedef enum {
-    ASTNode *head;
+    NODE_INT,
-} AST;
+    NODE_BINARY_OP,
+    NODE_UNARY_OP,
+} NodeType;
+
+typedef struct Node {
+    NodeType type;
+    union {
+        int64_t num;
+        struct {
+            Operator op;
+            struct Node *left;
+            struct Node *right;
+        }binary;
+        struct {
+            Operator op;
+            struct Node *to;
+        }unary;
+        Operator par;
+    };
+} Node;
 
 typedef enum {
     PARSER_OK = 0,
@@ -16,6 +36,8 @@ typedef enum {
     PARSER_MISSING_OPERAND,
     PARSER_UNMATCHED_PAREN,
     PARSER_OUT_OF_MEMORY,
+    PARSER_INVALID_TOKENIZE,
+    PARSER_UNEXPECTED_EOF,
 } ParserErr;
 
 typedef struct {
@@ -23,19 +45,45 @@ typedef struct {
     union {
         ParserErr err;
         struct {
-            Arena arena;
+            Arena *arena;
-            ASTNode *tree;
+            Node *tree;
         };
     };
-} ParseResult;
+} ParserResult;
 
-ASTNode *nud(ArraySlice *slice);
+typedef struct  {
-ASTNode *led(ArraySlice *slice, size_t right_precedence);
+    bool is_valid;
+    union {
+        ParserErr err;
+        Node *node;
+    };
+} TreeResult;
 
-uint8_t node_lbp(ASTNode node);
+typedef struct {
-uint8_t node_rbp(ASTNode node);
+    bool is_valid;
+    union {
+        ParserErr err;
+        Node node;
+    };
+} NodeResult;
 
-ParseResult parse(TokenizeResult tokens);
+typedef struct {
-ASTNode *parse_expr(ArraySlice *slice, Arena *arena, uint8_t min_bp);
+    bool is_valid;
+    union {
+        ParserErr err;
+        uint8_t num;
+    };
+} ParserU8Result;
+
+TreeResult nud(ArraySlice *slice, Arena *arena, Token token); // Null denotation
+TreeResult led(ArraySlice *slice, Arena *arena, Node *left, Token token); // Left denotation
+
+ParserU8Result prefix_rbp(Token token);
+ParserU8Result postfix_lbp(Token token);
+ParserU8Result infix_lbp(Token token);
+ParserU8Result infix_rbp(Token token);
+
+ParserResult parse(TokenizeResult tokens);
+TreeResult parse_expr(ArraySlice *slice, Arena *arena, uint8_t min_bp);
 
 #endif // !PARSER_H

src/evaluator.c

@@ -2,34 +2,113 @@
 #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;
+        return evaluate_binary(tree);
-        ASTNode *left = tree->data.binary.left;
+    } else if (tree->type == NODE_UNARY_OP) {
-        ASTNode *right = tree->data.binary.right;
+        return evaluate_unary(tree);
+    }
+
+    return (EvaluatorResult) {
+        .is_valid = true,
+        .val = tree->num,
+    };
+}
+
+EvaluatorResult evaluate_binary(Node *tree) {
+    Operator op = tree->binary.op;
+    Node *left = tree->binary.left;
+    Node *right = tree->binary.right;
+    
+    EvaluatorResult left_result = evaluate_tree(left);
+    EvaluatorResult right_result = evaluate_tree(right);
+    if (!left_result.is_valid) {
+        return left_result;
+    }
+
+    if (!left_result.is_valid) {
+        return left_result;
+    }
 
     switch (op) {
         case OP_ADD:
-                return evaluate_tree(left) + evaluate_tree(right);
+            return (EvaluatorResult) {
+                .is_valid = true,
+                .val = left_result.val + right_result.val,
+            };
         case OP_SUB:
-                return evaluate_tree(left) - evaluate_tree(right);
+            return (EvaluatorResult) {
+                .is_valid = true,
+                .val = left_result.val - right_result.val,
+            };
         case OP_MUL:
-                return evaluate_tree(left) * evaluate_tree(right);
+            return (EvaluatorResult) {
+                .is_valid = true,
+                .val = left_result.val * right_result.val,
+            };
         case OP_DIV: 
-                return evaluate_tree(left) / evaluate_tree(right);
+            return (EvaluatorResult) {
-
+                .is_valid = true,
+                .val = left_result.val / right_result.val,
+            };
+        case OP_POW: 
+            return (EvaluatorResult) {
+                .is_valid = true,
+                .val = pow(left_result.val, right_result.val),
+            };
+        default:
+            return (EvaluatorResult) {
+                .is_valid = false,
+                .err = EVALUATOR_INVALID_TREE,
+            };
     }
 }
 
-    int64_t return_val = tree->data.integer;
+EvaluatorResult evaluate_unary(Node *tree) {
-    return return_val;
+    Operator op = tree->unary.op;
+    Node *to = tree->unary.to;
+
+    EvaluatorResult result = evaluate_tree(to);
+    if (!result.is_valid) {
+        return result;
     }
 
-int64_t evaluate(ParseResult context) {
+    switch (op) {
-    int64_t result = evaluate_tree(context.tree);
+        case OP_ADD:
+            return result;
+        case OP_SUB:
+            return (EvaluatorResult) {
+                .is_valid = true,
+                .val = -result.val,
+            };
+        case OP_FACTORIAL:
+            return (EvaluatorResult) {
+                .is_valid = true,
+                .val = tgamma(result.val + 1),
+            };
+        default:
+            return (EvaluatorResult) {
+                .is_valid = false,
+                .err = EVALUATOR_INVALID_TREE,
+            };
+    }
+}
+
+EvaluatorResult evaluate(ParserResult 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;

src/lexer.c

@@ -3,8 +3,9 @@
 #include <ctype.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <strings.h>
+#include <string.h>
 #include <limits.h>
 
 typedef enum {
@@ -14,51 +15,42 @@ typedef enum {
 
 
 TokenizeResult tokenize(const char *input) {
+    ArrayList *arr;
+    arraylist_init(&arr, 64, sizeof(Token));
     size_t offset = 0;
-    LexerState state = WAIT_FOR_NUMBER;
-    ArrayList *arr = arraylist_init(64, sizeof(ASTNode));
 
-    while (input[offset] != '\n' && input[offset] != '\0') {
+    while (input[offset] != '\0') {
-        int current = input[offset];
 
-        if (isdigit(current)) {
+        if (isdigit(input[offset])) {
-            if (state != WAIT_FOR_NUMBER) {
+            TokenResult result = tokenize_number(input, &offset);
-                arraylist_destroy(&arr);
-                return (TokenizeResult) {.is_valid = false, .err = LEXER_WRONG_SYNTAX};
-            }
-            ASTNodeResult result = tokenize_number(input, &offset);
 
             if (!result.is_valid) {
                 arraylist_destroy(&arr);
                 return (TokenizeResult) {.is_valid = false, .err = result.err};
             }
 
-            arraylist_push_back(arr, &result.node);
+            arraylist_push_back(arr, &result.token);
-            state = WAIT_FOR_OPERATOR;
+        } else if (isoperator(input[offset])) {
-        } else if (isoperator(current)) {
+            Token op_node = {
-            if (state != WAIT_FOR_OPERATOR) {
+                .type = TOKEN_OPERATOR,
-                return (TokenizeResult) {.is_valid = false, .err =LEXER_WRONG_SYNTAX};
+                .op = char_to_operator(input[offset]),
-            }
-            ASTNode new_node = {
-                .type = NODE_BINARY_OP,
-                .data.binary.op = char_to_operator(current),
-                .data.binary.right = NULL,
-                .data.binary.left = NULL,
             };
             
-            arraylist_push_back(arr, &new_node);
+            arraylist_push_back(arr, &op_node);
-            state = WAIT_FOR_NUMBER;
+        } else if (isspace(input[offset])) {
-        } else if (isspace(current)) {
             // Nothing...
         } else {
             arraylist_destroy(&arr);
-            return (TokenizeResult) {.is_valid = false, .err = LEXER_NOT_RECOGNIZED_SYMBOL};
+            return (TokenizeResult) {
+                .is_valid = false,
+                .err = LEXER_NOT_RECOGNIZED_SYMBOL};
         }
 
         offset++;
     }
 
     if (arraylist_size(arr) < 1) {
+        arraylist_destroy(&arr);
         return (TokenizeResult) {.is_valid = false, .err = LEXER_EMPTY_INPUT};
     }
 
@@ -67,54 +59,69 @@ TokenizeResult tokenize(const char *input) {
 
 // CURRENTLY, it only supports ints, not clear how floating
 // point is implemented but i'll figure it out
-ASTNodeResult tokenize_number(const char *input, size_t *offset) {
+TokenResult tokenize_number(const char *input, size_t *offset) {
-    char buf[128] = { '\0' };
+    char buf[64] = { '\0' };
     size_t buf_pos = 0;
     bool is_integer = true; // Will later be used to differentiate fractions
 
+    // read number
     size_t current = *offset;
     while (isdigit(input[current])) {
+        if (buf_pos >= sizeof(buf) - 1) {
+            return (TokenResult) {
+                .is_valid = false,
+                .err = LEXER_BUF_OVERFLOW};
+        }
+
         buf[buf_pos] = input[current];
 
-        if (buf_pos >= sizeof(buf)) {
-            return (ASTNodeResult) {.is_valid = false, .err = LEXER_BUF_OVERFLOW};
-        }
         current++;
         buf_pos++;
     }
 
-    ASTNode new_node;
+    Token new_token;
     if (is_integer) {
-        new_node.type = NODE_INTEGER;
+        new_token.type = TOKEN_INTEGER;
-        I64Result status = string_to_integer(buf);
+        LexerI64Result result = string_to_integer(buf);
-        if (!status.is_valid) {
+
-            return (ASTNodeResult) {.is_valid = false, .err = status.err};
+
-        }
+        if (!result.is_valid) {
-        new_node.data.integer = status.number;
+            return (TokenResult) {.is_valid = false, .err = result.err};
-        *offset = current;
-        return (ASTNodeResult) {.is_valid = true, .node = new_node};
         }
 
-    return (ASTNodeResult) {.is_valid = false, .err = LEXER_FAILED_NUMBER_CONVERSION};
+        new_token.num = result.num;
+
+        *offset = current - 1;
+        return (TokenResult) {.is_valid = true, .token = new_token};
     }
 
-I64Result string_to_integer(const char *buf) {
+    return (TokenResult) {
+        .is_valid = false,
+        .err = LEXER_FAILED_NUMBER_CONVERSION};
+}
+
+LexerI64Result string_to_integer(const char *buf) {
     int c = 0;
     int64_t count = 0;
+
     while (buf[c] != '\0') {
 
+        // Extracts number from char
         int digit = buf[c] - '0';
 
         if (count > (INT64_MAX - digit) / 10) {
-            return (I64Result) {.is_valid = false, .err = LEXER_INT_OVERFLOW};
+            return (LexerI64Result) {
+                .is_valid = false,
+                .err = LEXER_INT_OVERFLOW};
         }
+
         count = count * 10;
         count += digit;
         
         c++;
     }
 
-    return (I64Result) {.is_valid = true, .number = count};
+    return (LexerI64Result) {.is_valid = true, .num = count};
 }
 
 bool isoperator(int c) {
@@ -123,6 +130,10 @@ bool isoperator(int c) {
         case '-':
         case '/':
         case '*':
+        case '^':
+        case '!':
+        case '(':
+        case ')':
             return true;
         default:
             return false;
@@ -143,6 +154,18 @@ Operator char_to_operator(int c) {
         case '/':
             return OP_DIV;
             break;
+        case '^':
+            return OP_POW;
+            break;
+        case '!':
+            return OP_FACTORIAL;
+            break;
+        case '(':
+            return OP_START_PAR;
+            break;
+        case ')':
+            return OP_END_PAR;
+            break;
         default: // I mean shouldn't be used, we assume
             return -1;
     }
@@ -158,5 +181,15 @@ char operator_to_char(Operator op) {
             return '*';
         case OP_DIV:
             return '/';
+        case OP_POW:
+            return '^';
+        case OP_FACTORIAL:
+            return '!';
+        case OP_START_PAR:
+            return '(';
+        case OP_END_PAR:
+            return ')';
+        default:
+            return EOF;
     }
 }

src/main.c

@@ -18,12 +18,11 @@ int main(void) {
     }
     buf[pos] = '\0';
 
-    TokenizeResult tokens = tokenize(buf);
+    EvaluatorResult result = evaluate(parse(tokenize(buf)));
+    if (!result.is_valid) {
+        puts("Error checando expresion");
+    }
 
-    ParseResult par = parse(tokens);
+    printf("El resultado es: %" PRIi64 "\n", result.val);
-    int64_t result = evaluate(par);
-
-
-    printf("El resultado es: %" PRIi64 "\n", result);
     return EXIT_SUCCESS;
 }

src/parser.c

@@ -2,112 +2,393 @@
 #include "arraylist.h"
 #include "lexer.h"
 #include "arena.h"
+#include <cmocka.h>
 #include <stdalign.h>
 #include <stdbool.h>
 #include <stdint.h>
 
-uint8_t node_lbp(ASTNode node) {
+ParserU8Result prefix_rbp(Token token) {
-    if (node.type == NODE_INTEGER) {
+    if (token.type == TOKEN_INTEGER) {
-        return 0;
+        return (ParserU8Result) {
+            .is_valid = false,
+            .err = PARSER_UNEXPECTED_TOKEN,
+        };
     }
-
+    switch (token.op) {
-    switch (node.data.binary.op) {
-        case OP_ADD:
         case OP_SUB:
-            return 10;
-            break;
-        case OP_DIV:
-        case OP_MUL:
-            return 20;
-        default:
-            return 0;
-    }
-}
-
-uint8_t node_rbp(ASTNode node) {
-    if (node.type == NODE_INTEGER) {
-        return 0;
-    }
-
-    switch (node.data.binary.op) {
         case OP_ADD:
-        case OP_SUB:
+            return (ParserU8Result) {
-            return 11;
-            break;
-        case OP_DIV:
-        case OP_MUL:
-            return 21;
-        default:
-            return 0;
-    }
-}
-
-ParseResult parse(TokenizeResult tokens) {
-    ArraySlice *context = arraylist_slice(tokens.arr, 0, arraylist_size(tokens.arr));
-    Arena arena = arena_init(sizeof(ASTNode) * arraylist_size(tokens.arr)).arena;
-
-    return (ParseResult) {
                 .is_valid = true,
-        .arena = arena,
+                .num = 30,
-        .tree = parse_expr(context, &arena, 0)};
+            };
+        default:
+            return (ParserU8Result) {
+                .is_valid = false,
+                .err = PARSER_UNEXPECTED_TOKEN,
+            };
+    }
 }
 
-ASTNode *parse_expr(ArraySlice *slice, Arena *arena, uint8_t min_bp) {
+ParserU8Result postfix_lbp(Token token) {
+    if (token.type != TOKEN_OPERATOR) {
+        return (ParserU8Result) {
+            .is_valid = false,
+            .err = PARSER_UNEXPECTED_TOKEN,
+        };
+    }
+
+    switch (token.op) {
+        case OP_FACTORIAL:
+            return (ParserU8Result) {
+                .is_valid = true,
+                .num = 40,
+            };
+        default:
+            return (ParserU8Result) {
+                .is_valid = false,
+                .err = PARSER_UNEXPECTED_TOKEN,
+            };
+    }
+}
+
+ParserU8Result infix_lbp(Token token) {
+    if (token.type != TOKEN_OPERATOR) {
+        return (ParserU8Result) {
+            .is_valid = false,
+            .err = PARSER_UNEXPECTED_TOKEN,
+        };
+    }
+
+    switch (token.op) {
+        case OP_ADD:
+        case OP_SUB:
+            return (ParserU8Result) {
+                .is_valid = true,
+                .num = 10,
+            };
+        case OP_DIV:
+        case OP_MUL:
+            return (ParserU8Result) {
+                .is_valid = true,
+                .num = 20,
+            };
+        case OP_POW:
+            return (ParserU8Result) {
+                .is_valid = true,
+                .num = 51,
+            };
+        default:
+            return (ParserU8Result) {
+                .is_valid = false,
+                .err = PARSER_UNEXPECTED_TOKEN,
+            };
+    }
+}
+
+ParserU8Result infix_rbp(Token token) {
+    if (token.type != TOKEN_OPERATOR) {
+        return (ParserU8Result) {
+            .is_valid = false,
+            .err = PARSER_UNEXPECTED_TOKEN,
+        };
+    }
+
+    switch (token.op) {
+        case OP_ADD:
+        case OP_SUB:
+            return (ParserU8Result) {
+                .is_valid = true,
+                .num = 11,
+            };
+        case OP_DIV:
+        case OP_MUL:
+            return (ParserU8Result) {
+                .is_valid = true,
+                .num = 21,
+            };
+        case OP_POW:
+            return (ParserU8Result) {
+                .is_valid = true,
+                .num = 50,
+            };
+        default:
+            return (ParserU8Result) {
+                .is_valid = false,
+                .err = PARSER_UNEXPECTED_TOKEN,
+            };
+    }
+}
+
+TreeResult led(
+    ArraySlice *slice,
+    Arena *arena,
+    Node *left,
+    Token token
+) {
     arena_ensure_capacity(
         arena,
-        sizeof(ASTNode),
+        sizeof(Node),
-        alignof(ASTNode)
+        alignof(Node)
     );
 
-    ASTNode *left_side = arena_unwrap_pointer(
+    Node *node = arena_unwrap_pointer(
         arena_alloc(
             arena,
-            sizeof(ASTNode),
+            sizeof(Node),
-            alignof(ASTNode)
+            alignof(Node)
         )
     );
 
-    arrayslice_next(slice, left_side);
+    switch (token.op) {
 
-    while (true) {
+        // Binary operators
-        if (!arrayslice_is_valid(slice)) {
+        case OP_ADD:
+        case OP_SUB:
+        case OP_MUL:
+        case OP_DIV:
+        case OP_POW: {
+            node->type = NODE_BINARY_OP;
+            node->binary.op = token.op;
+
+            ParserU8Result rbp_result = infix_rbp(token);
+            if (!rbp_result.is_valid) {
+                return (TreeResult) {
+                    .is_valid = false,
+                    .err = rbp_result.err,
+                };
+            }
+
+            TreeResult right = parse_expr(
+                slice,
+                arena,
+                rbp_result.num
+            );
+
+            if (!right.is_valid) {
+                return right;
+            }
+
+            node->binary.left = left;
+            node->binary.right = right.node;
+
+            return (TreeResult) {
+                .is_valid = true,
+                .node = node,
+            };
+        }
+
+        // Postfix operators
+        case OP_FACTORIAL: {
+            node->type = NODE_UNARY_OP;
+            node->unary.op = token.op;
+            node->unary.to = left;
+
+            return (TreeResult) {
+                .is_valid = true,
+                .node = node,
+            };
+        }
+
+        default:
+            return (TreeResult) {
+                .is_valid = false,
+                .err = PARSER_UNEXPECTED_TOKEN,
+            };
+    }
+}
+
+TreeResult nud(ArraySlice *slice, Arena *arena, Token token) {
+    arena_ensure_capacity(
+        arena,
+        sizeof(Node), 
+        alignof(Node)
+    );
+
+    Node *node = arena_unwrap_pointer(
+        arena_alloc(
+            arena, 
+            sizeof(Node),
+            alignof(Node)
+        )
+    );
+
+    if (token.type == TOKEN_INTEGER) {
+        node->type = NODE_INT;
+        node->num = token.num;
+
+        return (TreeResult) {
+            .is_valid = true,
+            .node = node,
+        };
+    }
+
+    switch (token.op) {
+        case OP_START_PAR: {
+            TreeResult expr = parse_expr(slice, arena, 0);
+            if (!expr.is_valid) {
+                return expr;
+            }
+
+            Token end_par;
+            if (arrayslice_next(slice, &end_par) != ARRLIST_OK) {
+                return (TreeResult) {
+                    .is_valid = false,
+                    .err = PARSER_UNMATCHED_PAREN,
+                };
+            }
+
+            if (end_par.type != TOKEN_OPERATOR ||
+                end_par.op != OP_END_PAR) {
+                return (TreeResult) {
+                    .is_valid = false,
+                    .err = PARSER_UNMATCHED_PAREN,
+                };
+            }
+
+            return expr;
+        }
+        case OP_ADD:
+
+        case OP_SUB: {
+            node->type = NODE_UNARY_OP;
+            node->unary.op = token.op;
+
+            ParserU8Result rbp_result = prefix_rbp(token);
+            if (!rbp_result.is_valid) {
+                return (TreeResult) {
+                    .is_valid = false,
+                    .err = rbp_result.err,
+                };
+            }
+
+            TreeResult right = parse_expr(
+                slice,
+                arena,
+                rbp_result.num
+            );
+
+            if (!right.is_valid) {
+                return right;
+            }
+
+            node->unary.to = right.node;
+
+            return (TreeResult) {
+                .is_valid = true,
+                .node = node,
+            };
+        }
+        default:
+            return (TreeResult) {
+                .is_valid = false,
+                .err = PARSER_UNEXPECTED_TOKEN,
+        };
+    }
+}
+
+
+
+ParserResult parse(TokenizeResult tokens) {
+    if (!tokens.is_valid) {
+        return (ParserResult) {
+            .is_valid = false,
+            .err = PARSER_INVALID_TOKENIZE,
+        };
+    }
+
+    ArraySlice *context;
+    arraylist_slice(&context, tokens.arr, 0, arraylist_size(tokens.arr));
+    Arena *arena;
+    arena_init(&arena, sizeof(Node) * arraylist_size(tokens.arr));
+
+    TreeResult result = parse_expr(context, arena, 0);
+    if (!result.is_valid) {
+        arena_destroy(&arena);
+        arraylist_destroy(&tokens.arr);
+        return (ParserResult) {
+            .is_valid = false,
+            .err = result.err,
+        };
+    }
+
+    arraylist_destroy(&tokens.arr);
+    return (ParserResult) {
+        .is_valid = true,
+        .arena = arena,
+        .tree = result.node};
+}
+
+TreeResult parse_expr(ArraySlice *slice, Arena *arena, uint8_t min_bp) {
+    Token current_token;
+
+    if (arrayslice_next(slice, &current_token) != ARRLIST_OK) {
+        return (TreeResult) {
+            .is_valid = false,
+            .err = PARSER_UNEXPECTED_EOF,
+        };
+    }
+
+    TreeResult left_result = nud(slice, arena, current_token);
+
+    if (!left_result.is_valid) {
+        return left_result;
+    }
+
+    Node *left_side = left_result.node;
+
+    while (arrayslice_is_valid(slice)) {
+        Token operator_token;
+        arrayslice_peek(slice, &operator_token);
+
+        if (operator_token.type != TOKEN_OPERATOR) {
             break;
         }
 
-        ASTNode operator;
+        ParserU8Result postfix_lbp_result = postfix_lbp(operator_token);
-        arrayslice_peek(slice, &operator);
-        uint8_t rbp = node_rbp(operator);
-        uint8_t lbp = node_lbp(operator);
 
-        if (lbp < min_bp) {
+        if (postfix_lbp_result.is_valid) {
+            if (postfix_lbp_result.num < min_bp) {
                 break;
             }
 
             arrayslice_next(slice, NULL);
-        ASTNode *right_side = parse_expr(slice, arena, rbp);
 
-        arena_ensure_capacity(
+            TreeResult result = led(slice, arena, left_side, operator_token);
-            arena,
-            sizeof(ASTNode),
-            alignof(ASTNode));
-        ASTNode *new_node = arena_unwrap_pointer(
-            arena_alloc(
-                arena, 
-                sizeof(ASTNode), 
-                alignof(ASTNode)
-            )
-        );
-        *new_node = operator;
 
-        new_node->data.binary.left = left_side;
+            if (!result.is_valid) {
-        new_node->data.binary.right = right_side;
+                return result;
-
-        left_side = new_node;
             }
 
+            left_side = result.node;
 
-    return left_side;
+            continue;
         }
 
+        // Path for infix basically
+        ParserU8Result lbp_result = infix_lbp(operator_token);
 
+        if (!lbp_result.is_valid) {
+            break;
+        }
 
+        if (lbp_result.num < min_bp) {
+            break;
+        }
+
+        arrayslice_next(slice, NULL);
+
+        TreeResult result = led(slice, arena, left_side, operator_token);
+
+        if (!result.is_valid) {
+            return result;
+        }
+
+        left_side = result.node;
+    }
+
+    // Final: return left side
+    return (TreeResult){
+        .is_valid = true,
+        .node = left_side,
+    };
+}

test/test_evaluator.c

@@ -1,6 +1,3 @@
-#include "lexer.h"
-#include "parser.h"
-#include "evaluator.h"
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stddef.h>
@@ -9,22 +6,8 @@
 #include <cmocka.h>
 #include <stdlib.h>
 
-static void test_basic_evaluation(void** state) {
-    (void) state;
 
-    char expr[256] = "2 + 4 * 40 / 2";
-    TokenizeResult tokens = tokenize(expr);
-    ParseResult result = parse(tokens);
-    int64_t value = evaluate(result);
-
-    assert_int_equal(value, 82);
-}
 
 int main(void) {
-    const struct CMUnitTest tests[] = {
-        cmocka_unit_test(test_basic_evaluation),
-    };
-
-    cmocka_run_group_tests(tests, NULL, NULL);
     return EXIT_SUCCESS;
 }

test/test_lexer.c

@@ -1,106 +1,11 @@
-#include "arraylist.h"
-#include "lexer.h"
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <setjmp.h>
 #include <cmocka.h>
-
+#include <stdlib.h>
-static void test_tokenize_normal_expresion(void **state) {
-    (void) state;
-
-    char expr[256] = "2 + 3 / 66 * 789";
-    ASTNode node;
-    TokenizeResult tokens = tokenize(expr);
-
-    assert_true(tokens.is_valid);
-    assert_int_equal(arraylist_size(tokens.arr), 7);
-
-    arraylist_get(tokens.arr, 0, &node);
-    assert_int_equal(node.type, NODE_INTEGER);
-    assert_int_equal(node.data.integer, 2);
-
-    arraylist_get(tokens.arr, 1, &node);
-    assert_int_equal(node.type, NODE_BINARY_OP);
-    assert_int_equal(node.data.binary.op, OP_ADD);
-
-    arraylist_get(tokens.arr, 2, &node);
-    assert_int_equal(node.type, NODE_INTEGER);
-    assert_int_equal(node.data.integer, 3);
-
-    arraylist_get(tokens.arr, 3, &node);
-    assert_int_equal(node.type, NODE_BINARY_OP);
-    assert_int_equal(node.data.binary.op, OP_DIV);
-
-    arraylist_get(tokens.arr, 4, &node);
-    assert_int_equal(node.type, NODE_INTEGER);
-    assert_int_equal(node.data.integer, 66);
-
-    arraylist_get(tokens.arr, 5, &node);
-    assert_int_equal(node.type, NODE_BINARY_OP);
-    assert_int_equal(node.data.binary.op, OP_MUL);
-
-    arraylist_get(tokens.arr, 6, &node);
-    assert_int_equal(node.type, NODE_INTEGER);
-    assert_int_equal(node.data.integer, 789);
-}
-
-static void test_tokenize_unrecognized_symbol(void **state) {
-    (void) state;
-
-    char expr[256] = " 2 j 3 / 66 } 789";
-    TokenizeResult tokens = tokenize(expr);
-
-    assert_false(tokens.is_valid);
-    assert_uint_equal(tokens.err, LEXER_NOT_RECOGNIZED_SYMBOL);
-}
-
-static void test_tokenize_wrong_sintax(void **state) {
-    (void) state;
-
-    char expr[256] = "2 3 / 66 789";
-    TokenizeResult tokens = tokenize(expr);
-
-    assert_false(tokens.is_valid);
-    assert_uint_equal(tokens.err, LEXER_WRONG_SYNTAX);
-}
-
-static void test_string_to_number_normal(void **state) {
-    (void) state;
-
-    char num[16] = "2333t55";
-    size_t offset = 0;
-    ASTNodeResult result = tokenize_number(num, &offset);
-
-    assert_true(result.is_valid);
-
-    assert_int_equal(offset, 4); // equal to t position in string
-    assert_int_equal(result.node.type, NODE_INTEGER);
-    assert_int_equal(result.node.data.integer, 2333);
-}
-
-static void test_string_to_number_overflow(void **state) {
-    (void) state;
-
-    // Number is INT64_MAX but with a extra 899 at the end
-    char num[32] = "92233720368547758079";
-    size_t offset = 0;
-    ASTNodeResult result = tokenize_number(num, &offset);
-    assert_false(result.is_valid);
-    assert_uint_equal(result.err, LEXER_INT_OVERFLOW);
-    // Technically it can trigger a buf overflow error but obvioulsy 
-    // it will trigger int overflow error first
-}
 
 int main(void) {
-    const struct CMUnitTest tests[] = {
+    return EXIT_SUCCESS;
-        cmocka_unit_test(test_string_to_number_normal),
-        cmocka_unit_test(test_string_to_number_overflow),
-        cmocka_unit_test(test_tokenize_normal_expresion),
-        cmocka_unit_test(test_tokenize_unrecognized_symbol),
-        cmocka_unit_test(test_tokenize_wrong_sintax),
-    };
-
-    return cmocka_run_group_tests(tests, NULL, NULL);
 }

test/test_parser.c

@@ -1,81 +1,11 @@
-#include "arena.h"
-#include "arraylist.h"
-#include "lexer.h"
-#include "parser.h"
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <setjmp.h>
 #include <cmocka.h>
-
+#include <stdlib.h>
-static void test_parsing_basic_expression(void **state) {
-    (void) state;
-
-    char expr[256] = "2 + 3 / 66 * 789";
-    TokenizeResult tokens = tokenize(expr);
-
-    assert_true(tokens.is_valid);
-    assert_int_equal(arraylist_size(tokens.arr), 7);
-
-    ParseResult result = parse(tokens);
-    // Assert head is +
-    assert_int_equal(result.tree->type, NODE_BINARY_OP);
-    assert_int_equal(result.tree->data.binary.op, OP_ADD);
-
-    assert_int_equal(result.tree->data.binary.left->type, NODE_INTEGER);
-    assert_int_equal(result.tree->data.binary.left->data.integer, 2);
-
-
-    assert_int_equal(
-            result.tree->data.binary.right->type,
-            NODE_BINARY_OP
-            );
-    assert_int_equal(
-            result.tree->data.binary.right->data.binary.op, 
-            OP_MUL
-            );
-
-    assert_int_equal(
-            result.tree->data.binary.right->data.binary.right->type,
-            NODE_INTEGER);
-    assert_int_equal(
-            result.tree->data.binary.right->data.binary.right->data.integer,
-            789);
-
-    assert_int_equal(
-            result.tree->data.binary.right->data.binary.left->type, 
-            NODE_BINARY_OP
-            );
-    assert_int_equal(
-            result.tree->data.binary.right->data.binary.left->data.binary.op, 
-            OP_DIV
-            );
-
-    assert_int_equal(
-            result.tree->data.binary.right->data.binary.left->data.binary.right->type, 
-            NODE_INTEGER
-            );
-    assert_int_equal(
-            result.tree->data.binary.right->data.binary.left->data.binary.right->data.integer, 
-            66
-            );
-
-    assert_int_equal(
-            result.tree->data.binary.right->data.binary.left->data.binary.left->type, 
-            NODE_INTEGER
-            );
-    assert_int_equal(
-            result.tree->data.binary.right->data.binary.left->data.binary.left->data.integer, 
-            3
-            );
-    arena_destroy(&result.arena);
-}
 
 int main(void) {
-    const struct CMUnitTest tests [] = {
+    return EXIT_SUCCESS;
-        cmocka_unit_test(test_parsing_basic_expression),
-    };
-
-    return cmocka_run_group_tests(tests, NULL, NULL);
 }