From ea3c5298e2e65321a1f72b98d0ab85737be8e2de Mon Sep 17 00:00:00 2001
From: Vadym Slizov <z7zmey@gmail.com>
Date: Fri, 4 Dec 2020 12:49:13 +0200
Subject: [PATCH] [refactoring] update ast structure of "For", "TraitUseAlias"
 and "TraitUsePrecedence" nodes

---
 internal/php5/php5.go | Bin 264589 -> 265977 bytes
 internal/php5/php5.y  |  44 +++++++++++++++++++++---------------------
 internal/php7/php7.go | Bin 219415 -> 219796 bytes
 internal/php7/php7.y  |  36 +++++++++++++++++-----------------
 pkg/ast/node.go       |  13 +++++++++----
 5 files changed, 49 insertions(+), 44 deletions(-)

diff --git a/internal/php5/php5.go b/internal/php5/php5.go
index 664719238ff45eadb75c96c1a8e75f16e221581f..626fc16ccbf360ff1988ca8972dc6a6a12f02b40 100644
GIT binary patch
delta 11947
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
Z`-K&7w1%lPv%@n~T*C`JT@ydz{2zUHo)7>4

delta 10506
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%0DgG|#$}>q>
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
YA421!9PADF_3Ql^Kv?ix-4r4J8v>wnQ~&?~

diff --git a/internal/php5/php5.y b/internal/php5/php5.y
index e58d0cf..8c4c536 100644
--- a/internal/php5/php5.y
+++ b/internal/php5/php5.y
@@ -240,7 +240,7 @@ import (
 %type <node> switch_case_list non_empty_function_call_parameter_list assignment_list lexical_var_list
 %type <node> method_body trait_reference_list static_array_pair_list non_empty_static_array_pair_list
 %type <node> foreach_statement for_statement while_statement isset_variables
-%type <node> foreach_variable foreach_optional_arg
+%type <node> foreach_variable foreach_optional_arg for_expr non_empty_for_expr
 %type <node> extends_from interface_list trait_list
 %type <node> implements_list
 %type <node> interface_extends_list
@@ -248,8 +248,8 @@ import (
 
 %type <list> top_statement_list namespace_name use_declarations use_function_declarations use_const_declarations
 %type <list> inner_statement_list encaps_list
-%type <list> elseif_list new_elseif_list non_empty_for_expr
-%type <list> for_expr case_list catch_statement additional_catches
+%type <list> elseif_list new_elseif_list
+%type <list> case_list catch_statement additional_catches
 %type <list> non_empty_additional_catches class_statement_list
 %type <list> class_statement_list variable_modifiers method_modifiers
 %type <list> trait_adaptation_list non_empty_trait_adaptation_list
@@ -938,11 +938,14 @@ unticked_statement:
             {
                 $9.(*ast.StmtFor).ForTkn = $1
                 $9.(*ast.StmtFor).OpenParenthesisTkn = $2
-                $9.(*ast.StmtFor).Init = $3
+                $9.(*ast.StmtFor).Init = $3.(*ast.ParserSeparatedList).Items
+                $9.(*ast.StmtFor).InitSeparatorTkns = $3.(*ast.ParserSeparatedList).SeparatorTkns
                 $9.(*ast.StmtFor).InitSemiColonTkn = $4
-                $9.(*ast.StmtFor).Cond = $5
+                $9.(*ast.StmtFor).Cond = $5.(*ast.ParserSeparatedList).Items
+                $9.(*ast.StmtFor).CondSeparatorTkns = $5.(*ast.ParserSeparatedList).SeparatorTkns
                 $9.(*ast.StmtFor).CondSemiColonTkn = $6
-                $9.(*ast.StmtFor).Loop = $7
+                $9.(*ast.StmtFor).Loop = $7.(*ast.ParserSeparatedList).Items
+                $9.(*ast.StmtFor).LoopSeparatorTkns = $7.(*ast.ParserSeparatedList).SeparatorTkns
                 $9.(*ast.StmtFor).CloseParenthesisTkn = $8
                 $9.(*ast.StmtFor).Node.Position = position.NewTokenNodePosition($1, $9)
 
@@ -2537,19 +2540,15 @@ non_empty_trait_adaptation_list:
 trait_adaptation_statement:
         trait_precedence ';'
             {
-                $$ = $1;
+                $1.(*ast.StmtTraitUsePrecedence).SemiColonTkn = $2
 
-                // save comments
-                yylex.(*Parser).setFreeFloating($$, token.NameList, $2.SkippedTokens)
-                yylex.(*Parser).setToken($$, token.SemiColon, $2.SkippedTokens)
+                $$ = $1;
             }
     |   trait_alias ';'
             {
-                $$ = $1;
+                $1.(*ast.StmtTraitUseAlias).SemiColonTkn = $2
 
-                // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Alias, $2.SkippedTokens)
-                yylex.(*Parser).setToken($$, token.SemiColon, $2.SkippedTokens)
+                $$ = $1;
             }
 ;
 
@@ -2976,7 +2975,7 @@ echo_expr_list:
 for_expr:
         /* empty */
             {
-                $$ = nil
+                $$ = &ast.ParserSeparatedList{}
             }
     |   non_empty_for_expr
             {
@@ -2987,14 +2986,16 @@ for_expr:
 non_empty_for_expr:
         non_empty_for_expr ',' expr
             {
-                $$ = append($1, $3)
+                $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2)
+                $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, $3)
 
-                // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.SkippedTokens)
+                $$ = $1
             }
     |   expr
             {
-                $$ = []ast.Vertex{$1}
+                $$ = &ast.ParserSeparatedList{
+                    Items: []ast.Vertex{$1},
+                }
             }
 ;
 
@@ -4461,10 +4462,9 @@ dynamic_class_name_variable_properties:
 dynamic_class_name_variable_property:
         T_OBJECT_OPERATOR object_property
             {
-                $$ = $2
+                $2[0].(*ast.ExprPropertyFetch).ObjectOperatorTkn = $1
 
-                // save comments
-                yylex.(*Parser).setFreeFloating($2[0], token.Var, $1.SkippedTokens)
+                $$ = $2
             }
 ;
 
diff --git a/internal/php7/php7.go b/internal/php7/php7.go
index 4eb37848a20a7b3a6b5af32abbbeab70a995845e..35f39c1cc9ba8bda32d70573fa4134f23d812f32 100644
GIT binary patch
delta 9356
zcmcIod6-qjmH$pPG;{+kYqNAiH#DpCZQgzR1HlGl^NX^Gl1T(<7L|y~D7b;?jvANA
z#O;9<KjS(vE_^D8<Z9GmQ;~$N(NPCQMV&a&FoHTxk`bNX@6@}uAC6J~$scw5)Tydd
zXZf9T>a~5m%j%6?)?McJ$tL~!+H5jgUz^UP>uckwRDF3_CYR3N>{m7?vZ?yoL<T$3
zDJ*7F@%q|aB8eU8G{|f!S6}NVxRS)icszrtpRBJ<CNQue6^GnxCW8anTnuE6mt}b%
zjRQW31h?cUEr(O71Vm<WZF!lWYKF`NWM&gQo5Hf6qJSKEIh@OIAswTbOdLnzR5b|+
z8NDNig<OofV6X3EZ!U&wQy}6#m5TdV$i;X$w9fJ`59VT&9k1^JcYv3RVKE-3PU(35
z$@sL<@igwp@!qr=g!LRmL0|&%vsqjjSG$}@?8(p_eln9Eoftlt+vBPwKJ;7$K861i
zkdRZ867l@CiN=ydJiB2>;+h{f)5p0aK6C{3;(}ZPVkrh^=w`iu7AJTU1XF<=Lz0W*
z1cXD!wAw(5e&Ao~;_Dj4(Qq84hjKA`NFC-k$9ON+;=IL$GRrG)I-6xQ)Zf^zwr8<h
zVMX%^9EK#D!TBsPmd(&f2o<(xD44u7SJRY7WHDCRG(QxcYUZLMGn?WTLP0T`O=8`r
zPIOK-iA53wQ8EVk6oq*@jco)a@tjox%fJ=((RhLo$`ETQT!T3dX<!)ML~01XH~?-Y
z4pyA9Q!0XSB#N>K)khl^NGY%M<M}xoPb>x7k7e_}+&Hs6Bxf@Dk2n5&2(I&aX9l`r
zl$TL3hff^pC*kLR^_!v1m@+RIB8JN+lKDYu5XOZMR|!x*Moo_W<iNr}7@-OWwdK&v
zfHmP?AL#(K7;z<O5VFr_-1S39b1;4yLuP||6FV4h0!;^R!AM}U4mA<_G4(b5aXqoa
z!J420o00t}JUGe0G-~FDA<;o5PDGKV^Zhv8!w=C`Jcuxk9M!~!1nh$l{Sd`EaIazp
z`r&VRSqLD4sGI;`smW#X)1RzsriYLdU;D{GH4F&A2F0XCjUT2fF~bDpU@eN%R(z08
zZZP4PBpk$E(Evb{fp8RYzm5)f{(Uxn^ZkF{yJ^wizW>;}{TQ6>K8iz}<s3fb2cX3=
z2YVL>t4#4=hrvL810*^S(p09t8PK8R=#xY2I8e0E7#vZXLUg}jK<YPdK%<33Z8ad!
zbKHRTedG9~VN05S!@-QrkAJ#%b1e%f2g^SOoI?GvKOF2?94xs-14&n4u$M&xhgpa@
zwDt2M7Gsu2Es@Z`6>k08Ts&bBfy}Rb*qgs*;C?RPp5nnW|CPat>zLYAaR42u{L1q3
zOPVgK-O&G;%Sub3lb4O<@7U@~D!*&%*x@kWW0msg43GKav82KdkG}HYkMc4vozBO%
zrApx&FO|%nzb!TaYd+hAravc4e6Ij4ng)>JAYJP*VjdCX5jq}2<fW7OH@BTV4~OVb
z)*TN`0UBe`X9XbPSUzhG+y!xNAA2yCs7-W6OQ3T2LHnuo&`$1qE;f~r_J|YKdXE@!
zAD-~|1aL~SZaV!vZH!dLV>$Au4Fu%-KL1F6h*3@OPyv&=hTwtQ^6x%>Q#0i={2sC3
z5deBQ_W>VF0_sM6oXho@r&lmTsH4wX$Hju)ZnK{F)=zn}v(=qJQaWe4smn~NrNHwD
zE0_s<fybuum77$NLg9u{bO=;qR2fDlg@%_%Rv$8MC;|n46~u8`YzX@(`(r@|mjcvD
z0}mHa6b|sM>qJFVF(fovjFHbyM2O&wACKif+TLqGgd;A|-#n=gK>{W}=*5Wx;D7cU
z-s-W>cx*JZUv<s@^u<gwL-ef<Z#(mycYntte8D)UQwahtbfZ3jJicxngj7kO{k$E6
zyTKGzBe+77B$mqGvttlVQJ{XKJ)!vTVl%J6J{$=jqnf2Im8gLJ4pHBug*3M*iptl9
z58cR)t{JKIL_z702~ZG$t|O@C>?~?B+mg#-Ru7Nb5Q+{44v%1k`4ro*`FA6wvUn>L
zXJ-P+^0Kqv43eyw9t&o12GJMci_X^{5Rvx2Dvq?l0Y1c3LngSFO6SkpIeZx9u}Bre
z7RyvmS&Bc@mEZ2Ht75SDU~>V|lyM~n>wn%ktXWe+U$M+-)G23d7-zoZl<CfE1bxUa
z*rKYsi15j#x#b*68+?Y)l`9RYBE^+!29jI46b{qvnRtHft_GGkWk$m2QYMnt1XpHx
zmkKY`iA26)cb|SVK+(z9ug70V9-qBlHkWVQJp_H}?A;^yd&VJ3f$V&(?`&i+msE($
zR!UKe`Bv9M(X!LtrHa1%U0IDRbfuQ>{UWja@ll17S`eML3)O|3Oe#NOPi7oVW6RWS
zMg9$y@!@D-ot2U#qr=!MX0qA*U3+?WW@mMbL@K{!&%$}3H~@$TTzx{M!-u%1|2|L=
z^a@X_Op52*9!Ka*pY_b$Nw=sSXwUhp_D<w4T9xiX=ZXY>UpS8?68Znw8<%*#Z);sO
zjcxOFk@tx2@3;0J0VR1$7$)skjHdnyq2CIq%;fKC9c*%b{<&60_k-5VDXJ#n?u?`c
zo>N0_)n6@Y0lSZ<rBC~@{_n)oB%_Py>|82;!M?i5$A-{JQQu>qf)PLN;4r#a9~_b9
zPJO<2y;Ls$>b@xoSUzn$de>7m*kfFNf#8ohmw<(Cfi<M*?3YICvq_<-Dk@dLuf`~z
zfApn>(^OTBAIyiQ4rz3jRxalo`VV($cPn@a(MOIcQ{7HE&U2X!qh79SD9z@|%gR>T
zrjtz1V5yNVBEFs3RTB1*5}5@0NN><X+bO-J3iREMzNH3qpZ3acssnA#kclOUm~Yp2
zl(;P`mB~1*^i>6Vx+Lw<Qki6@mty~l4l>12A4SxXjv?>eh?-j#@?MRondKqx_YpOz
zQ^?yCQMt|`Zv&~8&d{Kti%fRZgAp~TBINxtqAHIIc{fK?c~|h(b%gd;cZEEqjz-j_
z-N2jC6?c5x4f~W@+C8NH5K;4cguML`HM?iX+g+d%c1kZNFJZSt)R;=}YI{P1jS)4f
zcgTAvqU!pDygMVRci)hAOGI_*7xI1@QC~*X<yBZcOay!qQRi2Oy!Rujsej0OJ)%w@
z5c2j!)U+D#HWNkLB5G`H$O|IM9~ko1M%0i&A@A;p>RT7`@}K}aMPkKZU@zt9>x*bJ
zq>aC-i2kgIUN*FC&j+Mq)*mL9Bc>|)&0%2qL3*Cd5_{<gy|eW!X|RVz$YhhuS=ndm
zgQnx9JM#!Dz3kx^WkB%2Nco=FflH+7wgzcu$4r%STkXjX+qB$N{iZ=qZd(kNjFKTD
zS$k7VF0luH0Xb<OX13lYm9}=SRM|&4owz=n4vk}a>(!>PdRH7O#%*gaGt90VZ^~_D
z0_$7mNKLRRAuVFfwWi9(hMM+4bxIx<d&>hj+VYr`*{YN*wpH7uGMJx{>qIhk-~m%@
z`=sPtyZKXWIJ`}|SgduhKWo5r=T_-#@0lPSZEX?;t;@;p;ha^YVGgv$-#)=xV`Qe-
z@t+i~2&RvfaYAhd1&@uBg=%(9;5W*nV%Impr1_(yy>0Q#^LEn&nfg`U`x9lVB!bvU
zvfD^1_;RxBGRDsZyQj(h#w2p&TyN~rQ;|)`&fa#_U2>dVG97`+*!9!p3Iy`r1Jctr
z&X9Kz+kqp^IJ;mbgk~cCo%YOGaACqN9-M{6SkdC^r(rSe7U$1~iU?8M?w_q!Jo^Kg
zXcwO@@7M(|!x;7I+jHRm!>361VAC05ik*R#g(eDYe|yOf6kQOK5_``9skLuEV|v+^
z4W^47@Cz9jO)Ko7cVwF#GZ&X;?UC~l(8krK)b6S<)9j(S&^Sws-YzDVBML8p!hq8#
zd+B^AjDY+0FsTqV{q1>8sN}_{d8a8f?aT$xU(wgNK>FKP7QnX=W{9br*yW3`8}P0P
zykQ159#{+=()QpH6SHTWjWxtJZug!IeUtXWtEJ9fd5&}lCY&R0iROT<eM;H|jZ5Tz
zq$Hcm*_kae)XqOo?zA`dHAC!@YXH28rMNzSjm#!>k*z;RI@wdZntsu0?{*U}ykL>N
z<r?X0N1P)ScHDRwWcL@&_O=f$l^@!_bS{$D+a6wueAE-4bvAX**U^b!<oV3xv{N~D
zp>zzETp;g}<BvsJFI^^Cp>Jw}ZT~1^n6=99e=(dQIXnGQSo*KaaqOz)GJ^@FoV7=#
zEckMTOc!7noQpLhYJ!88q5ry6?Q(@wN&AHM<_lNK(BQO{a*k=AR7SUE8E&s^k&$-(
zkEJT`ek^rH(gA!{U1E~401kf0*dzZX)y(rXcE`0E4d&Nv-A$(;ah-f$aaR*Od;>Kt
zsBL~G2MZZ#elA-DIRNmCvY+0F^O<1mO|qiIK0devXd7qR+kLkp*V39BbvCvdRbf*e
zVFFTz=rq8zz1Y1k!Qp>gEz_bvw-08mk!IY)>T>8d`DavXWM!SbaV0?UD=TAF3oU5X
zw#V%_+EzhU-Y#FlN_|^YGQYdp`|bp;QhaPAZ2!BUYn-$$&OxY@-{EeckX6v`S&s^{
za}si(vV)lx9J*U(8O3h2vMPA%KIv)@K&=lA_scZrie9$SD@oa{_q#ietydrZ8aJ$K
zLeXifVLcy&?&b*;ZQ|QD_kr8Ge<EiF2Og9+3$EV(u(TK#f?jsnBQmGWSk)-_@DYHJ
z8dh@oI6LSuCL4SgT>F?jtAHu2oVy+?3P%|Eq#)Nc*Pq%zEv_{+)@(K>+WAk&>)MO#
zvKgkG9eFC6#N0s6XshwT-i@+|u;@154A2b$HazICX$L<gdx~_#G#NB*mOf(VJuP=Q
zCzn5q(=(pIv@LSr9YXtwywP#9+cVqVw+SWY@mrBb;9-x(>8TfFfo(~_>dmX6=FMB>
z6^Ed%TjgxkH9$Y=878CE{cUY(z<v~fhn|-s4raB_%i;jNZ5H=yW1fDzsj#=ah)^c%
z-m}p3(5cr5i(sK`4+@_Bot(=3Kk1A;C+?Ifgu70j-dXUp9kfeYu|@N~`)>JTp&s<x
zEB_+K*X$S>e9$VF8iFHk^DhHU+J#ow89$WncKQh=9c{}#6thPK)&8D+D1<lvn+z0}
z!3rEmJHgJ_0bks_P<q&hUW09?yeZx6@cq&&_|dDfOH9UR5{<ODYgO>}zssqp3FHj7
z=f8zBUtW!!&2K<1!UcA(lIV@l$^PftFb7_5>mwERtb;Nein3}rM29WrWLxtNyr#ly
zqMr2C78RgHbryT{ee|upYhmZQKcMQR-jf$g(4D?`Uz*yv{<AIyW3K)aAR4||I@vG&
z1bw<U^5!IJ#AS!HafGUr25%gaN`*-k-wH3-mp%&h*XienG1aHjiX+f8Yg=D3gY7#<
za0ee;cJjw^zkU1_P*tBnvoXWW8TNutQ1Oz1|EcWJ5bD|*d*o?T8|?i|<`u4+_Gfw7
zVOp~s)0|!RJu}fh@fW!RMM&$Imi(1}mBylOZ}<PN+<*?C8M)?jfFP@z19KEAx&pN1
z3;Cx~t?}h{%OaHTsba?3&7K)<kDG@FTl1GpLhZAY#r()1JVdUmN}rb)0t@JEu*=(-
zscrBH-e_muDD+va+<VspV{eq2W`et^j~Qy;Jqa(i7J(g?|JEF5cPx?KL3Np_U=cv9
z(rqXWmY16h((wUPD0Cq#Zgp>{zl{h!TAs5Hb%koIQMPM0v)`K8XeUu|3@W;t`hrq*
z!Mq;$QE4*zOgqv3cTY3b*;gpT*Y`40O;%A~*JJiYO-q)ae(~ZN7cE}6c+uhu7A_uP
z{V{k50QY6~+$qQvh0?xCbDCXyK>AjMC&n*b(sc3HZ|>6vSEd7a=&xcI{2F)(HSK8E
z)|%0F*?Tg=&Nz(MZOuT_At>o@dWh{+Z6@2Mm!&tFZAH*hZ4MM3-T(h^JUBeStS%Hh
zbcc=s#Ex(!#MTT(v2HnF8iM(Q%ut1rZ-Y8B1rJ?U)D90c6If;2wJ8$ZJJ?*z=eIW3
zF5S@nUl?kps6KZ77t$#hH4Hcj%iN8_%_2lsf40<&F#V#REvSxj0B5a**i>y_J08A>
zvm;)I1IpKC_{m7TIkj{k^|spq9xmfFz_g+*N4MK$qY5ib+3oiB*fG<s{xQ=J<7Nu3
zK{kCGo>nD+r(;Uj$#zr<yr}V5z`vt?D`V2frqXF*XJ^bJ9<I?n0roVR@>rIyEQ~U{
zexCHRi$<F*wsxdxw2Q|;Zrj^;=NR)3MjKjyw3=(|z7?n@dt32o7;j30?TzLHvGFw!
zKWKuv!EU`QENBNNAc|Q$yAH}2d-6o5t#7wYG*e2_c>aC|yI(tr*rbF8`+9{r!QQ(`
R`dxR$BokaQspQTc{|5(CUrhi2

delta 9202
zcmcInd6-qjmH$pP-E=q2-ZV%zbkj6TOJ8{R?H3UnAuO6vBq$jj5mbzffJ7KIqG>R$
zGb)%ToEXGl5{=8KD8hA!8=wNps(iSP;yOA}Hk~hiZp`mj_3rD2F)@Ek{;2m(ovJ$P
zug<A^+nSF0XvbBT`@ItJY*Sq}X@C5tx^yPpR9+TOrE*LBs+LTUZmLUUQ~1enF@<S1
z6~~Sskt7*3)%gi9)9E;+V59G2As){()g==cWM?uskPTuW14zkcaUf;Yrg?xe1MUlO
zAe*2i&{$rUO0+<HJONQY_GMFc*-8N`8(?E5fvKOO&<w3g#~>_DQ!`YOrTIaOc0dw+
z3}V(qoQnIjD(+h*w5KSTKJj1>qZRQ=$iY$&qf6H9cs!L0;}Zh98(3v&NKQjx07;OS
zprw=(caG5JES<~JsAN1hJTbTd<_B?{%VhE6C$XE6%OIo-EDT9!61nRV%|+=%eD#*Z
zH9v338wY7YlJ+I2ks=V_@-pA130iz`s5fAA112HEBXMZ379-Y(D>w{jz)S@`H~19i
zVqjelVhnmLhTU06inlP2Hg-0RHutnWn`I{W&uDXd5|Xl6$Rt!4b?1GCn*c5RFhI-@
zjzD^bo~5~(hBdyOF<g|J<}AgvmK0B=7#{}%=F;cBBsVf790}-4;t(T2>FG392}2?{
z%Q$E4jC<&JmIo~2QcwWd#F|Y7?IW(U%xAi30B`_S9OqIzoJEolcACZ{WEt*6diDO*
z=Sm4>`?1`VH7ArnfFDce?pSkLF~nq2xkGDi9soH$<4t5)(DE<`<L!RpLGJf!2R32K
zOT#oVUw({7@dM4obpD6V#^SlTk5{z>FdqXTf@TgPfFoe0+YBGzhZWpvNjicZ`9Y{U
zxWYmPErET^DYM8Chc$Lk1qRWG(NdQn8u5dhmmkn$bIE_4<X{cJC@&)(I1&(T2gEYo
z3_LSo2X7T2?Z@dTf0(qkgAlhc{{ih}5#jKe9s9$C*#W)8aee@+oWMUjcnrFORPMCL
z`?rAdZK?Q<AC$8?ThfRWSMq3@g(C<8#a1AygC{<a#xPr(pv@LY;+N3n;B9I%;BK<z
z2u|D8wlsJCeKvl-{=c7Ydi2-zAE`S495{S?32_=E3pRg%F|2T;5NJCPc$SoC*v1fG
zBkR8%NNUREpF(5N4?7eG>L?0}BW#glq5BI1QvdRzJ(PyE7?21e9u4|$Yc?RnvRD`_
zQtX*_Ky>;$2K$FCPbAnHqrqZm2i#}H%@0V-PuR`f$c<gssRiYhg_9*0eAs3iFqz*y
zSe78^s2|%OA^50&Xa$qizwJPe#mm5r>O6rU<~e9EY%*vJt1F*aR8j&nyi7K?e1k8E
z+_nwJ4~DZI>y$^=Jzfrv1r&aJjFboO%gelUG8f;NDj_!&&&}Q#8-+EWjltGW>jD=o
zs9a5EwelE8k9qP49*@ZJ*!jJ5Joom-3#KwJn6mD8=m4-2dwu(|;vvhj%^qtI=l1ap
zfhEc+oUwJ!a`?lh<Dqx_?%CKlBHANNXq!ifxF1$ck7d&tNdeY;50w*XLHs<HB#-q7
z=X2H1J&2HPd9GSwxeuOO+(JRjuE$h+%&*nrgNO8E%2sSyF0_n-^$fn}Zy)at7xM<X
z%{2A<sqz-*l-tQx?_}H4?gr8!3oMVYfkU|2;ISDUCEuqZ(XIEaRY(D>a{0mm>nQVM
zgGE(y+A5@0GTS=BcF9hax4}W2Hrc&4dKMyVZO--rW$~ELz0E1!275OR><j%49}w%?
zmkwm%F#)yMoom=Unw5;rgi643zxmWy<8s$-&a{yIH-@=wl>fhu@FC)&?BZr`m=$iH
zGajEu4l|Ys9AC7hp)0&%W%O*#Mo<&Em0RlR3K93${b`$)?{mC0SPU>zZttJFBrI?C
z)4@g`b+4t>P}~{b+dLq-(V~YJ&K3%bLI*{lfRIC#iVpB`XI*A3b@$U!beJ`SHn3K5
ziUFCf(yV^wg&|Vab}M{k%kcs~CtG_@B+2^c*{AbS&PR_apRbx$>z(0Pge<<X>?wP}
zQ_0*#TL%xKJeHrfIHjB5Tb4y2O2)da{j2E#-(pTRiV5SyYk>7Hwhn5scL0x3WS895
zfV({Nk!G1~O!px_pHge8%Lrdp@Y+hIH?YrVrE&EMNP=P_#g-+TNN(wvKg_UaVz~#l
z4douoEC^#rDc2TrS3qf%6T}5PuydWZ_v%dx__p=<xb^s^_4uguvYA}-_5rA#7i@2A
z!Ma0~b<o9{uV`FXuDH<9KX-lY72rGEwSj2eIq0s6&o3`mM++X>lIHOp-$pLKA*ylG
zrh~>Z?$pF*kcaQb#vPfFbd9~xZfg@?@@b5ZKr@uq+DJ&=oNPLG=Z>Bg_8Y;XKat3-
z-*Mj5NSw#GLmk6Io%S_t1w)Vv1#KZjtj843XFHC#gV<~H?DJE?`hh2R?&_Vk@LB0D
zb<QJxIk<=>{M-jS<Hq-My>|7lVTxL#-6njHkejlrPa~AsM>?&5ZW|<~(|$rQrg>PV
zaw~Q<m~4>SxQpricvt2hm~?wjotHGhb9Rt&UnJHA_9D;4(w?y$m!JKfMG*djL~iy=
z{UwvT^`(9d_TpgGx9^35bq-4GU0y1a+w;;mi%Nb`dkn6}CyM9X;H`ydRs(m-n8)Z^
z<$m<?@H&Ru;?0_2sXR!zl8ogZe0k_V3n`l<cw+-h#~2Xnwv8BaBD=feK0txRJI=fG
z+IR%1)kAmpA6gQ`%FD_Y=#pkr8D3<hqv*q>lF$c=WUQka+C|ig0##KU@fH`T(vpa`
zC{HEzD^jO+fxP+cWt^k-6{rhKBi_3O>YvIY-kt(Au{`3vP@u+ih<HyGsBA^Vdz4gd
zCG<9RjHr7GR9&Zt_v->x**W6fQlLt^I9^hJ(FJ}$UQ)j)P?vQDZ+}ndIM5aQEcMUb
zBI^ADHMM)hd$mAKs*HGB^HfsD^>Ff%y1qaiR|VeF)zI-+6;4=cXwQhcw?NhRig<Sv
zsH$Tk-jY0()DFF!yrf=Rpbi(PpH*XZaV@kRs>WGM&8ms04-3?^J`wNr0yVj><0W-R
zUneE06KZ9wWOe;EiR*@185hwb>RRcwZRl9PR{s5M=!W`M{+(^;Uj1A7zXYxCbb{>_
z4WRn<1$A9SEgKNAt|(BS7pOS{qt%Z{9W27pa|eN1KL82;&p~h^9;T+sB+*M7!M<yf
z^w+(OGRdT3+HbPd>&ll+c{uG@=_c?LoE|!HtMm=;86rOvmDf$RcJ$;G?b<BW;bBis
za?J4jVbUlP=q)k16q+8HE-_8{&~V!4rb-X=#JLAK?Ydm@(*bcz=T#Nurz_&HEurtI
z@wG<+!2ouqK=FcvEVMdm!k#I4NGPFJd#7ZE?%XU@;W-((UUaXTp1O0Ll)06<4bXy>
z_Ig7ghv4#p;jk3{&mSi<MMw2Bwc#np%Sdrr`h^dTl=GYxt-DLw=`Tx7u<ThG6+X}`
z3DHYRVE^Knc}|}?QO4`8V~Y0bhofb@B*S52WV?}c`0ZHPW=uR5Zkr%?8<UKYbA!>Z
zPXUA;=_Wn3^E%T>e{w2L<#F^b>6CU|DwTS|M0rnq2E19%JI!J(;;+!NCV`Q3i|>Ng
zMYTmecw~jX{v#}9xOANhyRWZJCX~W{r^^7idL=C1n}$noPeHuvPL?{I;~_9Jek`}^
z*&j=VUOojbb-Q0`Lu@(Ew8_}KGhrZ5aJr1v!)GFpiSV5<X1wU|v!NnjvZ@&M;$`o_
zg(Y3gar(*GI1&(Iw~O)fm;%5m^xJc=k|98b>7~=4vK0#ZIW?C=$hdGir01dV&UBoz
zc=GkEbC1B&%je?MOJ9ofk3b1T=baDcqh}Q5nXjKugr0aNyg1_moSxn#LgV%eWPEYT
z_KU^W!S~@mkq-f`W{@Y$ls`-RAm+MBzgg0t(=U?c?PkrKH(xP5R-c$9rx&IT`r>Rk
zt92UgorBv`oNSd{HCH~#L#=Pv?-I#cMfKr=c_eYEYQi1!WrRp3thiJbNZziUm&xGp
zvCHICK{T+?Uw=Nzv=4{=OeP3D$@{qM3U<2I`Gy5jE#il7T`9L3V190kEH!y^V12zl
zbG4M{9W63Mo3FtwzWi#r-;^Y>k-dY%iPy?iMw_oRHH1#F?z>)I1yJo(j@6nD;YT;f
zkBuH`iei7xzcKdKk;iV5_wzR_yhS#^5Q4LwMW#aUT>{fn;h`n+FGcPmUw50_Xj0h_
zV82i#O&tw-=Q5eV<+`xFN{i^N^`=(u{*~N_IACLcU3`_a5C8FYIbKlWihSMlYdNWa
z#`4f#F5ecJM4<j}WVWlMyM6=BF){|~sFgqhu4F?0xDtwN<eJBs;re2!nGpW=E>uHX
zB6Q3+vq%T7lKOD%?`0p-Lsw4F_wNBFty{J@9-~i9MB#aRXi;~)><@OyMv5216^)hm
zf*W`7YvpdaFH&yr=d^yNI85I!!=3VQ@xRML!<bg-l4a6alMe&g_Qow7ff9Yk!%}7A
zoL_!r6_#zFaIh>K_lP`VL6KkXvl`1lcU^exY6%IbMf>2xoHeikcfVR!&M@t?WxY8;
zS57e_^~?3<SiNek%u_iP#j<lKuiFIYH)1|*+32E?`su6YMg8fzBRqL+o$M%N<9KZj
zWRy<aB<0$?LAGi4CuMmnTJ`CtP!3la6sVi`nL!$RO6C^MR_M+rfxDvwbbbbPuK;&_
za{bW)8g<HgWH_o$Wg)hF+UADnoXv8sF8nXkTWhjF<r9kVPJ34V=pboVZ3mhA31V`@
zmTo$1i*(XQLtMT&&!Q2XbEEXtr|$&s;TNT&?)b)3=-lUlHP^nJDhR971DoOF)J<~G
zW+{Z0$5<19s2*A|1g&B03o_osvyOwNTOV$ELFNfi%RM1DbH%~-vu)U!vRx#pKiv*r
zf4ej)^RH}|U3ul<rXBKezNYQiCBG9B%ewp1{06d7{f1nj6EBu-+We6z)$RW+-Sy^E
zO~>%`-LjtDKWg1II$;mcbMP#95nBo`aJ)2pa*y06g(A^Tp<#rs!ZRTJ)2kxJq=Qyn
zA#`mvdg~snR=maXb)+zbu#<SWDsM|pI_R5QrN^?@9Bj(NK6~X9NT_%9yGB>M3zL9?
zVOsf~OxB5?y9Yp_6^+o{@9{?Lk-D`%Fvp5s@PX|ldpnpqUAP!t@9${J^uSfpF5LHl
zJX?g~gS9l-rF#AS(kVRrvGi!iN?`9$C(Z5y%v&v3z0V4?Po1Xy&{eP@T(Vz!w!Rvk
z*BcIE*}fW99dcL2zItkO$Y*GE8CUi6Gc2L%RqI!u$=#0H`Df`CZu?w%@$vHE|HuxT
z&T0jJDPI9~`p|e&9j^RBM&|*Jl~OJFQnnWGU(DT>=WCa>Xyr4%lI2k)9d;>F8T(qA
zrLezD7k?u+s=R}U;^9`KCw~h^(=MCS4nx#|Zvlej*D^pk4KeNPO8(Nm=3k5Bwvnu_
zFx8lrtl4flxr)Zw((NW-foaqOBTSF5OJMF1?OSZdnM5n_+ZNPEip>N-v9*OXmYDGl
zbxX3QBD}rC>_$xRCJb*XHP_%qg<Z?dcC?ZZ*<9F8cMUW((evaQ^d3B50Kci-Acf6d
zKfPXV)ib)A2^v2?x<j@UZ|rWGctIhqf7rc;IYUg^+Bj10tBQ>JKMmmco_HT+SX>9`
z#-2qPJ#M7w(6Om*{>2x~m^1X0>9c42P#4_=oR@xKP)yWR7Ek8VvR*}%?PtuMIr`#R
z7i+&tQ^^gzwL>p6S?{Pf9hix(tr9CDiKAxCoURM`g8bVA?(PLoqek8}9CHlA2Z&GC
z+5zT-@IU&P-l8wnnEYG3O40A<>$ZcYifhwtFK!4&)|w*IT697L%!iohtr@PWH#x@6
z-i`SU1|J&Ti~6{CDAv$p4w}*7)B$Fm=(H|vo*7H@>Olygef(AFGaIEm{L>(Vr+dCo
zp4@28N4d9fuwN=~Hqu~x##FJ0PH`=|hhkriE**j-AF9IjU08)~)~5-QzZ+$%nh+I!
z(y(7|(l<O<+&XPH4AVzfK}FQOH>nrPZwYatQ~p-k!!7Y64&R$Fe2qKU1t|x+YKzEK
zDF8O#CvMB4>2`U>4AD80@W48dEIL{At=mkA_R5;GEmTA7nQ8c_K0MsKr*(Xa^cw-g
z`8lJpW+@JD8DS<HZf+pi(P;Nk(4MhZH^k%dL<VyGiRKUP*>wA8Gu{NQzc75A@uolR
zeKV$AJRP(KyheXD#*8h>#EyFMbkj?|G#MGJtENhCoyKp0o0g(FSl~8}#T9Ya<@z_r
Mn()oBMUQv?U;H30*8l(j

diff --git a/internal/php7/php7.y b/internal/php7/php7.y
index 8248833..845fa18 100644
--- a/internal/php7/php7.y
+++ b/internal/php7/php7.y
@@ -234,7 +234,7 @@ import (
 %type <node> interface_declaration_statement
 %type <node> group_use_declaration inline_use_declaration
 %type <node> mixed_group_use_declaration use_declaration unprefixed_use_declaration
-%type <node> const_decl inner_statement
+%type <node> const_decl inner_statement for_exprs non_empty_for_exprs
 %type <node> expr optional_expr parameter_list non_empty_parameter_list
 %type <node> declare_statement finally_statement unset_variable variable
 %type <node> parameter optional_type argument expr_without_variable global_var_list global_var
@@ -272,7 +272,6 @@ import (
 
 
 %type <list> encaps_list backticks_expr namespace_name catch_list class_const_list
-%type <list> for_exprs non_empty_for_exprs
 %type <list> unprefixed_use_declarations inline_use_declarations
 %type <list> case_list trait_adaptation_list
 %type <list> use_declarations
@@ -900,11 +899,14 @@ statement:
             {
                 $9.(*ast.StmtFor).ForTkn = $1
                 $9.(*ast.StmtFor).OpenParenthesisTkn = $2
-                $9.(*ast.StmtFor).Init = $3
+                $9.(*ast.StmtFor).Init = $3.(*ast.ParserSeparatedList).Items
+                $9.(*ast.StmtFor).InitSeparatorTkns = $3.(*ast.ParserSeparatedList).SeparatorTkns
                 $9.(*ast.StmtFor).InitSemiColonTkn = $4
-                $9.(*ast.StmtFor).Cond = $5
+                $9.(*ast.StmtFor).Cond = $5.(*ast.ParserSeparatedList).Items
+                $9.(*ast.StmtFor).CondSeparatorTkns = $5.(*ast.ParserSeparatedList).SeparatorTkns
                 $9.(*ast.StmtFor).CondSemiColonTkn = $6
-                $9.(*ast.StmtFor).Loop = $7
+                $9.(*ast.StmtFor).Loop = $7.(*ast.ParserSeparatedList).Items
+                $9.(*ast.StmtFor).LoopSeparatorTkns = $7.(*ast.ParserSeparatedList).SeparatorTkns
                 $9.(*ast.StmtFor).CloseParenthesisTkn = $8
                 $9.(*ast.StmtFor).Node.Position = position.NewTokenNodePosition($1, $9)
 
@@ -2277,19 +2279,15 @@ trait_adaptation_list:
 trait_adaptation:
         trait_precedence ';'
             {
-                $$ = $1;
+                $1.(*ast.StmtTraitUsePrecedence).SemiColonTkn = $2
 
-                // save comments
-                yylex.(*Parser).setFreeFloating($$, token.NameList, $2.SkippedTokens)
-                yylex.(*Parser).setToken($$, token.SemiColon, $2.SkippedTokens)
+                $$ = $1;
             }
     |   trait_alias ';'
             {
-                $$ = $1;
+                $1.(*ast.StmtTraitUseAlias).SemiColonTkn = $2
 
-                // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Alias, $2.SkippedTokens)
-                yylex.(*Parser).setToken($$, token.SemiColon, $2.SkippedTokens)
+                $$ = $1;
             }
 ;
 
@@ -2688,7 +2686,7 @@ echo_expr:
 for_exprs:
         /* empty */
             {
-                $$ = nil;
+                $$ = &ast.ParserSeparatedList{}
             }
     |   non_empty_for_exprs
             {
@@ -2699,14 +2697,16 @@ for_exprs:
 non_empty_for_exprs:
         non_empty_for_exprs ',' expr
             {
-                $$ = append($1, $3)
+                $1.(*ast.ParserSeparatedList).SeparatorTkns = append($1.(*ast.ParserSeparatedList).SeparatorTkns, $2)
+                $1.(*ast.ParserSeparatedList).Items = append($1.(*ast.ParserSeparatedList).Items, $3)
 
-                // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.SkippedTokens)
+                $$ = $1
             }
     |   expr
             {
-                $$ = []ast.Vertex{$1}
+                $$ = &ast.ParserSeparatedList{
+                    Items: []ast.Vertex{$1},
+                }
             }
 ;
 
diff --git a/pkg/ast/node.go b/pkg/ast/node.go
index c231894..5a71e3d 100644
--- a/pkg/ast/node.go
+++ b/pkg/ast/node.go
@@ -438,10 +438,13 @@ type StmtFor struct {
 	ForTkn              *token.Token
 	OpenParenthesisTkn  *token.Token
 	Init                []Vertex
+	InitSeparatorTkns   []*token.Token
 	InitSemiColonTkn    *token.Token
 	Cond                []Vertex
+	CondSeparatorTkns   []*token.Token
 	CondSemiColonTkn    *token.Token
 	Loop                []Vertex
+	LoopSeparatorTkns   []*token.Token
 	CloseParenthesisTkn *token.Token
 	ColonTkn            *token.Token
 	Stmt                Vertex
@@ -792,10 +795,11 @@ func (n *StmtTraitUse) Accept(v NodeVisitor) {
 // StmtTraitUseAlias node
 type StmtTraitUseAlias struct {
 	Node
-	Ref      Vertex
-	AsTkn    *token.Token
-	Modifier Vertex
-	Alias    Vertex
+	Ref          Vertex
+	AsTkn        *token.Token
+	Modifier     Vertex
+	Alias        Vertex
+	SemiColonTkn *token.Token
 }
 
 func (n *StmtTraitUseAlias) Accept(v NodeVisitor) {
@@ -809,6 +813,7 @@ type StmtTraitUsePrecedence struct {
 	InsteadofTkn  *token.Token
 	Insteadof     []Vertex
 	SeparatorTkns []*token.Token
+	SemiColonTkn  *token.Token
 }
 
 func (n *StmtTraitUsePrecedence) Accept(v NodeVisitor) {