Fix memory leaks and optimize memory usage (#20)

README.md

@@ -5,9 +5,6 @@
 > [!IMPORTANT]
 > Word is still in development, some functionalities may not work as expected or may be missing. Please report any issues you encounter.
 
-> [!WARNING]
-> There are currently many memory leaks, high memory usage is expected. I'm currently working on them. 
-
 WordLanguage is a programming language designed to minimize the use of symbols, making it easy to read and write. Its syntax is simple and closely resembles natural language, aiming to be both easy to learn and powerful enough for complex programming tasks.
 
 **Key Features**:

bin/test.w

@@ -1,12 +1,8 @@
 int a assign 0
-def null test
-    infloop
-        if a gequal 5
-            break
-        endif
-        change a to a plus 1
-    endinf
-enddef
-
-call test
+infloop
+    if a equal 1000000
+        break
+    endif
+    change a to a plus 1
+endinf
 print a

include/dict.h

@@ -7,6 +7,7 @@
 #define __DICT_H__
 
 #include <string.h>
+#include "w_alloc.h"
 #include "list.h"
 
 typedef struct _dict {

include/interpreter.h

@@ -3,6 +3,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include "w_alloc.h"
 #include "lexer.h"
 #include "parser.h"
 #include "scope.h"
@@ -17,6 +18,7 @@ void *execute(list *parsed_code, Scope *current_scope, W_Type return_type, bool
 // Utility
 
 void eval_parsed_lines(list_element *parsed_line, Scope *scope, list *stack);
+void destroy_stack(list *stack);
 char *remove_dot(W_Word *word);
 bool is_type_keyword(char *word);
 bool is_float(char *str);

include/lexer.h

@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdbool.h>
+#include "w_alloc.h"
 #include "list.h"
 
 extern char *keywords[];
@@ -23,6 +24,7 @@ typedef struct _w_word {
     char *value;
     int line;
     bool parsed;
+    bool is_generated;
 } W_Word;
 
 list *word_tokenize(FILE *source);

include/list.h

@@ -7,6 +7,7 @@
 #define __LIST_H__
 
 #include <stdlib.h>
+#include "w_alloc.h"
 
 typedef struct _list_element {
     void *value;
@@ -29,5 +30,6 @@ void list_insert(list *l, int index, void *value);
 int list_size(list *l);
 void *list_pop(list *l);
 void list_destroy(list *l);
+void list_destroy_no_free(list *l);
 
 #endif

include/parser.h

@@ -3,6 +3,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include "w_alloc.h"
 #include "lexer.h"
 #include "w_list.h"
 

include/scope.h

@@ -2,6 +2,7 @@
 #define __SCOPE_H__
 
 #include <stdlib.h>
+#include "w_alloc.h"
 #include "w_type.h"
 #include "w_dict.h"
 

include/w_alloc.h

@@ -0,0 +1,30 @@
+// DEBUG ONLY
+
+#ifndef __W_ALLOC_H__
+#define __W_ALLOC_H__
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdbool.h>
+#include "w_alloc.h"
+
+#define MONITOR_MEMORY false
+
+#if MONITOR_MEMORY
+
+extern int w_alloc_count;
+extern long long int w_alloc_total;
+
+void *w_malloc(size_t size);
+void w_free(void *ptr);
+void w_alloc_print();
+
+#elif !MONITOR_MEMORY
+
+#define w_malloc malloc
+#define w_free free
+#define w_alloc_print() {}
+
+#endif
+
+#endif

include/w_bool.h

@@ -2,6 +2,7 @@
 #define __W_BOOL_H__
 
 #include <stdbool.h>
+#include "w_alloc.h"
 #include "w_type.h"
 
 typedef struct _w_bool {

include/w_dict.h

@@ -1,6 +1,7 @@
 #ifndef __W_DICT_H__
 #define __W_DICT_H__
 
+#include "w_alloc.h"
 #include "w_type.h"
 #include "w_list.h"
 #include "list.h"

include/w_float.h

@@ -1,6 +1,7 @@
 #ifndef __W_FLOAT_H__
 #define __W_FLOAT_H__
 
+#include "w_alloc.h"
 #include "w_type.h"
 
 typedef struct _w_float {

include/w_function.h

@@ -1,6 +1,7 @@
 #ifndef __W_FUNCTION_H__
 #define __W_FUNCTION_H__
 
+#include "w_alloc.h"
 #include "w_type.h"
 #include "list.h"
 #include "dict.h"

include/w_int.h

@@ -1,6 +1,7 @@
 #ifndef __W_INT_H__
 #define __W_INT_H__
 
+#include "w_alloc.h"
 #include "w_type.h"
 
 typedef struct _w_int {

include/w_list.h

@@ -1,6 +1,7 @@
 #ifndef __W_LIST_H__
 #define __W_LIST_H__
 
+#include "w_alloc.h"
 #include "w_type.h"
 
 typedef struct _w_list_element {

include/w_stdlib.h

@@ -4,6 +4,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
+#include "w_alloc.h"
 #include "w_bool.h"
 #include "w_dict.h"
 #include "w_float.h"

include/w_str.h

@@ -1,6 +1,7 @@
 #ifndef __W_STR_H__
 #define __W_STR_H__
 
+#include "w_alloc.h"
 #include "w_type.h"
 
 typedef struct _w_str {

include/w_type.h

@@ -4,6 +4,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include "w_alloc.h"
 
 typedef enum _w_type {
     NULL_TYPE,

src/dict.c

@@ -6,18 +6,18 @@
 #include "dict.h"
 
 /**
- * \brief Initializes a new dictionary. (malloc)
+ * \brief Initializes a new dictionary. (w_malloc)
  * \return A new dictionary.
  */
 dict *dict_init() {
-    dict *d = (dict *)malloc(sizeof(dict));
+    dict *d = (dict *)w_malloc(sizeof(dict));
     d->keys = list_init(); //list of keys, is a normal list
     d->values = list_init(); //list of values, is a list
     return d;
 }
 
 /**
- * \brief Sets the given key and value in the given dictionary. (malloc)
+ * \brief Sets the given key and value in the given dictionary. (w_malloc)
  * \param d The dictionary to set the key and value in. 
  * \param key The key to set. Must be a string.
  * \param value The value to set.
@@ -29,7 +29,7 @@ void dict_set(dict *d, char *key, void *value) {
         for (int i = 0; i < d->keys->size; i++) {
             if (strcmp((char *)current_key->value, key) == 0) {
                 if (current_value->value != NULL) {
-                    free(current_value->value);
+                    w_free(current_value->value);
                 }
                 current_value->value = value;
                 return;
@@ -38,7 +38,7 @@ void dict_set(dict *d, char *key, void *value) {
             current_value = current_value->next;
         }
     } else {
-        char *key_copy = (char *)malloc(strlen(key) + 1);
+        char *key_copy = (char *)w_malloc(strlen(key) + 1);
         strcpy(key_copy, key);
         list_append(d->keys, key_copy);
         list_append(d->values, value);
@@ -123,5 +123,5 @@ void dict_remove(dict *d, char *key) {
 void dict_destroy(dict *d) {
     list_destroy(d->keys);
     list_destroy(d->values);
-    free(d);
+    w_free(d);
 }