Fix the conflicts t#29

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) {

runner.h

@@ -20,9 +20,9 @@ int arg;
 SymbolTable * top;
 SymbolTable * curr;
 
-int main(int argc, char* argv[]);
+// int main(int argc, char* argv[]);
 char *is_tok(int argc, char* argv[]);
-int is_alpha_file(char *file, int file_len);
+// int is_alpha_file(char *file, int file_len);
 void enter_scope(int, int);
 void exit_scope(void);
 

symbol_table.c

@@ -69,6 +69,7 @@ TableNode * look_up(SymbolTable * table, char * x){
 
 //uncomment the below main function along with the headers above for a simple standalone test of table and entry creation
 
+/*
 int main(){
         char* String = "STRING";
         char* X = "X";
@@ -79,3 +80,4 @@ int main(){
         printf("The type of the first entry is %s\n",First_Entry->theType);
         return 0;
     }
+    */