diff --git a/src/ast.c b/src/ast.c index 9ad2b7d993ec9a25a0e1abe5ae465feb2541adc6..c9e0292a09605b11dab2aec052ce53f4c87ef895 100644 --- a/src/ast.c +++ b/src/ast.c @@ -397,6 +397,7 @@ mcc_ast_new_statement_list(struct mcc_ast_statement *statement) assert(list); list->statement = statement; + list->next = NULL; return list; } @@ -409,6 +410,7 @@ void mcc_ast_delete_statement_list( mcc_ast_delete_statement_list(statement_list->next); } mcc_ast_delete_statement(statement_list->statement); + free(statement_list); } struct mcc_ast_statement * diff --git a/src/symbol_table.c b/src/symbol_table.c index 32b148c40b920da8ed5156aac21c51bde0c3a675..c50136d7980d1c6e3576bacab0a36769f38ede34 100644 --- a/src/symbol_table.c +++ b/src/symbol_table.c @@ -20,6 +20,7 @@ struct mcc_symbol *mcc_symbol_new_symbol_variable(char* variable_name, enum mcc_ symbol -> variable_name = variable_name; symbol -> data_type = data_type; symbol -> symbol_type = MCC_SYMBOL_TYPE_VARIABLE; + symbol -> func_arguments = NULL; return symbol; } @@ -32,6 +33,7 @@ struct mcc_symbol *mcc_symbol_new_symbol_array(char* variable_name, enum mcc_ast symbol -> variable_name = variable_name; symbol -> data_type = data_type; symbol -> array_size = array_size; + symbol -> func_arguments = NULL; return symbol; } @@ -68,7 +70,7 @@ void mcc_symbol_delete_symbol(void *symbol) { struct mcc_symbol *s = (struct mcc_symbol *) symbol; if (s != NULL) { - if (s -> func_arguments) { + if (s -> func_arguments != NULL) { mcc_delete_array(s ->func_arguments, NULL); } } @@ -81,7 +83,7 @@ struct mcc_symbol_table *mcc_symbol_table_new_table( struct mcc_symbol_table *table = malloc(sizeof(*table)); - table ->inner_tables = mcc_create_dynamic_array(MCC_SYMBOL_TABLE_CHILDREN_SIZE); + table -> inner_tables = mcc_create_dynamic_array(MCC_SYMBOL_TABLE_CHILDREN_SIZE); table -> symbols = mcc_create_dynamic_array(MCC_SYMBOL_TABLE_SYMBOL_SIZE); table -> parent = parent; @@ -89,12 +91,13 @@ struct mcc_symbol_table *mcc_symbol_table_new_table( } void mcc_symbol_table_delete_table(void *table) { - struct mcc_symbol_table *st = (struct mcc_symbol_table *) table; // Delete symbols assert(table); + struct mcc_symbol_table *st = (struct mcc_symbol_table *) table; + mcc_delete_array(st -> symbols, mcc_symbol_delete_symbol); - mcc_delete_array(st ->inner_tables, mcc_symbol_table_delete_table); + mcc_delete_array(st -> inner_tables, mcc_symbol_table_delete_table); free(table); } @@ -123,7 +126,6 @@ int mcc_symbol_table_insert_symbol(struct mcc_symbol_table *table, struct mcc_sy assert(symbol); return mcc_add_to_array(table -> symbols, symbol); - } struct mcc_symbol *mcc_symbol_table_get_symbol(struct mcc_symbol_table *symbol_table, char *symbol_name, bool propagate) {