Makefile

@@ -16,8 +16,6 @@ LINK = clang
 CFLAGS = -Wall -DDBG -ggdb
 LDFLAGS = -lm
 BATS = bats
-BISON = bison
-PRINT = $(PRINT)
 
 SRC_FILES = $(wildcard $(SRC_DIR)/*.c)
 OBJ_FILES = $(patsubst $(SRC_DIR)/%.c, $(OBJ_DIR)/%.o, $(SRC_FILES))
@@ -49,56 +47,56 @@ run: $(TARGET)
 # Generate grammars with bison.
 $(GRAM_FILES): $(SRC_DIR)/grammar.y
 	@ mkdir -p $(GRAM_DIR)
-	@ $(PRINT) "$(WHITE_BOLD)Generating grammars...$(RESETCOLOR)"
+	@ echo -e "$(WHITE_BOLD)Generating grammars...$(RESETCOLOR)"
-	$(BISON) $< -o$(GRAM_DIR)/grammar.tab.c -H$(GRAM_DIR)/grammar.tab.h
+	bison $< -o$(GRAM_DIR)/grammar.tab.c -H$(GRAM_DIR)/grammar.tab.h
 
 # Compile grammars.
 $(OBJ_DIR)/grammar.o: $(GRAM_DIR)/grammar.tab.c $(GRAM_DIR)/grammar.tab.h $(OBJ_DIR)/lexer.o
-	@ $(PRINT) "$(WHITE_BOLD)Compiling grammars...$(RESETCOLOR)"
+	@ echo -e "$(WHITE_BOLD)Compiling grammars...$(RESETCOLOR)"
 	$(CC) $(CFLAGS) -c $< -o $@
 
 # Lexer depends on grammars.
 $(OBJ_DIR)/lexer.o: $(SRC_DIR)/lexer.c $(GRAM_FILES)
 	@ mkdir -p $(OBJ_DIR)
-	@ $(PRINT) "$(WHITE_BOLD)Compiling source object $(WHITE)$@$(WHITE_BOLD)... $(RESETCOLOR)"
+	@ echo -e "$(WHITE_BOLD)Compiling source object $(WHITE)$@$(WHITE_BOLD)... $(RESETCOLOR)"
 	$(CC) $(CFLAGS) -c $< -o $@
 
 # Compile project source objects.
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c $(INC_DIR)/%.h
 	@ mkdir -p $(OBJ_DIR)
-	@ $(PRINT) "$(WHITE_BOLD)Compiling source object $(WHITE)$@$(WHITE_BOLD)... $(RESETCOLOR)"
+	@ echo -e "$(WHITE_BOLD)Compiling source object $(WHITE)$@$(WHITE_BOLD)... $(RESETCOLOR)"
 	$(CC) $(CFLAGS) -c $< -o $@
 
 # Link to final binary.
 $(TARGET): $(OBJ_DIR)/grammar.o $(OBJ_FILES)
-	@ $(PRINT) "$(WHITE_BOLD)Linking $(WHITE)$@$(WHITE_BOLD)...$(RESETCOLOR)"
+	@ echo -e "$(WHITE_BOLD)Linking $(WHITE)$@$(WHITE_BOLD)...$(RESETCOLOR)"
 	$(LINK) -o $(TARGET) $(OBJ_FILES) $(OBJ_DIR)/grammar.o $(LDFLAGS)
 
 # Compile Unity object.
 $(UNITY_OBJ): $(UNITY_C) $(UNITY_H)
-	@ $(PRINT) "$(WHITE_BOLD)Compiling Unity...$(RESETCOLOR)"
+	@ echo -e "$(WHITE_BOLD)Compiling Unity...$(RESETCOLOR)"
 	$(CC) $(CFLAGS) -D UNITY_OUTPUT_COLOR -c $< -o $@
 
 # Compile test object.
 $(TEST_OBJ_DIR)/test_%.o: $(TEST_DIR)/test_%.c
-	@ $(PRINT) "$(WHITE_BOLD)Compiling test object $(WHITE)$@$(WHITE_BOLD)...$(RESETCOLOR)"
+	@ echo -e "$(WHITE_BOLD)Compiling test object $(WHITE)$@$(WHITE_BOLD)...$(RESETCOLOR)"
 	$(CC) $(CFLAGS) -c $< -o $@
 
 # Link final test binary.
 $(TEST_BUILD_DIR)/test_%.out: $(TEST_OBJ_DIR)/test_%.o $(OBJ_DIR)/%.o $(UNITY_OBJ)
-	@ $(PRINT) "$(WHITE_BOLD)Linking test binary $(WHITE)$@$(WHITE_BOLD)...$(RESETCOLOR)"
+	@ echo -e "$(WHITE_BOLD)Linking test binary $(WHITE)$@$(WHITE_BOLD)...$(RESETCOLOR)"
 	$(LINK) -o $@ $? $(LDFLAGS)
 
 # Run the test files.
 test: $(TARGET) $(TEST_BIN_FILES)
-	@ $(PRINT) "$(WHITE_BOLD)Running unit tests...$(RESETCOLOR)"
+	@ echo -e "$(WHITE_BOLD)Running unit tests...$(RESETCOLOR)"
 	for test in $(TEST_BIN_FILES); do ./$${test}; done
-	@ $(PRINT) "$(WHITE_BOLD)Running validation tests...$(RESETCOLOR)"
+	@ echo -e "$(WHITE_BOLD)Running validation tests...$(RESETCOLOR)"
 	$(BATS) $(TEST_VAL_DIR)
 
 
 clean:
-	@ $(PRINT) "$(WHITE_BOLD)Cleaning up...$(RESETCOLOR)"
+	@ echo -e "$(WHITE_BOLD)Cleaning up...$(RESETCOLOR)"
 	rm -rf $(OBJ_DIR)/*.o $(TEST_OBJ_DIR)/*.o $(TEST_BUILD_DIR)/test.out $(TARGET) $(GRAM_DIR)/* $(UNITY_OBJ)
 
 .PHONY: all clean test nocolor release run

src/ast.c

@@ -30,8 +30,6 @@ void ast_destroy(AST* ast) {
         default:
             log_dbgf("Unknown ast type %d (max: %d)", ast->type, AST_TYPE_MAX);
     }
-
-    free(ast);
 }
 
 void ast_print(AST* ast) { ast_print_i(ast, 0); }
@@ -57,12 +55,16 @@ void ast_print_i(AST* ast, int i) {
 ASTNumData* ast_num_data_init(double val) {
     talloc(ASTNumData, num);
 
+    log_dbgf("val: %lf", val);
+
     *num = val;
 
     return num;
 }
 
-void ast_num_data_destroy(ASTNumData* num) { free(num); }
+void ast_num_data_destroy(ASTNumData* num) {
+    if (!num) return free(num);
+}
 
 void ast_num_print(ASTNumData* data, int i) {
     INDENT_BEGIN(i);
@@ -85,10 +87,8 @@ ASTCallData* ast_call_data_init(char* to, size_t argc, AST** argv) {
 }
 
 void ast_call_data_destroy(ASTCallData* call) {
-    if (!call) return;
+    if (!call) return free(call->to);
-    free(call->to);
+    for (size_t i = 0; i < call->argc; i++) free(call->argv[i]);
-    for (size_t i = 0; i < call->argc; i++) ast_destroy(call->argv[i]);
-    free(call->argv);
     free(call);
 }
 
@@ -103,7 +103,9 @@ void ast_call_print(ASTCallData* data, int i) {
     INDENT_END;
 }
 
-ASTVrefData* ast_vref_data_init(char* to) {}
+ASTVrefData* ast_vref_data_init(char* to) {
+    
+}
 
 void ast_vref_data_destroy(ASTVrefData* vref) {}
 

src/dstr.c

@@ -21,8 +21,6 @@ void dstr_destroy(Dstr* dstr) {
     free(dstr);
 }
 
-void dstr_destroypsv(Dstr* dstr) { free(dstr); }
-
 // Check whether the buffer is overflowing and resize it if necessary.
 void check_resz(Dstr* dstr, size_t ln) {
     while (dstr->ln + ln + 1 > dstr->sz) {
@@ -30,7 +28,8 @@ void check_resz(Dstr* dstr, size_t ln) {
         dstr->sz *= 2;
         dstr->buf = realloc(dstr->buf, dstr->sz);
         log_dbgf(
-            "dstr @ %p doubled from %ld to %ld", dstr, dstr->sz / 2, dstr->sz
+            "dstr @ %p doubled from %ld to %ld", dstr, dstr->sz / 2,
+            dstr->sz
         );
     }
 }

src/grammar.y

@@ -1,5 +1,4 @@
 %{
-    #include <string.h>
     #include <stdio.h>
     #include "../../src/include/ast.h"
     #include "../../src/include/lexer.h"
@@ -76,9 +75,7 @@ exp:
         AST** argv = calloc(2, sizeof(AST*));
         argv[0] = ast_init(AST_TYPE_NUM, ast_num_data_init(-1));
         argv[1] = $2;
-        char* to = malloc(4);
+        $$ = ast_init(AST_TYPE_CALL, ast_call_data_init("mul", 2, argv));
-        strcpy(to, "mul");
-        $$ = ast_init(AST_TYPE_CALL, ast_call_data_init(to, 2, argv));
     }
 
     | LGROUP exp RGROUP { $$ = $2; }
@@ -87,45 +84,34 @@ exp:
     //| WORD
 
     | WORD LGROUP arg RGROUP {
-        size_t argc = $3->ln;
+        $$ = ast_init(AST_TYPE_CALL, ast_call_data_init($1, $3->ln, $3->buf));
-        AST** argv = $3->buf;
-        argarr_destroypsv($3);
-        $$ = ast_init(AST_TYPE_CALL, ast_call_data_init($1, argc, argv));
     }
 
     | exp PLUS exp {
         AST** argv = calloc(2, sizeof(AST*));
         argv[0] = $1;
         argv[1] = $3;
-        char* to = malloc(4);
+        $$ = ast_init(AST_TYPE_CALL, ast_call_data_init("sum", 2, argv));
-        strcpy(to, "sum");
-        $$ = ast_init(AST_TYPE_CALL, ast_call_data_init(to, 2, argv));
     }
 
     | exp SUB exp {
         AST** argv = calloc(2, sizeof(AST*));
         argv[0] = $1;
         argv[1] = $3;
-        char* to = malloc(4);
+        $$ = ast_init(AST_TYPE_CALL, ast_call_data_init("sub", 2, argv));
-        strcpy(to, "sub");
-        $$ = ast_init(AST_TYPE_CALL, ast_call_data_init(to, 2, argv));
     }
 
     | exp MULT exp {
         AST** argv = calloc(2, sizeof(AST*));
         argv[0] = $1;
         argv[1] = $3;
-        char* to = malloc(4);
+        $$ = ast_init(AST_TYPE_CALL, ast_call_data_init("mul", 2, argv));
-        strcpy(to, "mul");
-        $$ = ast_init(AST_TYPE_CALL, ast_call_data_init(to, 2, argv));
     }
 
     | exp DIV exp {
         AST** argv = calloc(2, sizeof(AST*));
         argv[0] = $1;
         argv[1] = $3;
-        char* to = malloc(4);
+        $$ = ast_init(AST_TYPE_CALL, ast_call_data_init("div", 2, argv));
-        strcpy(to, "div");
-        $$ = ast_init(AST_TYPE_CALL, ast_call_data_init(to, 2, argv));
     }
 %%

src/include/dstr.h

@@ -3,7 +3,7 @@
 
 #include <stdlib.h>
 
-#define DSTR_INITSZ 2
+#define DSTR_INITSZ 128
 
 typedef struct {
     char* buf;    // The buffer containing the string.
@@ -13,8 +13,6 @@ typedef struct {
 
 Dstr* dstr_init(void);
 void dstr_destroy(Dstr* dstr);
-// Destroy Dstr structure but preserve ->buf.
-void dstr_destroypsv(Dstr* dstr);
 
 // Append ln characters of src to dest.
 void dstr_append(Dstr* dest, char* src, size_t ln);

src/include/lexer.h

@@ -18,8 +18,6 @@ typedef struct {
 
 ArgArr* argarr_init();
 void argarr_destroy(ArgArr* argarr);
-// Destroy ArgArr structure but preserve -> buf.
-void argarr_destroypsv(ArgArr* argarr);
 void argarr_add(ArgArr* argarr, AST* arg);
 
 #include "../../build/grammars/grammar.tab.h"

src/lexer.c

@@ -5,8 +5,8 @@
 #include <stdio.h>
 
 #include "include/dstr.h"
-#include "include/lexer.h"
 #include "include/util.h"
+#include "include/lexer.h"
 
 ArgArr* argarr_init() {
     ArgArr* argarr = malloc(sizeof(ArgArr));
@@ -23,14 +23,14 @@ void argarr_destroy(ArgArr* argarr) {
     free(argarr);
 }
 
-void argarr_destroypsv(ArgArr* argarr) { free(argarr); }
-
 void argarr_add(ArgArr* argarr, AST* arg) {
     if ((argarr->ln + 1) * argarr->sz > argarr->sz) {
         argarr->sz *= 2;
         argarr->buf = realloc(argarr->buf, argarr->sz);
         log_dbgf(
-            "ArgArr @ %p doubled from %ld to %ld", argarr, argarr->sz / 2,
+            "ArgArr @ %p doubled from %ld to %ld",
+            argarr,
+            argarr->sz/2,
             argarr->sz
         );
     }
@@ -78,16 +78,14 @@ char* acc_word(int c) {
     } while (isalpha(*inp));
     dstr_appendch(val, *(inp - 1));
 
-    char* ret = val->buf;
+    return val->buf;
-    dstr_destroypsv(val);
-    return ret;
 }
 
 int yylex() {
     if (*inp == '\0') return YYEOF;
 
     // Skip all whitespace.
-    while (*inp == ' ' || *inp == '\t') inp++;
+    while (*inp == ' ' || *inp == '\t') { inp++; }
 
     // Assign & consume current character.
     int c = *inp++;

src/main.c

@@ -22,7 +22,6 @@ int main(int argc, char** argv) {
     if (argc - 1 && strlen(argv[1]) > 0 && (inp = argv[1]) && !yyparse()) {
         log_dbg("Parsed successfully!\n");
         exec_print(exec_exp(root));
-        ast_destroy(root);
         exit(0);
     }
 
@@ -57,12 +56,9 @@ int main(int argc, char** argv) {
 #ifdef DBG
             ast_print(root);
 #endif
-            ast_destroy(root);
         }
 
         dstr_destroy(ln);
     }
 lnskip:;
-
-    return 0;
 }