From 6b5994f4e7398155135a0039c9873e1c2955a327 Mon Sep 17 00:00:00 2001
From: expan <expan@student.cs.uwaterloo.ca>
Date: Thu, 28 Mar 2019 22:24:33 -0400
Subject: [PATCH] revert back
---
SQLPGrammar.y | 8 ++++----
util.c | 28 +++++++++++++---------------
util.o | Bin 10152 -> 0 bytes
3 files changed, 17 insertions(+), 19 deletions(-)
delete mode 100644 util.o
diff --git a/SQLPGrammar.y b/SQLPGrammar.y
index f3f82a7..f49c44a 100644
--- a/SQLPGrammar.y
+++ b/SQLPGrammar.y
@@ -62,11 +62,11 @@ Body
TablePath
: TableIdentifier VarIdentifier
{ printf("last table path\n");
- $$ = create_assign_operator($1, $2);
+ $$ = create_atom_operator($1, $2);
}
| TableIdentifier VarIdentifier ',' TablePath
{ printf("table path2\n");
- $$ = create_cross_operator(create_assign_operator($1, $2), $4);
+ $$ = create_cross_operator(create_atom_operator($1, $2), $4);
}
;
@@ -89,11 +89,11 @@ Select_List
}
| Col
{ printf("select list attr path\n");
- $$ = create_rename_operator($1, $1, NULL);
+ $$ = create_assign_operator($1, NULL);
}
| Col ',' Select_List
{ printf("Select list\n");
- $$ = create_rename_operator($1, $1, $2);
+ $$ = create_assign_operator($1, $2);
}
;
diff --git a/util.c b/util.c
index f1e3d37..88b4840 100644
--- a/util.c
+++ b/util.c
@@ -121,25 +121,23 @@ cons_cell* create_cross_operator(cons_cell* ra1, cons_cell* ra2) {
}
// For when you want to assign column names to another name
-cons_cell* create_rename_operator(cons_cell* column, cons_cell* var, cons_cell* next) {
- cons_cell* new_name_cons = create_cons_cell(var, next);
- cons_cell* original_cons = create_cons_cell(column, new_name_cons);
- char operator[7] = "RENAME\0";
- cons_cell* operator_cons = create_cons_cell_w_atom(operator, original_cons);
- return operator_cons;
-}
+// THIS DOESN"T WORK FOR JASON"S COMPILER SO REVERTING BACK BUT LEFT HERE IN CASE WE NEED IT LATER XD
+//cons_cell* create_rename_operator(cons_cell* column, cons_cell* var, cons_cell* next) {
+// cons_cell* new_name_cons = create_cons_cell(var, next);
+// cons_cell* original_cons = create_cons_cell(column, new_name_cons);
+// char operator[7] = "RENAME\0";
+// cons_cell* operator_cons = create_cons_cell_w_atom(operator, original_cons);
+// return operator_cons;
+//}
// For when you want to assign a var to a table
-cons_cell* create_assign_operator(cons_cell* table, cons_cell* var) {
+cons_cell* create_assign_operator(cons_cell* spcol, cons_cell* next) {
// cdr to get to cons atom, car to get atom itself
-// if(hash == NULL)
-// hash = g_hash_table_new(g_str_hash, g_str_equal);
-
-// printf("test %s", ((atom*)table->cdr->car)->val);
- cons_cell* new_name_cons = create_cons_cell(var, NULL);
- cons_cell* original_cons = create_cons_cell(table, new_name_cons);
+// cons_cell* new_name_cons = create_cons_cell(var, NULL);
+// cons_cell* original_cons = create_cons_cell(table, new_name_cons);
+ cons_cell* sp_col_cons = create_cons_cell(spcol, next);
char operator[3] = "AS\0";
- cons_cell* operator_cons = create_cons_cell_w_atom(operator, original_cons);
+ cons_cell* operator_cons = create_cons_cell_w_atom(operator, sp_col_cons);
return operator_cons;
}
diff --git a/util.o b/util.o
deleted file mode 100644
index 2fa3d8121cfea077faf3006291a71d604cddae08..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 10152
zcmchb4Qx}_6@afvpjie@+HMmYtn)O|QHfe{DP?6*Ym+@NRsI&@bW>T4<2X%<e<J&(
zAsb;qp|q}-j{UTi2Afh%XlRwTwP;<C*zjO9AQi2erZ%gX7HJ@5V~R?fu9X(8JLme`
z=kxCKgFyq=dcOC4=iGD7{d@1e`)#9X(;|;YsN@m%i_)E<LiDaGl>@RE5X(fh2#0bP
zLZkokhH}F*q1?dq@#P?#L4{Dx_#l+WD-4oaDo%%TZB<x)HBc)sKXcM%B5#25tH;s6
z1pY}=$E#F{jDpT&(aC7RW0i9!q!Z-}%%kTwEV<Jg1PoP5)^f(%WgGBz`387w4G2IV
zoQ6Iqbcgblb*mv{jMiTOrNZy9Emj~oV+vwJ0qB?F%Nf)8#i*Dw-l_SGEcN7!e}n3D
zXv}!Wt~w(F&o_V29a_6odNUWxF0nea9^#pTcwTqJ6Mh{kgUIH(<ng_lSETc&jQ7d+
zdv@Lb)3?K~F{Sszj7x)O^afwCp;zPVU0Vau*Soxd3+hW7$?My&IXUIWjJfO9oEzD7
z*RM5ha~(&=HrFpV6}H3rnt=87t57a{IFxH1cTT}^eZHTD0fNf_eZKf$J<2r+rZ~o@
z1Y8Dq;n;dg*arh261I7qgC`q4-7eRNt9@u;IBpNE8yt@6G%Xy6P(Hoj;X7LzXMBoI
zK?luhT?x&BSHNYSq6^tU+Oy!Ap6YGtEd#S|!ZG8*6VRZ7y^YWzau#X*WX+;WrCxGA
z`7haR-Ixh=xqxiT^CQjh(cyv^sL{3>*nRq<y;29>;CX+gaPYB-Q_J=e_((l<4Sli@
zQ{8<7<J?GCvv~mq!`*MWjgz&7v3tI%U4<7G^-ONyd}wrdM%3&*fSW~la@V{PsNGvI
zyC;o#+!kKEO`EKv#=IwQ%zxQ9zv}|(hw@NOl-WO5Lv6V^%p2#&+Hl(nx`C?FTjk;!
zs-F*^FHxmugBLyf&zy{9;!!gmiJIx;25()qT5N4=Y;6*vZIcik!HrD@WJY_l5RI)Z
zTRSiVVX&j4U5L&g{I#|rYli<|M=Pj>Teh^eM1oDA)!5#;b*m8VMoX|6%mktQP{$_G
z*53M{5G}1>tZ7U07RU_9;lDEomAqb2mla}jW8((z>TuUU${g^n^R4sM-{rr1K;HUy
z`|tJD-*aaXd+)CIulLvc>#<)keWI8N&o|qJXJ@Tv#nPLq_QQwJO5k{5YQ(?b&9(a$
zH7;AS8x-IcWevz7rSMP57xhU6ly5^030lJBEtY&2a!C8}&#Ird<Oh*Ml6sbW(2^f3
zibWE0OWteA&yhS~lRs+7=Sl8Xe<ghocG>EG!>ZpvayR?iu26p$$=&+zAjwbJ{1+_$
z$4LHNoBU}@evahdx5>vW`8>(p`hVpjtSH1d{#pHdz^dOs^6%N?-?8M|NPfsBAGhSY
zNdAOPK4QralH4u6V<g{ctDm*%pCft3CQn-Od6LTyZmWGqq#Uc1OW0+V;?jrZWEEvk
z5QM0JU%6BPmdd3HvA7%tD>u1tT#?RHA(l8GYTnA?lxrK<r{St~Xu|^r80srMIah(L
zfvcSUS{J^-g$IG7{g)ueB%c+Ke;qF5m3)o@>w&AB-$By<A?eF!2CzNEYiX?IS_k$F
z@nPa}4FmfT@qcLgKPTQvL)iuQn0^fx#yLS;+4(*3RW!s(|25+Kh^zj5gZLcrQ*e*z
zB3x+yC`}2u)=>cML>{6cmTMgFXNbQ=T&^A9^~4{eDKriY(`Mq;G==0^2L1@~1H=zW
zZ6UJ610O4bCx|~u{1kEJ_s7J;_$r1Z*DB;M6F*B_u2JBV#2@%LYSUpD<Zl8mH|}D<
z>`VA!f?mwAbSfK(#S;mUj3yFki{lGh^k@1~W{=34nM6E=S*(A^Q86+o-|mWM`(x>Z
zh(xkxG`1rW>)jFQiS{Lww7*A{%xG64Zr#K)Nma&(%xKCi-CMPzrkPRr@u*cy_bV7n
zC;KDm{&)t$x5U^K2OLQCrBe}TvO^Nfq_bHE&BRmDWZZ$H*=*mVDF^P)q#tv@RN8c~
zL|?McN#lSWs`1C8ELb@-5jlEhCLS0417@rjx<q_R&H^EDIpS2A|FD=IB94rfh9ptq
zsJ|30rN4u5Zs%K!FJt;oGS2mX#`w)l{|w_eb(P;Y8RvFzJz~N*amgrsT#uM^{#C}Y
zy%;N|hc$jn5sM7tHNcepXBbCa#ZNHK<2lPX`c?bIDUGXfnq{2(t;PmH!i@X<660Kd
zBjf0IIaY?$r16zSEMkmvJA;gKzlRv-?foU===XDE|ER{lK>Ux4bH9IQocq0n-V-S1
z`YRYmzjb84PUCkHZ(y9;X=9xG-OV`He~NMRyN2xlgmJF_GUMF-G~-<VpNyk@KiQwt
z_&Va%^#0TP=XS=q-zLVn-%iHS?|QPIV4UlZFwX7&f^n{YlyS7*K=%Kj@%xFt#W=S!
z%Q*MD8jV82e&F--0T<rs!jmq1kZ~*q;KH;=<6kLa@jT-^{v(X@_%ATd<DYloOK87>
z?M0PM<hNGi4-&tFaURb`#(6v@<2;_c3xAGrjHikGzMygV9+zo?aURc~8RzjVp?#P>
zzMpmBUt}EPQSU#$#vi75LX7ixx*6y39AupL&k+~?TgEY-N67D_#=D6BN#otbXBg*k
zR?@x``-jJQFXKGUW*7c7#xc$w@*C55FYzJ9c|6ZD&f_^j9N+C|U+w2#WBPm_@>j-r
z{Bth+zl?MHRahC4S}$t<d^_Vj{tb-t_!Ep{QSAptUHBN|7>|iTK>8`;-0yM5x!+5S
zV^R67!j6QbuZvq5N54Z-3(lc5K1_Tq<2;^L#(6w@80Yci8Arb(WdB)>?<M{s<J|8g
z<J|9m80UT$)Ax@W-+g4iM&nNtuVbA1y^nG3H%%PfW4qM%+7Q#{^Y(d7{|Dsv1sDAn
z8NUN`)%c!dypHj|xbRsQ?j`@&KX|DWpn~F!biZBWFVX#o#?^VlxW?7FLP6u|Twz+{
z>RbW8(=n-d)VYFJ<LX=?pmBAsuwCQoTwz4x>Re%5<LX?YpmBAsFs*TQuAn+s#jnm4
zywvH6t8;~b#?`sPc8#lZg%ORbbA@q@t8;~d#?`sPw8quBf;xIbF<$CiLHM#mN%&}o
z+{_g7URBD(6H%WT-)Rb8chrmuUspCOe3^9d20qG@armD1!3S{Mx49*JmpmH)1*{hD
zjr3&T(;CNoA(9u2;Ly-E!ZI14()+YNlz@g&-HH`Zs)Q?Gkz(QSCyV)VT;!0@4A!OB
zjrF~SYZp0f*P&EQ>#3f)SGn$g4G7TYwbu7TU9?HV3#DRG{-0BTa^3%Zz>(E!dS@yA
zdo-@<t9&EX*VKeZeSm8MRZn5ury<khucG?PwT@B!uj;o$q1^ZtK3~)bkYOA@tgGs)
z?`3@EYc7fvR~55pF|+>l_{+tP%3eB*J50v0JMsOc`$tyJ|LNO60O@a<L+w`l4=vde
AM*si-
--
GitLab