Major memleaks removed

Errors now stored in ll

Author: coolsidd

Makefile

@@ -6,13 +6,13 @@
 
 
 all:  all_dependencies machine_grammar
-	gcc -o driver.exe *.o
+	gcc -g -o driver.exe *.o # please don't remove -g
 
 machine_grammar:
 	python3 generate_grammar.py -o machine_grammar.txt --grammar-struct-out grammar_structs --json_in symbols.json grammar.txt
 
 all_dependencies: machine_grammar
-	gcc -c *.c
+	gcc -g -c *.c
 
 .PHONY: clean
 clean:

driver.c

@@ -7,6 +7,7 @@ Group 36
 */
 
 #include <stdlib.h>
+#include "gen_utils.h"
 #include "grammar.h"
 #include "tokenizer_structs.h"
 #include "parse_tree.h"
@@ -55,9 +56,9 @@ int main(int argc, char** argv){
         printf("\n\nMenu: \n");
         printf("--------------------------------------------------------\n");
         printf("0 - Exit\n");
-        printf("1 - Create parse tree\n");
+        printf("1 - print parse tree (without types syntax only)\n");
         printf("2 - Traverse parse tree, create Type expression table, display type errors\n");
-        printf("3 - print parse tree\n");
+        printf("3 - print parse tree (with types computed)\n");
         printf("4 - print type expression table\n");
         printf("--------------------------------------------------------\n");
 
@@ -66,6 +67,8 @@ int main(int argc, char** argv){
 
         switch(option){
             case 0:
+                freeTokenStream(s);
+                //              freeGrammar(g);
                 break;
             case 1:
             {
@@ -78,6 +81,7 @@ int main(int argc, char** argv){
                 }
                 else printf("parse tree created successfully\n\n");
                 printParseTree(p,0);
+                free_parse_tree(p);
                 break;
             }
             case 2:
@@ -91,7 +95,11 @@ int main(int argc, char** argv){
                     exit(1);
                 }
                 else printf("parse tree created successfully\n\n");
+                init_errors();
                 traverse_and_populate(t, p);
+                print_all_errors();
+                free_parse_tree(p);
+                free_type_expression_table(t);
                 break;
             }
             case 3:
@@ -105,9 +113,12 @@ int main(int argc, char** argv){
                 }
                 else printf("parse tree created successfully\n\n");
                 type_exp_table *t = create_type_expression_table();
+                init_errors();
                 traverse_and_populate(t, p);
                 printParseTree(p,0);
                 printf("\n");
+                free_parse_tree(p);
+                free_type_expression_table(t);
                 break;
             }
             case 4:
@@ -123,9 +134,14 @@ int main(int argc, char** argv){
                 }
                 else
                     printf("parse tree created successfully\n\n");
+
+                init_errors();
                 traverse_and_populate(t, p);
+                print_all_errors();
                 printf("Populated Type expression table successfully\n");
                 print_type_exp_table(t);
+                free_parse_tree(p);
+                free_type_expression_table(t);
                 /* printParseTree(p, 0); */
                 break;
             }

gen_utils.c

@@ -6,6 +6,7 @@ Group 36
 2017B4A70740P Aditya Tulsyan
 */
 
+#include "linked_list.h"
 #include <stdio.h>
 
 #define KNRM  "\x1B[0m"
@@ -23,6 +24,8 @@ Group 36
 #include "parse_tree.h"
 #include <stdlib.h>
 
+linked_list * all_errors = NULL;
+
 void assert(bool condition, char *error_string) {
     if (!condition) {
         printf("ERROR: Assertion failed - %s\n", error_string);
@@ -69,6 +72,19 @@ char *getStmtType(Parse_tree_node *p) {
     return "UNKNOWN";
 }
 
+void init_errors(){
+    if(all_errors){
+        ll_node* head = all_errors->head;
+        while(head){
+            all_errors->head = all_errors->head->next;
+            free(head);
+            head = all_errors->head;
+        }
+        free(all_errors);
+    }
+    all_errors = create_linked_list();
+}
+
 bool assert_debug(bool condition, char *error_string, Parse_tree_node *p,
                   char *t1, char *t2, char *operator, char *lex1,
                   char *lex2) {
@@ -90,8 +106,20 @@ bool assert_debug(bool condition, char *error_string, Parse_tree_node *p,
         temp1 = temp1->child;
     }
     er->line_num = temp1->tok->line_no;
-    printErrorEntries(er);
+    //printErrorEntries(er);
+    if(!all_errors)
+        init_errors();
+    ll_append(all_errors, er);
     return false;
     }
     return true;
 }
+
+void print_all_errors(){
+    if(!all_errors)
+        return;
+    printErrorsHeader();
+    for(ll_node *head = all_errors->head; head; head=head->next){
+        printErrorEntries((ErrorNode *)head->data);
+    }
+}

gen_utils.h

@@ -17,6 +17,8 @@ Group 36
 #include <stdlib.h>
 #include <math.h>
 
+extern linked_list * all_errors;
+
 typedef struct en
 {
     int line_num, depth;
@@ -26,7 +28,8 @@ typedef struct en
 
 void printErrorsHeader();
 void printErrorEntries(ErrorNode *err);
-
+void init_errors();
+void print_all_errors();
 void assert(bool condition, char *error_string);
 bool assert_debug(bool condition, char* error_string, Parse_tree_node * p, char* t1, char* t2, char* operator, char* lex1, char* lex2);
 #endif

grammar.h

@@ -32,5 +32,6 @@ typedef struct grammar { // Final data structure for
 void printGrammar(Grammar* g);
 int readGrammar(char *filename, Grammar* g);
 char* replace_char(char* str, char find, char replace);
+void freeGrammar(Grammar *g);
 
 #endif

hash_map.c

@@ -37,6 +37,26 @@ hash_map *create_hash_map(int num_buckets)
     return new_hm;
 }
 
+void free_hash_map(hash_map *new_hm )
+{
+    if(!new_hm){
+        return;
+    }
+    for (int i = 0; i < new_hm->num_buckets; i++)
+    {
+        hm_node *temp =  new_hm->buckets[i]->first;
+        while(temp){
+            new_hm->buckets[i]->first = new_hm->buckets[i]->first->next;
+            free(temp);
+            temp =  new_hm->buckets[i]->first;
+        }
+        free(new_hm->buckets[i]);
+    }
+    free(new_hm->buckets);
+    free(new_hm);
+}
+
+
 void add_to_bucket(hm_bucket *b, char *string, void *data)
 {
     hm_node *new_hm_node = (hm_node *)calloc(1, sizeof(hm_node));

hash_map.h

@@ -39,4 +39,6 @@ void *fetch_from_hash_map(hash_map *hm, char *string);
 
 void destroy_hash_map(hash_map *hm);
 
+void free_hash_map(hash_map *new_hm );
+
 #endif

linked_list.c

@@ -17,6 +17,16 @@ linked_list *create_linked_list()
     return ll;
 }
 
+void ll_free(linked_list *ll){
+    ll_node *temp = ll->head;
+    while( temp ){
+        ll->head = ll->head->next;
+        free(temp);
+        temp = ll->head;
+    }
+    free(ll);
+}
+
 void ll_add_at(linked_list *ll, void *data, int idx)
 {
     assert(idx <= ll->num_nodes && idx >= 0, "linked list insertion index valid");

linked_list.h

@@ -10,7 +10,8 @@ Group 36
 #define LINKED_LIST_H
 
 #include <stdlib.h>
-#include "gen_utils.h"
+#include "grammar_structs.h"
+
 typedef struct node {
     void *data;
     struct node *next;
@@ -23,10 +24,14 @@ typedef struct ll {
     int num_nodes;
 } linked_list;
 
+void assert(bool condition, char *error_string);
+
 linked_list *create_linked_list();
 
 void ll_add_at(linked_list *ll, void *data, int idx);
 
+void ll_free(linked_list *ll);
+
 void ll_append(linked_list *ll, void *data);
 
 void *ll_get(linked_list *ll, int idx);

parse_tree.c

@@ -20,7 +20,7 @@ Parse_tree_node *getNodeFromIndex(Parse_tree_node *p, int index)
 
 Parse_tree_node* createParseTree(TokenStream *s, Grammar *g, int *maxline){
     Symbol starting_symb;
-    starting_symb.s = main_program;
+    starting_symb.s = g->start_symb.s;
     starting_symb.is_terminal = false;
     return recursiveParseNonterminal(starting_symb, &(s->head), g, maxline, 0);
 }
@@ -95,7 +95,7 @@ Parse_tree_node *recursiveParseNonterminal(Symbol symb, Token ** tstr, Grammar *
         }
     }
     //printf("Failed to derive %s\n", toStringSymbol(symb));
-    return new_node;
+    return NULL;
 }
 
 Parse_tree_node* new_parse_tree(Token *tok){
@@ -111,15 +111,22 @@ Parse_tree_node* new_parse_tree(Token *tok){
 }
 void free_parse_tree(Parse_tree_node *root){
 
-    Parse_tree_node* temp =  root->child;
 
+    Parse_tree_node* temp =  root->child;
     while(temp){
         root->child = root->child->next;
         free_parse_tree(temp);
         temp = root->child;
-        root->num_children--;
     }
-    //free(root->tok);
+    /* while(temp){ */
+    /*     root->child = root->child->next; */
+    /*     free_parse_tree(temp); */
+    /*     temp = root->child; */
+    /*     //root->num_children--; */
+    /* } */
+    /* if(root->tok) */
+    /*     free(root->tok); */
+    //root->tok = NULL;
     free (root);
     return ;
 }