From e86edb324b6ead099ee1b7074ee2665ce6e8e480 Mon Sep 17 00:00:00 2001 From: Meyer Simon Date: Fri, 21 Feb 2025 16:26:37 -0500 Subject: [PATCH] Fix the conflicts t#29 --- runner.c | 6 +++--- runner.h | 4 ++-- symbol_table.c | 2 ++ test | Bin 16088 -> 0 bytes 4 files changed, 7 insertions(+), 5 deletions(-) delete mode 100755 test diff --git a/runner.c b/runner.c index dd096aa..d183b52 100644 --- a/runner.c +++ b/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) { diff --git a/runner.h b/runner.h index e7a8194..73c94f2 100644 --- a/runner.h +++ b/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); diff --git a/symbol_table.c b/symbol_table.c index e5d1366..a8592eb 100644 --- a/symbol_table.c +++ b/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; } + */ diff --git a/test b/test deleted file mode 100755 index 4941bf240c8f2f1ec1cf50ca112b79be646ae11c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16088 zcmeHOZ)_Y#6(2iI>d+*RbH+whpg^sB8Z9&Wm?6-bGFe+m>sY=3lyD7HsX}iyVkJ}}BucpX%3%r!MX2I_5N;tU zm=DsU9EVWRm)o-ljAH4}GW`J=pa}KjD3tL=tybeZE9qg*%OF$15lgrU#!WCz=nS_f zRPsqVp=&$$BS@Q|qarkj8)RINwi}odN^MX%blyw6pZ2;L=ULi~3Q}oDsI+${a6GgI zc$H5X=7ZeceB;o~`4`IRRhv`EzHP0WQ;Eh@GE*3C9NxaIaa(INpN+QYmMJa^7tN_X z`+F7KOpuJzsA@+IFaAiklJ#W&O6T*xIrZB52e!YsvE_Js;pB&7Z~TmGC~m@#4Hfby zQ-pY`UyF-uOg_GdnvoGb=f0FCI$yaFitDQ=?}W^%BHsjAHG68Lnmxr|&HjOT?5Q6c zaJ{EEPXBP+8AxX0spS2xO2<>FY`=0Gj7z_h_u@IvNyn2JHIz$cya7dG8l7!w&)%-x zZB9$HCAzg--_oj_uAY5P!p*ryl6lX~_3Ud)WixJ1yf5X#>ydOe!(JU@TGf#9UxP7` zi^ic=-%~Q*3Tu*!Y1DS0LnM3p>yKiXYE>t9P@V&F{~ca#6esyU7rDjqx|q?6T=>a5 zjGX2G^)PGbuAZxtUK!GwYMne3SA#%Sk44opfh?a{ZhYKuE(3gc%4k z5N06EK$w9r17QaKr!w%@`n7+zk6oy<#}>Y_Stb7j%|7;r zneLvB=85JP>=Qeiv3@PB+5*eJ4MgkLJ*4A-{4PlB6AKR#`NXWZ3ZdUXb%egSG*!QD zlnhTZh5aUNzjXtVO;_yVjQz~TJM3p>7uYpt>~mMVm2hxAY8=#+rUvTQA#TA_|3-I` zS`}{VwU6!mB~|U>d2fk5w(|^_>BZ>xbOIk|7XBQ3&Aq@@;9tKFN^;Z-9FpB+7mrRB z3ojRY&z`d2ZTe4FN+rA4F=dZ+OpW!vTj$puMpQ|n0-mM{Zh2Eq)483;2FW+2Q!n1L_@VFvy`Ga&l~ zWq+XT{nPI>NXZgO3%|VJPcL1DRv5aPdD(|}6Z5jaa1HaaACcZ~sEGc}E2S*)}h;zv6FV(|1u7l#qz0ud<)Cv{s5~>7d~s$ z8Wo8dUdE4hS=Xo=l+1UdRq6p$s9m|=ME+H6zpA{SU*wOYQZ4@Z`t>92XQleydhswv ztND3W+ux{y04VJr6m>AGCiNa;wsX<}O0Mp^AKQE#(>C0)hKN9qP|{&Cx9Oy2tyHju$_o zAjo@#fq`hhn%fuecxk7fcE;ynnaDavQrW(E%1LF;DQAnpp0P%4SEWHZT{7AYln?iWlmXEj`r}N;heH~86{&olZ z^4ss)ziVGt8^kys;dI!nwc8IWXV2aPyLat%4s>=N>gaKLcJ1EV0Yvb)Kuk^tT;)VS zTh5JpZU_BrsT?;E_u@+Ti;o+W-OwQeNU@4yUZ*i#tK3rWOGN7`+@k#J`g_m0$+}9MldZpe z2n?-da69WV-+3-pm)B>)Z$rh851#9y-^2Yyo{J)*?@K>kzORK^V#qXz|1{)pVJ#%_ z%X(3$v@d5)Wc?*>!6gt6%6eHzM@UpH;LPkpr!OQwosH{g}qDwIUpM#Xv zdV-hroltqaO8jCc^g-Zh?I^sgAB8rVW_6DJ@v~T+K!tKDcv;U1onS+0KiL0oF@87O z$@;iVeR#@Q5dVG1C@%3|{yyQ3%XCqb-9_x1Nd$>5GwZb z;l~5`!we8=36QDy6Z(??ev}nLFUr6K@Zy&C7W(@y>mH%~iO z3ta@TAFpC;+GMD-BMt;7JpIQ>GHGAdg%QRF?Wrw)Sn x*x?f#*axAcrL4pw&tH1ali2