NO MORE MEMORY LEAKS :D

1 files changed, 20 insertions, 25 deletions

diff --git a/src/main.c b/src/main.c
index 915078f..a054b16 100644
--- a/src/main.c
+++ b/src/main.c
@@ -7,48 +7,43 @@
 
 
 int main(int argc, char* argv[]) {
-   FILE* fsource;
-   long fsource_size;
-   char* source;
+   FILE*    fsource;
+   long     fsource_size;
+   char*    source;
+   lexer_t* lexer;
+   int      in_file;
 
    fsource = fopen(argv[1], "rb");
-   if (!fsource) { 
-      die("source file not found");
-   };
-
+   if (!fsource)                                      { free(fsource); die("source file not found"); };
    fseek(fsource, 0L, SEEK_END);
    fsource_size = ftell(fsource);
    rewind(fsource);
-
    source = calloc(1, fsource_size + 1);
-
-   if (!source) { 
-      fclose(fsource); 
-      die("calloc failed");
-   }
-
-   if (1 != fread(source, fsource_size, 1, fsource)) {
-      fclose(fsource); 
-      free(source);
-      die("could not read source");
-   }
-
+   if (!source)                                       { fclose(fsource); free(source); die("calloc failed"); }
+   if (1 != fread(source, fsource_size, 1, fsource))  { fclose(fsource); free(source); die("could not read source"); }
    log_inf("source file loaded");
 
-   lexer_t* lexer = lexer_init(source);
+   lexer = lexer_init(source);
    log_inf("lexer created");
 
    log_inf("BEGIN INPUT");
    log_raw(lexer->content);
    log_inf("END INPUT");
 
-   token_t* token = NULL;
+   in_file = 1;
+
+   while (in_file) {
+      token_t* token;
+
+      token = lexer_get_next_token(lexer);
+      log_inf("token type: [%02d]\t\ttoken value: [%s]", token->type, token->value);
+      (token->type == TOKEN_EOF) && (in_file = 0);
 
-   while ((token = lexer_get_next_token(lexer)) != NULL) {
-      log_inf("token type: [%s]\t\ttoken value: [%s]", token_get_type(token->type), token->value);
-      free(token);
+      token_destroy(token);
    }
 
+   // clean up
+   lexer_destroy(lexer);
    fclose(fsource);
    free(source);