From a07ed6eea7e85c3a92694ff08eb1f41a53cb32bf Mon Sep 17 00:00:00 2001
From: "ariard@student.42.fr" <ariard@student.42.fr>
Date: Sun, 12 Feb 2017 18:47:16 +0100
Subject: [PATCH] moaaaar grammar

---
 42sh/includes/.parser.h.swn        | Bin 0 -> 20480 bytes
 42sh/includes/parser.h             |   4 +-
 42sh/src/parser/.eval_sym.c.swm    | Bin 0 -> 16384 bytes
 42sh/src/parser/.eval_sym.c.swn    | Bin 0 -> 24576 bytes
 42sh/src/parser/.produce_sym.c.swn | Bin 0 -> 12288 bytes
 42sh/src/parser/aggregate_sym.c    |  68 +++++++++++++++++----
 42sh/src/parser/eval_sym.c         |  92 +++++++++++++++++++++++------
 42sh/src/parser/produce_sym.c      |   2 +-
 8 files changed, 133 insertions(+), 33 deletions(-)
 create mode 100644 42sh/includes/.parser.h.swn
 create mode 100644 42sh/src/parser/.eval_sym.c.swm
 create mode 100644 42sh/src/parser/.eval_sym.c.swn
 create mode 100644 42sh/src/parser/.produce_sym.c.swn

diff --git a/42sh/includes/.parser.h.swn b/42sh/includes/.parser.h.swn
new file mode 100644
index 0000000000000000000000000000000000000000..2abcaac7df2b3534f54e4e69c54e7874312065cc
GIT binary patch
literal 20480
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

literal 0
HcmV?d00001

diff --git a/42sh/includes/parser.h b/42sh/includes/parser.h
index d15dc7a9..8ca18491 100644
--- a/42sh/includes/parser.h
+++ b/42sh/includes/parser.h
@@ -6,7 +6,7 @@
 /*   By: jhalford <jack@crans.org>                  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/12/01 12:15:54 by jhalford          #+#    #+#             */
-/*   Updated: 2017/02/10 15:58:05 by ariard           ###   ########.fr       */
+/*   Updated: 2017/02/12 17:41:16 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -203,8 +203,8 @@ extern t_prodmatch g_prodmatch[];
 
 struct	s_stackmatch
 {
-	t_sym under;
 	t_sym top;
+	t_sym under;
 };
 
 typedef struct s_stackmatch	t_stackmatch;
diff --git a/42sh/src/parser/.eval_sym.c.swm b/42sh/src/parser/.eval_sym.c.swm
new file mode 100644
index 0000000000000000000000000000000000000000..f8bd1d65c0b323fce7f61b953a91a4b917bfc3bd
GIT binary patch
literal 16384
zcmeI3Z)_W99mlU7uzApJu#Jf#;FhRe(pZV}r)%&is$*YTGskxAWT}`o<0jscrcF}Y
zWvfC)kvfDrK)@z=1$0pM0%`DKXcK5dplOJy0>+=AX=v{l8k#_Wv`$nY_&oRAouB9N
zld38e0_m>$#J=D6x!?0V-{<VR=Q;Oa>W=)BJ3g3l*sgP&tzS5O;QoKU-|5@7$*DIN
z>&<x~TzG4YHg~R$qz1=E2JdNJpy&fK;ZV7`a;P!aZVio%v=)Y1&AFk~db8DN4mCbr
zKU`}aKQcIXfh@5UI}kf?X%1|0Mn{JIk9u#<&F=N@nz^(z@lmk@u>-LKu>-LKu>-LK
zu>-LKu>=2?4zyP{JD;TGn}gP$2wpcCuU7>7t>E=jh92z3FR=r$1F-|K1F-|K1F-|K
z1F-|K1F-|K1F-|K1OI~#)Oo&t1MNzQ1puD^p9tFc-D@4^ZrB1(U*kASuoa%);yCxi
zE%4iSIL?D`5>{aa_CpDFK@VI9=ilx)e}@<0*YE^<8IHr<kcC@d3;g+N$N4$@44#4~
z;ZZmZpMk@$1Z5b5_rhj)J>fXNfv4dycnDTu1<H_u>*3s0j`KVC5uAZjumlD82n@nI
z;ms=@=M{Jk9*0L@9qQmg7PiAx@Ta#q&adG6a2h@h%dj8DU=(hIb8mH=m*IzS22Q~W
z+yUdT72X5q-$FTf22R6+a0rSp1~<Yv7G&Olm*5BRbvOx2P=Rr9;R^TzWBV$+0MEd;
z;B#;aR^SL!pbR@foC`x>+Y)R}Vr}~NnpenACf#gls$7~W=4yp}b$UJNL}Jz3P@LZ9
z6)j?LsK{FMW()bE7bO+-iFnm3XDXTLQl(ZZi^{?{@<gV%R}G2dCn{d%c7n2Cwosaw
z@GAD~k!Y(T5{-JIxLTRts7T39<!Z&ulovKl6J|@5oK+}Syvh6lt5lttv`G~&m#=u)
zY0a{zGGSk-R-Bol|B)XBuUg%UL(_Ig6xrs9A{(wKN|!H+W;$a?syBwDyJLvDKZ<B|
zNYSkx`Tk^zIlDz2)#gw~H4N$qUH)_=(;i(>-O&}@99`4B>1bAKI<nOn;oOGCM54`?
zNHlDT;$5ypifM`_sGewoZiy!8jzp5xkVrNB2)?&+zG3zgCDd$ogqq<-816D76ihGF
zxN3zO*PT!m-H1@J`Vfj6*dT1mWvcr&aH1ny&FILcA04IJl8)BpiY{r!=#t@$E*kc9
zM7u*B-7raBiE=`}fIs#NU2v4mm!xa=gsZG^{RxtYaF-Xdw8aN0SUgC&8}~oy+WTJh
zrt+4nzqpj=q^9;o8pZ`*T>kmKsg*hxFtKY1M^`%EVats~cqO#ktQ>Awtte^}<y}Z8
zsp+k9m^m7Tq+4%@y8VjSH3ZVLOtqTdTlA*9;<P{1#^}mI;v7i2;%|8WCdNTVvzcmi
z+ae=K<$T!)iatecTXWjAR=Ym8bfn&%TS(li?A&>myW4Sk7nkP_ADeHuJ@Pldg9|;}
zZ0>M(T(-^KF(eXR#w|=ZvpQdIH|EpsNNRZ3P-<joc*Gsvl^#o_caFOUkGt~c%}T|+
zy}j)5*WdVYbfAR^v(1K{F!e!q_}28ut?AK}HKE%(ATow8K|1%+x;#L#;2(*27p3bY
zoH(8iyY(U2y*;fq!?)a)zxMvHa!i<HART5>a)w>j%U{Hv$kxe7JA>?D!p?8TFCv*N
zk{(EFZ{&WM@S@YG1=Hy;CGW(B_#Y)ylZWqR!prtS;X^m%i2462bIt?IW5xVGe7^rW
z^ZsALFW^ad3_c4F!78l40mwo>TnpF0o2(JM0zZN0;Boj0d;;q5G1vzqa1;E4b%gWq
zdw2n!g0I0>;UpY^{jd|p;3jxC{EKykSK%x?58s0);8FM@tidA8!VKhK6h`2Euo*VN
zYpgk(h3~+_(1I#dAO$zT-&kMxE4&0hhBNRD_&gkiWtfFM;KB#sO86t|4KKp8@NM`K
ztieH;fIV<CTn%rq=I}B+3*UqXU>(|U6js55ER4f0_zPq98k~in!U;GEhu~iLD2Q>L
zg?Nh{h#iO>h#mOvII!*{nvM3c=Ca#2+<%*sU_Y@qFu=P+B&39pSiHyWTW;JZ{@<Is
zd$+6IGB4gW*j`z6w{Lg-n`&Pl?A%}9iGFN(zR~RGZr(}Ux3GA);r3ZFpf9?+-4ylZ
z_V)FNdnR|GQJ;6Wwfy8%y{*-gbh#g$7q{%~MxS3xzZMEw*-x{{x7-$M!Hc&!YmR&$
z-ih@w1t6iHAnD4T@K7#lv|%lkbW?I2QeEklv%-Qm?bTRTo??1eT~E3c?=GY*IUD-4
zSDEscPW8jINscb%i<a`ys;ypD-4jRAyl67m=|HFbx*iqvD~$I1xpFkM(!>7T*HT>0
zeoZ0hijqR~+bks}a+!)(tg%8IO!AZ?P{l-iJ;{AZVohD9vCZ3cJu+VphqFszSEO7p
z8<qs)=pV9whIwp0Q=nyKW5QbXbTP2N3<u*$Hof<@R+uHqnQ2-h&k|FM_Df|?lu#=W
zA^SRyv|s9xA<9z?Ri_5^>4qvrqvnsW))e~11YUa{pdLA?`@yt6>54NDgN2>hXqGR6
zNRb1wf0-$UAsiv$s2>Q2S(cHjIclMBeMdej5{Jo%_SuZ0!9Yg)T8r}-tMy*iDU7l^
zE)|>CQc;u1T$PDRCQIMVXIxS(1giOkAbJ&Qw%S6CV(O@d;qGQkmNs~1<qNhde8I@?
z$JFHFqez(<K2`<0V}WF=A&`tZf~Z=HtYmgyzJQT7s{+YZNgx@O1kvtFylN(EoD-sh
zG8}ytYDF$8vQ>r>eRf4z``VyXY~7HG(Nr1iZfUMm-0-x@l|<F*H(J<Sp+pxYY7+bA
XsTmCFWcLcIqId<q7x*p^&ujk;8>e@M

literal 0
HcmV?d00001

diff --git a/42sh/src/parser/.eval_sym.c.swn b/42sh/src/parser/.eval_sym.c.swn
new file mode 100644
index 0000000000000000000000000000000000000000..15f49d57bcf37e914aa7f93299bb64c851f39efa
GIT binary patch
literal 24576
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

literal 0
HcmV?d00001

diff --git a/42sh/src/parser/.produce_sym.c.swn b/42sh/src/parser/.produce_sym.c.swn
new file mode 100644
index 0000000000000000000000000000000000000000..222f271b46a00f0c5b8ec14ecc33d2769cc725d3
GIT binary patch
literal 12288
zcmeI2&2Jk;7{=cqp|WiQ2u{rbO=1)hd*iP-t#L?%Kh~*Ldu@4bQVE5XYi}Bp)V9`Z
z+9*o76vPQ}?2#i968r-_A#p(5Ie>r@N6v@?D$ndkvbKZkLM}zK$<Mp9^UO2vJiB%j
zd2dDEDU?_;93^Zo6BR!D{N|^By+-vbGt@BK4YS2NCU3^7xz>wE!-;r!*PI}|?-)iZ
zX7_!gY4szCcz-X_H=B`O!|WSoq-S<pgQlVP5ATGV6O2TcNI)d;bO{Ws-Ie4lt;S>a
zTRpHa&t83{{&XHfEfNq3hy+9eA_0+rNI)bY5)cVI(+OC;8Tt?_c+Opg;_hcg_HI+`
zL;@lKk$^}*Bp?zH35Wzl0wMvCfJi_jAQE^66KLT3{hyvEx^w}><NJT_|NpOFB6<(Z
zf=4eB?Snb+-7L{P@CNwdGSNri0qB7)sDcWJg3I9dOGMv;FTp3^Hpqf`@c1Ip&)^Yw
z2=0R&kOWu31@NOp^ac0;48S&62Xo-h7l?iZzksj6$KV0D2L`|bNpKas4(7lW@EB|T
z1N;WQ1>b;&zyd1R0y&TXb6^(md@cg9i3CIfA_0-W|1N=Jl1#%Im>sqhU0x?i3U-XU
z{8==%!L07S(OKEF4toZA+PiFN-s@c^2_vO;D8$G32i?~B18sL2R&(#&_D<M!vsH_W
ztZy}%`)rYosO;15v?uXR%QiMfrFJh#M<m_dYabYFX~fE%5N2MjSczIM7Wooz7{%W9
z!0}S>pl>a&Y&N?c%jj6^1WCujdfHs1+cGT9-mlXU*`2=U^_DC<DZ6@^ISp@C-acse
zEf%yVAv%WVQB-F9_gE$gt=bJ;Rkn)-RgoEg%~X~24Vk&;^kPA)apjOMTP{_KN=?ym
zP)e&gZA|YDNSEM>8S>>SBxs#j***SAWR@QnXi6nrP1nj*y<9m{0Pjp%-8!?+w;Ipd
zDJ!jMg)LPnDQZpME?0BI)yphf%ITG=k}ur!${imuT-h`uPD-6d?5llP?ySJ68jgrZ
zQ4x-!%B+&E)s(7wEc46Cua~3BrZvUBj6Q|mrGTMa>A%wdl#2ffIhv6|#|6B6e%6Uq
ztLJ^Ox&=aUdUTcoYsnVNnT&$FC|@Wl<Fi0fR5Wc1H*al%Cif(P-H$tZg2$6AcpZ}+
zxMIQtIo_X3Yu9CVU8yR%qUOB&(1{6)wKYTiM`WFT>PeFS6KRKS5Cz(u=E0z4um$It
z-|*f7Q6z|uhV$B3Fv1Pbaq|r8y;j3AS}7Kf#;!%8@klJrV%JiMSSqo`ZXGh`@n+w|
zfj|H)yxJQcj&}Pz!>nlx8%E#chHJ^xYT`^o76@@iZ|B;vf4Afi%-kOs;poKf)G%|H
z@|N|Mv%I(a7A{}Ma-R0y^o{XMLMhM5=jknZSU*LJyPZ0sPS@Qt^!*JAH>dD}Bo#_I
mLifPgd4|(@jHps6&k{#`L;rs=9PziCj^TN|Pl9;UMd)vwQD*P}

literal 0
HcmV?d00001

diff --git a/42sh/src/parser/aggregate_sym.c b/42sh/src/parser/aggregate_sym.c
index 35b9ea4d..d2bccfe3 100644
--- a/42sh/src/parser/aggregate_sym.c
+++ b/42sh/src/parser/aggregate_sym.c
@@ -6,7 +6,7 @@
 /*   By: ariard <ariard@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/02/09 17:39:18 by ariard            #+#    #+#             */
-/*   Updated: 2017/02/09 20:19:29 by ariard           ###   ########.fr       */
+/*   Updated: 2017/02/12 18:47:00 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,25 +14,26 @@
 
 t_aggrematch		g_aggrematch[] =
 {
-	{CMD_SUFFIX, TK_WORD, CMD_SUFFIX},
-	{TK_PIPE, TK_WORD, PATTERN},
-	{WORDLIST, TK_WORD, WORDLIST},
+	{TK_WORD, CMD_SUFFIX, CMD_SUFFIX, ALL, 0},
+	{TK_WORD, TK_PIPE, PATTERN, ALL, 0},
+	{TK_WORD, WORDLIST, WORDLIST, ALL, 0},
 
-	{CMD_PREFIX, TK_ASSIGNEMENT_WORD, CMD_PREFIX},
+	{TK_ASSIGNEMENT_WORD, CMD_PREFIX,CMD_PREFIX, ALL, 0},
 
-	{ELSE_PART, TK_FI, IF_CLAUSE},
-	{COMPOUND_LIST, TK_FI, IF_CLAUSE},	
+	{TK_FI, ELSE_PART, IF_CLAUSE, ALL, tant que IF},
+	{TK_FI, COMPOUND_LIST, IF_CLAUSE, ALL, tant que IF},
 
-	{COMPOUND_LIST, TK_DONE, DO_GROUP},
-	{COMPOUND_LIST, TK_RBRACE, BRACE_GROUP},
+	{TK_DONE, COMPOUND_LIST, DO_GROUP, ALL, tant DO},
 
-	{TK_PAREN_CLOSE, COMPOUND_LIST, SUBSHELL, 2},
+	{TK_RBRACE, COMPOUND_LIST, BRACE_GROUP, ALL tant que LBRACE},
+
+	{TK_PAREN_CLOSE, COMPOUND_LIST, SUBSHELL, ALL, tant que TK_PAREN_OPEN},
 	
 //watch this
-	{SEPARATOR, COMPOUND_LIST, COMPOUND_LIST, 1},
+	{SEPARATOR, COMPOUND_LIST, COMPOUND_LIST, ALL, 0},
 
-	{LINEBREAK, TK_SEMI, SEPARATOR_OP, 1},
-//prediction one
+	{LINEBREAK, TK_SEMI, SEPARATOR_OP, ALL, tant que TK_SEMI},
+//do one
 	{LINEBREAK, TK_PAREN_CLOSE, TK_ESAC, CASE_ITEM_NS, tant que pattern ou '('},
 	
 	{NEWLINE_LIST, NEWLINE_LIST, NEWLINE_LIST, ALL, tant que newline},
@@ -42,7 +43,48 @@ t_aggrematch		g_aggrematch[] =
 	{NEWLINE_LIST, TERM, SEPARATOR, ALL, 0},
 	{NEWLINE_LIST, COMPOUND_LIST, SEPARATOR, ALL, 0},
 
+	{IO_HERE, ALL, IO_REDIRECT, ALL, TK_IO_NUMBER},
+	
+	{FILENAME, TK_LESS, IO_FILE, ALL, TK_LESS},
+	{FILENAME, TK_LESSAND, IO_FILE, ALL, TK_LESSAND},
+	{FILENAME, TK_GREAT, IO_FILE, ALL, TK_GREAT},
+	{FILENAME, TK_GREATAND, IO_FILE, ALL, TK_GREATAND},
+	{FILENAME, TK_DGREAT, IO_FILE, ALL, TK_DGREAT},
+	{FILENAME, TK_LESGREAT, IO_FILE, ALL, TK_LESSGREAT},
+	{FILENAME, TK_CLOBBER, IO_FILE, ALL, TK_CLOBBER},
+	
+	{IO_FILE, ALL, IO_REDIRECT, ALL, TK_IO_NUMBER},
+
+	{IO_REDIRECT, COMPOUND_COMMAND, REDIRECT_LIST, ALL, REDIRECT_LIST},
+	{IO_REDIRECT, CMD_SUFFIX, CMD_SUFFIX, ALL, CMD_SUFFIX},
+	{IO_REDIRECT, CMD_NAME, CMD_SUFFIX, ALL, 0},
+	{IO_REDIRECT, CMD_WORD, CMD_SUFFIX, ALL, 0},
+	{IO_REDIRECT, CMD_PREFIX, CMD_PREFIX, ALL, CMD_PREFIX},
+	{IO_REDIRECT, LINEBREAK, CMD_PREFIX, ALL, 0},
+	{IO_REDIRECT, TK_BANG, CMD_PREFIX, ALL, 0},
+	{IO_REDIRECT, SEPARATOR_OP, CMD_PREFIX, ALL, 0},
+	{IO_REDIRECT, NEWLINE_LIST, CMD_PREFIX, ALL, 0},
+
+	{REDIRECT_LIST, COMPOUND_COMMAND, COMPOUND_COMMAND, ALL, COMPOUND_COMMAND},
+				
+	{CMD_SUFFIX, CMD_WORD, SIMPLE_COMMAND, ALL, CMD_PREFIX},
+	{CMD_SUFFIX, CMD_NAME, SIMPLE_COMMAND, ALL, CMD_NAME},
+
+	{CMD_PREFIX, LINEBREAK, SIMPLE_COMMAND, TK_NEWLINE ou TK_SEMI ou TK_AMP, 0},
+	{CMD_PREFIX, TK_BANG, SIMPLE_COMMAND, TK_NEWLINE ou TK_SEMI ou TK_AMP, 0},
+	{CMD_PREFIX, SEPARATOR_OP, SIMPLE_COMMAND, TK_NEWLINE ou TK_SEMI ou TK_AMP, 0},
+	{CMD_PREFIX, NEWLINE_LIST, SIMPLE_COMMAND, TK_NEWLINE ou TK_SEMI ou TK_AMP, 0},
+
+	{CMD_WORD, CMD_PREFIX, SIMPLE_COMMAND, TK_NEWLINE ou TK_SEMI ou TK_AMP, 
+		CMD_PREFIX},
+
+	{CMD_NAME, LINEBREAK, SIMPLE_COMMAND, TK_NEWLINE ou TK_SEMI ou TK_AMP, 0},
+	{CMD_NAME, TK_BANG, SIMPLE_COMMAND, TK_NEWLINE ou TK_SEMI ou TK_AMP, 0},
+	{CMD_NAME, SEPARATOR_OP, SIMPLE_COMMAND, TK_NEWLINE ou TK_SEMI ou TK_AMP, 0},
+	{CMD_NAME, NEWLINE_LIST, SIMPLE_COMMAND, TK_NEWLINE ou TK_SEMI ou TK_AMP, 0},
+
 	{0, 0, 0},
+}
 
 int			aggregate_sym(t_sym **stack, t_sym *new_sym)
 {
diff --git a/42sh/src/parser/eval_sym.c b/42sh/src/parser/eval_sym.c
index 72313720..711b4761 100644
--- a/42sh/src/parser/eval_sym.c
+++ b/42sh/src/parser/eval_sym.c
@@ -6,7 +6,7 @@
 /*   By: ariard <ariard@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/02/09 16:26:30 by ariard            #+#    #+#             */
-/*   Updated: 2017/02/10 16:57:46 by ariard           ###   ########.fr       */
+/*   Updated: 2017/02/12 18:46:15 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,22 +14,22 @@
 
 t_stackmatch	g_stackmatch[] =
 {
-	{CMD_SUFFIX, TK_WORD},
-	{TK_PIPE, TK_WORD},
-	{CASE, TK_WORD},
-	{WORDLIST, TK_WORD},
+	{TK_WORD, CMD_SUFFIX},
+	{TK_WORD, TK_PIPE},
+	{TK_WORD, CASE},
+	{TK_WORD, WORDLIST},
 
-	{CMD_PREFIX, TK_ASSIGNEMENT_WORD},
+	{TK_ASSIGNEMENT_WORD, CMD_PREFIX},
 	
-	{REDIRECT_LIST, TK_IO_NUMBER},
-	{CMD_SUFFIX, TK_IO_NUMBER},
-	{CMD_PREFIX, TK_IO_NUMBER},
-	{CMD_NAME, TK_IO_NUMBER},
-	{CMD_WORD, TK_IO_NUMBER},
-	{LINEBREAK, TK_IO_NUMBER},
-	{TK_BANG, TK_IO_NUMBER},
-	{SEPARATOR_OP, TK_IO_NUMBER},
-	{NEWLINE_LIST, TK_IO_NUMBER},
+	{TK_IO_NUMBER, REDIRECT_LIST},
+	{TK_IO_NUMBER, CMD_SUFFIX},
+	{TK_IO_NUMBER, CMD_PREFIX},
+	{TK_IO_NUMBER, CMD_NAME},
+	{TK_IO_NUMBER, CMD_WORD},
+	{TK_IO_NUMBER, LINEBREAK},
+	{TK_IO_NUMBER, TK_BANG},
+	{TK_IO_NUMBER, SEPARATOR_OP},
+	{TK_IO_NUMBER, NEWWLINE_LIST},
 
 	{TK_AND_IF, AND_OR},
 
@@ -224,6 +224,65 @@ t_stackmatch	g_stackmatch[] =
 	{NEWLINE_LIST, COMPOUND_LIST},
 	{NEWLINE_LIST, COMPLETE_COMMANDS}, 
 
+	{HERE_END, DLESS},
+	{HERE_END, DLESSDASH},
+
+	{IO_HERE, TK_IO_NUMBER},
+	{IO_HERE, REDIRECT_LIST},
+	{IO_HERE, CMD_SUFFIX},
+	{IO_HERE, CMD_PREFIX},
+	{IO_HERE, CMD_WORD},
+	{IO_HERE, CMD_NAME},
+	{IO_HERE, LINEBREAK},
+	{IO_HERE, TK_BANG},
+	{IO_HERE, SEPARATOR_OP},
+	{IO_HERE, NEWLINE_LIST},
+
+	{FILENAME, TK_LESS},
+	{FILENAME, TK_LESSAND},
+	{FILENAME, TK_GREAT},
+	{FILENAME, TK_GREATAND},
+	{FILENAME, TK_DGREAT},
+	{FILENAME, TK_LESSGREAT},
+	{FILENAME, TK_CLOBBER},
+
+	{IO_FILE, TK_IO_NUMBER},
+	{IO_FILE, REDIRECT_LIST},
+	{IO_FILE, CMD_SUFFIX},
+	{IO_FILE, CMD_PREFIX},
+	{IO_FILE, CMD_WORD},
+	{IO_FILE, CMD_NAME},
+	{IO_FILE, LINEBREAK},
+	{IO_FILE, TK_BANG},
+	{IO_FILE, SEPARATOR_OP},
+	{IO_FILE, NEWLINE_LIST},
+
+	{IO_REDIRECT, REDIRECT_LIST},
+	{IO_REDIRECT, CMD_SUFFIX},
+	{IO_REDIRECT, CMD_PREFIX},
+	{IO_REDIRECT, CMD_WORD},
+	{IO_REDIRECT, CMD_NAME},
+	{IO_REDIRECT, LINEBREAK},
+	{IO_REDIRECT, TK_BANG},
+	{IO_REDIRECT, SEPARATOR_OP},
+	{IO_REDIRECT, NEWLINE_LIST},
+
+	{REDIRECT_LIST, COMPOUND_COMMAND}
+
+	{CMD_SUFFIX, CMD_WORD},
+	{CMD_SUFFIX, CMD_NAME},
+
+	{CMD_PREFIX, LINEBREAK},
+	{CMD_PREFIX, TK_BANG},
+	{CMD_PREFIX, SEPARATOR_OP},
+	{CMD_PREFIX, NEWLINE_LIST},
+
+	{CMD_WORD, CMD_PREFIX},
+	
+	{CMD_NAME, LINEBREAK},
+	{CMD_NAME, TK_BANG},
+	{CMD_NAME, SEPARATOR_OP},
+	{CMD_NAME, NEWLINE_LIST},
 	{0, 0},
 };
 
@@ -235,8 +294,7 @@ int			eval_sym(t_sym stack, t_sym new_sym)
 	i = 0;
 	while (g_stackmatch[i].top)
 	{
-		if (stack == g_stackmatch[i].under
-			&& new_sym == g_stackmatch[i].top)
+		if (new_sym == g_stackmatch[i].top && stack == g.stackmatch[i].under)
 			return (0);
 		i++;
 	}
diff --git a/42sh/src/parser/produce_sym.c b/42sh/src/parser/produce_sym.c
index 112ada0f..8dea1220 100644
--- a/42sh/src/parser/produce_sym.c
+++ b/42sh/src/parser/produce_sym.c
@@ -6,7 +6,7 @@
 /*   By: ariard <ariard@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/02/09 17:58:34 by ariard            #+#    #+#             */
-/*   Updated: 2017/02/10 16:57:17 by ariard           ###   ########.fr       */
+/*   Updated: 2017/02/12 17:41:45 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */