Fix the conflicts t#29
This commit is contained in:
6
runner.c
6
runner.c
@ -1,4 +1,4 @@
|
||||
#include "symbol_table.h"
|
||||
//#include "symbol_table.h"
|
||||
#include "symbol_table.c"
|
||||
#include "runner.h"
|
||||
|
||||
@ -94,7 +94,7 @@ int run(FILE *alpha) {
|
||||
if (yyin != NULL) {
|
||||
fclose(yyin);
|
||||
}
|
||||
|
||||
|
||||
if (tok_flag != NULL) {
|
||||
fclose(tok_flag);
|
||||
}
|
||||
@ -139,7 +139,7 @@ int new_file(char *arg, char *alpha) {
|
||||
strcat(file_name, ".");
|
||||
strcat(file_name, arg + 1);
|
||||
|
||||
|
||||
|
||||
if (strcmp(arg, "-tok") == 0) {
|
||||
tok_flag = fopen(file_name, "w");
|
||||
} else if (strcmp(arg, "-st") == 0) {
|
||||
|
Reference in New Issue
Block a user