From 73d819eb6cf81db444595c23417ae45e4635dbf5 Mon Sep 17 00:00:00 2001 From: Vadym Slizov Date: Fri, 20 Nov 2020 22:25:37 +0200 Subject: [PATCH] [refactoring] update ast structure of parameter "Parameter" node --- internal/php5/php5.go | Bin 288140 -> 288363 bytes internal/php5/php5.y | 42 +++++++++++++++++++++++++++--------------- internal/php7/php7.go | Bin 239309 -> 239265 bytes internal/php7/php7.y | 40 ++++++++++++++++++++++++++-------------- pkg/ast/node.go | 1 + 5 files changed, 54 insertions(+), 29 deletions(-) diff --git a/internal/php5/php5.go b/internal/php5/php5.go index ad07c76ef19c11d7677447c264197942a66905bc..199faecd90d1e29eefba5daee8ffbce002b0b852 100644 GIT binary patch delta 27004 zcmdUX378etnf6mvw^y28SbA^zHZ-`=a_eqYg|Z5W8#D-_2tq4L5)r{*R3daUF%g-l zz!8qPVB>-#DxfCTm>7gH$;7A;#+f)y)WBqt$z-BnHuFc(|9!txxBE6~qVs3+&pZ!Q zSDiY`x4hqSPMveV`h3-YzEHLM>iXiqFD+eh-Lgw{OL46BiB0v7l{kTyQfIUd8{sAr z-pF_+n;98TCle#%K{h)w?x)iu53bjd>i%0VG-Tr|mM&~uPt7r610xbfK5b2%)# z&WJ=Zcuau+P{m%76ks52Nq;s&d1gRYmL#N-7|xIjQD6|!PA5kRQY0sX_dW%e_2fc^ zGUPvlx9JpFAtlf)o_!AE3e(cWP>ixP)P`<2Y9=eZpxcZO-jW`v=UtZLB@?KaEu;35 z9)|H!S#_swIVYP!dCEmemeBFoUkdC(vwTic;7N!H451g7w7NcCxIW4fmX^ zIz8%D2F^f$r6n0K12LjaDglPl9@>ZiMeZr$CYj*)lyn{!qS=g~kL0DO4QZDFrvf+E zrQ{%Y>X0JfAnH+F(HRi(DQYAmmjqf6B;bk_Q_Vg-djp3D87D3mua*@(y-# z9l4ahZ-hdr3(eGGihZYCLgX0G8H?}|myujy4ArHdlz{}{?o#7v15frw*}Jp`UnnKC zJ=%|yr4m%3Fyf_ij3miyHl0x8A5MHWOGsyFxk>sKxn!mHBypcI&PCpUi=@Ze zlaRs`Z8j-3D=zIAt4W{<6%S^}N0Jtwfj-d~mw;Z=r@k`cW~7Wg_(7y*dT`~dM@cEO>b(nAp9i& zJUBM?A6Anesfb(f4GuEIW0Dd`Q9dam z-6vc#gtreL0IMR1G9)8Ip_x05oPl%0mBUCE#zg@jr6q!$3>}5gn-NzaqZ(4sxj0G^ zg<)t_K5-Bb&S^56rn}GZb;hTV@iN7LBr;5*2zu;fa1lB7voNk){|NsVV|45BKRM(RSWG)rNfs-V9Y zw3!RVERb_06ELoY{tl49tAH^CwKiGO+AIs!6u-pcPLMA>Um=S=*;6V zB1OhZ(O)EKkE)c=nPJXzY`~;NXQ)J4K4T+@jLZ&iQWD(h$C6nPCH9{ZyUmi-Otu1T z0=^H(QYuip-GHACf#dNE``kLXkWSz?l?^{Je!_#YzMXI{ov zRE#G9hYB|iQ$%SHPXVSlDk)3@0R$~ONE47A1F6Sg01O-FBUs_6^_ z)Dj!Bv=`4fR04?>DRI^lw?VHXL#Kc^YKQt3Akek@BsX$xB!W`(h#QYIdXNEOgTgE! z;?duEAiUE^KFx@mp-|HXYY~DNHz;+I;t|sxP157go+OY=u(Gs(Ecs7L9^%n{CBYJw zvvkQ>nzQj@VzkDF{E=rw@RSjRI{~F92{2O z#B21Bq0}?fp6MD2husitDLN-#@^(q`1nZ1r8G*h4THG*bCuTscPmu(CBbJe7Lh4Jr zWuQuOlqC7{f&GoyhEAUy`w}u3^CV<=k{$C3UxkZc!>9C&Po@BT0j!~b9mAnAM1X<} zWsxCtMAjbhBZBO`7@th9+F4=@SOi8tnW7MpE|N|uq;Mo~nCJn0Q80Er`~ zO;mv7N2JFmJ<@kT42zfpVnObF(1<}~)&r7#`t@G7UoT+D(E0l`;w;-`fz;9xwKOxN zHp!uq^e4hvAa636gt{lQxf5#Q$YLb4+`xo;^c4tQ)SoArl-QP}zEr1-8PG$EfC74y zKxR%dp%w0EE%q5Q3^B>ih*Qm#7sa~vBR|3RyKi9EqIIuf?2S8qfl`G z68ea~KvI{UoG%cQ#EX34CJ8*B!6qwejL}TIvtCwJo>kVF zggW5VCHtZKb&btJU@5YYB1~My0hcKP%^dj?rI2BMkfw>Hm_`JWCQ;g87{jILg;HXv zOjD8~gg~T7nY(n=Zq}U#QHl2@w^@41K++RF2EYd05IPFzhXZ<&fHRLIM@&);Nr~WO zv_}MJB56j-SO5B()=sESGJYD4&vty7VOPFDj7VhMH*p1HdB*PO)smb>_%w&4tmbek zk)sD%`Tn4)G3|}vWy$3 z34c}HDv24B@Tg%x9~hYp1_~s_8+Y1Z?ZxW&9aT-hgb-U=V(N=<1RCf@jUO>sjX8ag zx_I;8Qh5*9rUSL@)IklIJcgpC92XGHDC@L_7^W(&a#tMZWHOlu&&Lmr`oJF{(lDW> zpV6dN>IR4M+N@8g$6uj6ZFuM*4Fpx5+Mu4juc?ADFH4BVlTgMa&&j5scI9v>hS0Wb=smc zu@uf(t(Qm&|Gh{Q`aD7{>IziWtFfn^s}iS{tN5t}xGz(eOlT+;O^F6pwgetMXx`ww zmkJ&nkMx<7Lw+TQOtq|N8EE7u{!S)XEH4?O)jw{pQ`Un6)$ZF*R?j?8p!T0yTF8DN zqmFxOhDw)mkq&w;aOjfFCOj;|wW=xSOsvJIreb6+xw@+Vo$+aYkM<4CwAnPvvUHL8 z1RHeHO0rZMEB3th>G+a~0ElcI=F>0Wm5d{PT#{H~!57-_HRQ;B&Fanvjw|U|U{Nn^ z8|6ST%0075HQrk#7_wkWqqf%~YSyU9vjzaoqk21Enr zNJK?AgVE~qV{6pj!$pN?6{J&Y)SL!&IAP1_qFOU=2pd$L-&~R7UH-D{%E1+J@bAiU1e_bn zI?k_C@#%%Ca(;}>j$Bf!o|(~)w=<^4Ro8h^df@zO2c0PQrfT)&>9s|eFfw^jho;AC zBJChU2bcjtPC2sajH+y}E)d?;zC{h{=}DtXp&8Ik&eTPV>r`TPiK?00q>fxwD8o&w zSLaV&x^Z=Zs#s8>{&{jm4B`z`)wKgRPB~32I8Wp=Vg69HY)Y9by?Bz^J-uiy# zwXR-uZ7Nk~oHI`SWaaT>pi*R(qT5D#06eQ1R}BUaWtgKgIj6yx#Un{nfbUUrs@ZMJ zMGb1fb)_=G!W=Ij%&buhXBS7DZMdjL?Vlr6*3TXq6|P@0TYQ)xnh$RCqSBYM))Jc3oG9M}wt>klb96(efqr>Xvyz^ueVg z)R!k#sU^3RsQ8tI>fk&fb>Ah!B2xFB-CT&QkR7^L)PU47ilcHxt?D;(qFO(tbU5dZ zIbb530G_=hlX98TDQj~}5vCyG{ZF3L_{nUtT8+QDG$O>kq(*(v-oNleW~lbgD^X)F zFIF{IR)GEr()UTNPE~%fN+njLtNNH1k}vld`+8$mnfmUegz8va4Z|ub3}n)y%CD|b ziOI2?jk#CXslAH})kTvF)#3IQb!1LVt(`nJ&*sz{^QzU+$y5G_y%idJQx)w1TCcIG zAI};{*81325u_{HjVz26Cd{i*t7eOK$DNx~V_&n1MB1`o*e5fl<5!%m&YW4Q-nzC3 zO6+4p9C6&jRyBT(0O$X&$y6aq=fe-Q{SUO5)_jWz7={1$8BAp#g9$Q7_4>r4zV^~5 z5dB$oIWhL7?2(10(bNi$xmM zwW3Ikzd+K2|LOLU;gZ+?c6&)By}z)%d|XgD`MN>$;Gf)W1F_8W`Q?U7!I;co`dF*f zlA#}y@{H-5!f~;IF7Mbq0$dJY+7iv)U9Ks)fvcuZmsG4{ZEbPxQ@^U()~Gg4ZBcLD zQLNrtS);yjMHwJmj8E~$Fx}X>Tr$(XNq#Qf zIH`~KghUAFfb$We+vH6ABPkuz`>v}b?dlWzBa%Kk@^8Loho&`78{g;wZ=*8!>yuLu@&gzq7p~|_kO3mLiKrNgi zH0GtCYQ>6yRVgkM_KFXnM#>4n#q#pDKN5%P)O{00)9U1oGWF=>x(_F9r>I@a`>CC` z6{?BzTaKM2$s|MO%G6~lm5#(D6D9Sj&5Xjm`$KSG{RxP-otcWH9=&7z78`b!W`+XdO zn$(Xw4JOSr40$=1j#aR>nY2d;5{#^CEyDbYA1>6{>l)N4mk;8sOg-IIGD-wSrKRai zxG)?|5Yzm=!}+*;O5{wMGc{FnQ!|zbYW}oECRVrPrreb`*Q*b1D9p(!Z`S>lI#s($ z<_iZ_*QoKUO4acznhL}=)z}+r)ZOb!vEB(%)Uw;+#q@cf9=Els>#s#lGd97z40NCS z3g$wtd|^^=f29Q@$J9S8XjP+cY{2>f=UQU>_~hbY8uWYX?@FSteCLRTv`h^?Bc->Q4%bkD5@-_)?uZXKmi>ytn{M20%mkswRL^UOWcW zCT8{kqw_P7)!m@^s9*fscu^>i;zMJ~a6ptd^|KO=I%{!nW1T9|41=6MKS#Q9w=& zTy8{!=rs~Zkg=h?6LWl7Ci#niq~@bQlEy;hvfBp#g;Bzf5irh%4OsKQ_ch4lzXuHc zjChfdV4kyKU5y&Gp%Cj|_5Wo^d`g$pyEuTs*BmMvP`=((4rL6Kq6mTgN zx8k~ug@PIc+&@1O8^jgRTf${xRI@#i>;6dXHf$Z33uo|Og$A1HQ--oXlh2|)>NjAu z>{CLq$_c>9p>qeT)+v?r6zXqoD~nQ${_2v=gVY&|#+rrL++wKOKfgA&2&=3!YSrEc z<7HVc$Y=T8E}K=>l>=3LN3mL>%T;>EMXGyBp}Ky{pu((d+*HfQH(|Mb(C}QOFtHw^MS4YQ}s)aj}s(sb~^~T75Cs{F2MwRC&Ax^+i^ zn)_gxD%(;{om4(tqq^=Nq|QIHS#{4ZRU^6wsr6e*)Cam06ppg+31!k?b^Sv#)b-nH z)tlWX6nbXqejh5%d~lE&y=@{`t5VArH5Ixb4}GrLQj7L=s%dItA*7W}r`4K?gVpQX zs?~iDk5<7QQ$ISR-pS&N>yLGfbo7w~RYNakVK479(6Td&i}_hxCIB7x)NQ<@ zOvSgfVR%`IT?0ZZ?ypem@0Ddf61oH*2utslSo;3$L)H5GjH>u`Xy}SzA4fOV^dq{9 zWvnzd4ZQupFm=z=s$M4IwHa;zF|51X_u&#Hocg_YyL=4kE8<3QRHCNqGW9!s9E8yJ zF&d$A4%|5uoHRJ;M24T~3e#8)L9u&RD*<>7Rnr$u#X4=B+Sff&wd339 zoe!*ox|-0o07|Ha?gwF8wInUYP@R5caHpc$W6Yt@I9b6mg3XaV;G zKE0mP18VCGC=%B3_hT^g*Szi~Qa8A!_`cC#$=+7U6?I1)w)jjoUUx zz4%bAdUAN&p?2KMYt+PwVoH7u2YAV*%At!2Z?` zHI476Q&p!8{BWzP0`!h-{P2AZXgE&&=8-ClJx=}Z_y#IN#$NvL5@p0+RV=k3GPU)Q zMrdv{8X(iVYqXm9aIHFcSE(9uf0-e8MT>gpk>SvJ^P@xi<+*%(*sVcwk>O$)dKm#! zRrT)^6Uc0(yr-tj_lT_8HnBk+I;9r2-(Mwn#?@=H>(pyIOU=9k6*K(8((}0vkFdE6 z_ese+z{!=}3F^qwYRvn~kfIh0&&ameKKlqh+>M$r%XP5RS4~)Swpz9;M&kKNQGIb& zD{}o4)j#hltLz0+29rj>={LJZ+xTW#^$c{oy9lR~U~AmB%sruqf3&(be4M}^*~l5) zM}N3=tLHW2V^S7WuwfIu$T=|<;CvImqT_TA0|j?{Vi$*aXS{<;Mxl>wLZu~b?rCPz zzsve5elM4ENpkQf8d8q8Nqy{!fYi8+2_IdNq{>L>h`e;l4!)=f4?3`O={qA|TDjlO zbRxTtlCn>Y7gLybg+YJWRL|oJp zjzjkH>|rld&!E^*-izoIR~!Ki(1ESXz05GZ=#08De=sR9JF{ifHV!2#|M{)*btU(G zf$^c&eU$s5x7Zi^p|U^TBL8jQ#)2{&<^t7X2&UtJ`>&j~|n<})aVt8mN`IOh6RL%u~9G-pCOUegnw0HJctmn&500u_z*qJcbR13WyJI4hzjO7q+Yhx@G7@hvgDp_gGdo7FXm7wceA8rv#?y@etRFV zhyeW^bIFO;lU>!qNxu7yUc0gl-IJZFAj0p2y0Bdm!$uXNKS=~Iqztm@PCPKxo#xIA za|%=XH@v2}`PAIX72p&D_(a!n$5y55Mt{dr1AfI52#UC;l>d`%TI~#L`^##xu?QE3 zO259zG9_9%yO#zXaOz=<}_579%=eaXetU=B$EMD?*-ZpL@(m}V}Ka4*|txu3sh z3^|Qw&igSziP{BBE%L1ip8E^XMUG`EqIy#L2-s)78gad6nnb zVekw*tqLE2;>dprnB_=QM4=p4iSDC69?!gjHl}Hwdl4|>`VyT)6QxSS#3 z1?DSU%Lh6`shnOG1C#U5ZF$+8pt>{SA6yFmva?x?uP=v6-WBpYax18el1 z2(!4*t(&?%;&!>Y%^bQHdDKUJ5#xPF4Ak3C)ot8UJz47YediLfuI#4oY2TANOQgf0 zHBb<}1dnRM)3q@wBJ$$pgE6}x_{5ts%prm#(|B7`i{B1_`1_7X`NNjlfWyJWqKz-U z?lS}NyAU6$DGvPOa3baKU4Ob#gxwF-?9&)$3O-#=Xf22IMcJbJr~?3?P5g%(yw5U+ z@pyCqpS#e8T=IjsT<}8;#2-I+e=7DYOG}w~Q_X0~na@3MLON|>FXUxQt!#}-X&xLc&+Hlsj7h`h3 zJL(1T7yHSd#*WCx%YiPsm0rnH5BdL*RxrPl}7-3UY4UyoZd4=%}*r zA;;dLf;M&Cvt`5cf`^&j$uDh0Rpf^{Fo5`v?#EkWOgz-#XB!5}Ph{kVk?@#S`~Dt3 znFA6fe-nk0dk)@F8Q=(&Y~}`$5R+p@&Z0uby>MzH+S7}r zNPZe88YkCW4w?2TgKe;TI>cPLjF*Q|o+O0L^i}{}c)$@Grp4WlSDz@XMS#imVu&~N z;x~fOKkp+)ighFTaTHe$Xvt5cU^@b6Z^%9MV;LS*Yw4LS`fn0QnhaN%a)R?4CiE8CK5MR@q zZpemWT+khVS_vr*Ck{A6)6)p3H(Cfpp9=JyIl z&Lo%<_qirGo~H`FH&T9wLylk5$;xUBh+#%6C!(-;02Al81H5JG#ObD-PDf>oK}{hk zMIk3xJavYVp$1MMk`yLdL9U#4;*QQwe&Gqf*n?8C*NI#F!L)~qFMKa^9GCMTIDK@8 zD-4&jSl$XDCgtU`V1y^*=uF_dqzwIGvk}TbFRHL1Z@2=Ct0WdO5;^Q-8xF~+g16=> z4cP@Z4Y-^{PzuaRQHC3#f+rDhPo~VBc_(Ah`C$Q=GjCGQ{u1&fE5S)S?pZ5=xd(o_ zAR$YD^2~m?51yGm9RRNEKEV(p6Yqos!vr%~lu||su4v&(k`i$2Y)UmU55k=^r*80` zR)HdOm9|;=9UPfAgJ4r69m%QAgs6_BX1T=_-%zDDVhhn&d=D1VWgJmgLe!ODq~=uD zyrIbfAu_1QQTm|c;k4TAl-~=1X$TiGEfQgIZiG^4CjKKJxa34{Ktak%7WE*%G9ssk z<<|fhhqz1%F|a-#&@(r9@l-D^kg6=%$T4HrujDv%H1cy}NYytuRU*->co52NS4*;BU59e^r-i6 zH!owC=$($;UtVnLwxzs4U-K(xfNpPhienvDT)INHyllaGJZeq0eOK>G#;yPzpVgQC-a4w|U$uwn!zbC5dhS0s z<@&6#vD&YnXdksm^U0`ItXIYC8vWG{t4!Z)+k=Jh%?~;!==ay!MY?N9tU#Z$4tJy9 zvxf3zo9=!Oqg}Dd>aVA*vkUp6tS>KZIx*8!DcA4*%&Gb)W*ji1JLX~NxAsG3U;my} zq04Q%ykPS3t2>tH_)o0n@{&oHUe3*o~!h(CXluBRA{H`+g80!EO$=Qm0s*Zz4r-cq>g{XI!*7L;T)%r zjEfD`oBP>Q>>wS!(a*lhwv(+AT>oI!fo=j{r8Wi_b&!C+L<LA2a zLNDKGH-~t)$g*5{V8tPN+6_yR-Ps0| zj=CUrg5EvSzQE2T^xNIQ-1sfPSI`EHeQ%Uq7XEdcJ;t`ZM4mWyF10JeqoeGBmhENr zwjy+UnhWOqga{*qFa{TbxyM4gA>8lTD=qSk&d2I?0s38fid`CB@?C4XrB678$ja(N z$6L+%)>G^sMq1ElRuZl|)&7R40&NHD@~iD~{n@e5v6s}3jkUjEdx7b7@i^!j@_N&% z*5ij-b>PYxq`x`RF42D&hXH~_IAOd!+0q+d1|)aK?IwNEKzpqI{RI1folWR{hcJ5A z*--MYCSpXuM!MR4K4kODNf*_h5asJ&fhH5)4+fRm@&$1u39W2^V0z=rx*syz=y^7d?bybVCO>9Sd*Ef>>W;+;( za4k5D&#+&yQhLK1Ry;hiz_Kh|cP{Fuecf>`WRyvYTElnGwOb%dk53}Y3O#W)WaB|k zW9@`~YBm~qzP8S@ZvbWF*CQ|n>I3H)=^n}%`|syKiQ6W^e8u*gFEF}?6eDjiWiBf0 zJ(R0(#f4&uz3*?Ehk_Kv9yR#pd<+gs=}SW({!Jhb@9{+ZzpD2nVkP0ui(zosAw*0M zu=L5FwbS9M%j~;>^QbID**UhI3iO_K2yoX@yF7gQa{FG#%If7)t>$p`mG+g69i)1| zJUFcVyzN;r{1#uNg5@jh8}R4~U`0@~Y&UIWblcS+6W&G~%=RzvK?F8Vw_O7nq{Q_A z9j`gndfzp84N63~!L<;`wJYsOVYd~#($dM5e&(m(@Y9e1OC82Lzjk-Y)zO>r@ zoQ+r-p0dUs=ja*Q9uaomU_WH()obliy>ch~N!LyG$-3(;rz~9XbGz8m-Pbu&b@%nK zsLK1D3VnTxJyiQ^$v`^nT5F#kBe9~&E1ZJx=U=rKS~NzMtX~65UwVtZ#WHx2=eG6s zqwsI8?%HGz53P;%Beb}dxlUC7WrY$wqX3Rp>OZiFHQ=wmZNo}$vJ1m&w7p9VEN-69 z-ohGL`fpQ1zqHjZ3Wwi`V!Eg`o9tFo^!{D;!=w(bDe4O~pRnuzx?rWQd+mbo(QdYb z%j)F;qu*p0!R<*tyPGZ0XO1d6w1Xl$v+1hm<%RJgbMhpR$+26GTs2S2~}u z^dnCTRl-Ik+J&{>f`}m~q5RD~Xiwru^xnM~8w{==N&9BqH`j3JKRhe+Q3v6|Z&RpA z`1M2}SYnx*s5R>KQATY;gGB-bJ}CJJ92lSonjj&N54%{jxpT!P$4i_>OMp zvw+P%q2i`j0Q}B-oxij6^jAb=!rPdu(MW~psyCNA1z(@$oCNX{rc`LX({gGG zOq7gkJT!)f3!MuJm|Vb#gm3kChFW@Ee`gX!6qQ^?r^^S8*8}ve>)@4lkBAlNQJr?b zaDA0C-_q|_I+Mj-Kd#QbIakuG6P2-87_WD3xAfsb&O}&puR|%we|x0bnPevuVYbHk zj?GBUtQwxLx6*5t9y7#=>rs`lg0S!^=M_u;zR96D#UITd;yefargh~G@H{u}NLaWx z?p%rdG#uFCEQHHP;yEg|l;QM&aBZuzhZ#oIDY2!PlRTii+MFq2_i@g0+fKVtd_|@H zI^G6PH0~s)4ag5seV`Sh?s#OHDJDT*(_53y@p@~*dBqO0EU63EyH1(p>0_XP0drz; z_F1Q23Y>=U;239g5i*+oGwZbLl#W8OvS)iz3*k`IKA*6 zotS>D)h^ac-*7VF{;AGQF@4!IOwT?z9Zvg}bDT-~^=YvAT*g|a%cnUP011+?nLJ!i zgEHag5#xvGqtl!N`qoyfMzX?RPsdnk!^*Dx&gb;rV!LGX=P^wjbpTHH{dQ-Dr4PK2 zOG4Mobf)M z80xJv{UT_4*;K13YV-U8Bk$fCr+1*l%Ww1S#b|@MWv-CAyV{vY`ynoC#jFW9K2&{BD`C z53qhMx{|qofWF+){lDRK=&p5`b|fYP9(P>{75I9=5~n_d9ZW;m!@JFCyjs89nL&@= zYts#!21Fqc27QC2zk4-!!}`L@s6XZlP)x7 z9V#Mazwn-w4&r!}jv&IrLH}qKnu^~W5x%v@zRc1)I{_5tBqqoq+#|TJS%Yf5*-0T| zKC%=1`l|`8d%whWH!iNK*8RdQ61CJTt3RuiTAL-TpYc9kvO5$XrWgR2ts8iG4(V3Ss{9mj2=G7@B^H*%NX$ zQHa@mLWl{G zTp+K=CjprRl8D0(VhBTrXrdZPbB@puf}?1UdjVzAxPuRjWzU%VUn(trHa ze$~>AyU|?~T_r#x>q2I=?J*SRhghUvaZ4Zf1d1ij3dAHQxg8cF%NJ7As4w`sGs(dc zWZ3<6nt~hj_WA>i ztp2ed!7y6(;2j05Y0cr&SBfvSq@gcwLI>*&>3Xur~eMD!K~i2TJ>?y zLP%fzwo|E}8Ee<-P0u>-*vWu#6eRAj%Jt*lrl3=`rtb-^Sw>6 z61{&2F5N$~i}Zt5?4GXYwEF>eu|_Fr!JJs+mDI79C72!f2e`89c`yDU>gm@ni^CW{-aaW@^pDP2 zMd(9n{^Um(!c2T+dOOcfW=xbi_?j~l0t(ZwJMUP!^^h|^-1~tu$I?GO2rXfffhq2V z8Y?MH;nqXWmt_Ghu21`k^9Qb-$(qore}h>4Xr}yIJb+!%&cdHMlkuZz38U#(e+sx^ zTStg>xy6yMY1T*!3d2YL-9duO=@1j#ToEky=r4rZT!3!WEB+H4MrmrF6btFdiZ?NI zmb21cFN)%;52M(l9FqF2!_exmx1F?Jd<5b9&bOU1ef>_mA2ZrU{l*c7nuy%<-sXc) zi(K=WUqOJ7hV&*X1|r$KElFd?I7o zqTl#GpvI(9r{*m+u6~!(l^2e}0J^4HMaU~=ao!^HkVbvuQ8a>-Q2^=mlN&LPol7k<^6$kNTW6Za3;>^{L z#8KngrdZOklU|6Y=b6c~_<9YWGC)7q6l*Zq{HWI0L`0vgX@eO~jm-sBuJ>&|A$9>h zD|01{T&YeUISCUWCaB?$PKdQ(MkwotWA)UNz1wcORC^dyGJLUyD_)m(sD)5KDd*c#wMAox-d^z}ug}+SHZwy33}=`s?Ftq!W9x zv8~Midjku;m=x;|u7dxr+-;qw58jI}I#`G=?Wqrhet&cfIan$+;H4XH0l%icg<$yyr8d9QWOSrVha&F)5a^mdOkJmhrmUJEQYObMKri% xZj8ZG9O~Y=u?|Fi=FAt^`uh2(pYo!oriFMyN@U*cxfoBL)SPAOxtGS0{}-Vwo0R|n delta 27123 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 RGZ#-8sd>DqvuC87{|kL|$n^jK diff --git a/internal/php5/php5.y b/internal/php5/php5.y index d801635..0e7e6fa 100644 --- a/internal/php5/php5.y +++ b/internal/php5/php5.y @@ -2060,19 +2060,24 @@ parameter: } } - $$ = &ast.Parameter{ast.Node{}, $1, variable, nil} - + pos := position.NewTokenPosition($4) if $1 != nil { - $$.GetNode().Position = position.NewNodeTokenPosition($1, $4) + pos = position.NewNodeTokenPosition($1, $4) } else if $2 != nil { - $$.GetNode().Position = position.NewTokensPosition($2, $4) + pos = position.NewTokensPosition($2, $4) } else if $3 != nil { - $$.GetNode().Position = position.NewTokensPosition($3, $4) - } else { - $$.GetNode().Position = position.NewTokenPosition($4) + pos = position.NewTokensPosition($3, $4) + } + + $$ = &ast.Parameter{ + Node: ast.Node{ + Position: pos, + }, + Type: $1, + Var: variable, } } - | optional_class_type is_reference is_variadic T_VARIABLE '=' static_scalar + | optional_class_type is_reference is_variadic T_VARIABLE '=' expr { identifier := &ast.Identifier{ Node: ast.Node{ @@ -2108,16 +2113,23 @@ parameter: } } - $$ = &ast.Parameter{ast.Node{}, $1, variable, $6} - + pos := position.NewTokenNodePosition($4, $6) if $1 != nil { - $$.GetNode().Position = position.NewNodesPosition($1, $6) + pos = position.NewNodesPosition($1, $6) } else if $2 != nil { - $$.GetNode().Position = position.NewTokenNodePosition($2, $6) + pos = position.NewTokenNodePosition($2, $6) } else if $3 != nil { - $$.GetNode().Position = position.NewTokenNodePosition($3, $6) - } else { - $$.GetNode().Position = position.NewTokenNodePosition($4, $6) + pos = position.NewTokenNodePosition($3, $6) + } + + $$ = &ast.Parameter{ + Node: ast.Node{ + Position: pos, + }, + Type: $1, + Var: variable, + EqualTkn: $5, + DefaultValue: $6, } } ; diff --git a/internal/php7/php7.go b/internal/php7/php7.go index a3ed309bbded8bd06727da832288419e18468d6b..62c54a9db833c3a233ea77f83e09ff033627c32d 100644 GIT binary patch delta 5340 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 delta 4885 zcmZu#d03TI8h_4vxNL%g3aH$?i2Igz+LdZBQ%lW_wz0+eo%4N&_RJsfeCIvqyzB2>&aFPw`p}`) zI}$okAoxJrPO5DuvALd4H3=sVt)$Lv?kc*oq-g5w8U51cmdw5{mRDR9-MKD>`c(~} zAcwyb5j^FL=%q;>t_+BFyyJ`*ZY>kO6MnrL$y=w&IR4u*(U%K{h_<}^oQUT)zY}AH zn+xM;4v#n}lGVnuqDHoejj|FcZQ@w?xPJQ3gnwUo>Sg`zcQ{$L2z)iRmG zMIx1Vg1|#+WPeULP7dzN$^(d^RmWe&9wB^MHH*TaB=Ytp6vN>c zL{Hw7Cs*_S6XfK^c-f1~zNI*R=UaI3`paUZfZy{^i16Bdl*{FPL`u~lO6S%m#ozf| z0aA68bSlUhto6@+(-NAbHcFZ-_}nCTdc{H!r+PVPpdfdqKH}nsB55hisK12o%0>iw za1`b0-3yaIxiy;N)XpdxBw(5L5AW~+8~bA^lH12nx$vq3H&KG%_t(e>RU1n$2=Zqt zL_b|ZiP6uBoB7=~lt&>Ck3J#NdDB!G!RHDP!<+=l6`raRk)~=BD1&%;0;Rp!4m`QB zEv4~gFF90Ad%9DQ*UJex^3MiO3_OkH#vGZ%;oB)jMW@jD2nvKW`@x*)gz_0)RpzAi zf|occmLDw!DieYtmIrmFPdNOhuy}K97fMxQU9<`UY-bpmp#Ka0$*?#&x`Ly}trtn~ zcLp;EymK7zcyo6e!IeAUk1^e-o;Ov?6dm|Pg$<`*FIY|VO&`hu4lDXo$^SX9Oi(C8;r3QSz(gXryIlYk7`!OR6Vg69ZUia_ z94Yv~8)Otp$9<6lmr);{hx^3@ngT6_V*MGhF){bxFNQ~* z6rH&HE%Y+GpFx=0IH?bJ8wrC0x;CV0EIMAyr$pk%MJeD5Dx2Y+s#z8T!?R7YH9QiDdSq@z|-na=_6|&NP=>#~{@3)W|e;XD7 z4<}5O?Ridbky`Z`Meuu-GDcP2Mk$hlZnLNACenBUi}|ypi|Zy)PhRh)94?(Bu4i`y zJBN>it2QjvhmLWL*dExnnU zR14L;bkn_|@m zkI*jTwM3+$p=?=>LJQ^4(cq80D8^G(P?V~u&^n{`?*XnfS%Hj$A)Ogl9~@kXgSyC@ zKp2*7S8E|~=w9lsPOs6|?9OGj53bb|)49^PtO6!)WSXlx5-hVRzIBM5_8-i%#78}@ zBcS_|rT6FSb)d_OMT*+Af%a+5u9%?i-=wuiCVbRv`1mLF@zJT)^;W9))7tr-D_XZw zRHL8CpS2MTLbOSfUT|4RGHZZX;XKelV zcG_)vLW^mecft@0ZnkOn?xJYo3A=#V+TDn;F8?;aaz%Sg`8Vr$Rs0g*tE(9xx0hbN zk^m6aN+s37CXM|xb@FBS*yy3^qU7g-*StzO?;DCIj#wGlD{eWURr zmEgnA?kK=(Nt13E9)7)v=Ar4S;P+HSS9LQpg{|S~KS7dLPd&-HL-giTAdt_m_OF%~ z1b4lJ?En|V(OfQDEuvN9B~oOigIh|U;G@5r-eJ57YaA*puS+|OOwds0MA<}3wd9$j8ib= zBU2KbYGYTqz)k{-8K!g@tp;|744n??YEKWjSX5P^(}wlqWqL2f%nTUzYv%J_h_D-z zw8?0P8roZWbahuL{pDoh5Bfp6CqrTQ+o-XRz}pwU9RNi<6IA90WjIp%XRwOJe%z6elJc3tx5tkH3**X2gSI$S)?B@@z^i{$M!reAcw-2 zy6S5P;?jm7E`g%oZ^q)}kRc$OeOwtrFih7>R}J}co#4tFpoVFk-P9NPk`ds6p!iL3 zQpoFSRMITmGLUhppR(j(UGR`ZHh;=CdRG@g>SBDi`1+#WF}`-G!(-%p!EX(fIcW3& zg=xDl;ezRQ+tRhlPP5#N|6vud`G;K3ts*9^5TwS64EIXnPfyY3cCIXwcI9N#ex z1Z(foNPK2k?rzM6a~9kRy^X4N3cEvYB_&xUv8*FOVD1`V0ni8Pv+6hc$N! zh)1(E180lSMS|t+IHTnK|aZiR&2 zhDpJ^ZL@gtU7&hRnh)cwM46y|xl2ygQP5yH0YofDcmwSDnT~L2EZ&my;wech(3uAg z!&5b81U;vJZRx=~*2!%BJ3vQn93|KAiu-Ue*m6;Qy+kq|6<&2;xopDYFJL{8bys0@ zl@)54CCL)^busl(>zB$3f>O;@!NlFi3GYz{F5DzXbN;I| zgnK-S2%BNps@A$Nf5q!7kj%l5I#wZvlMH71)PR+8r6f;Kcf6o3HhS<>DQo2sqJU53 zZ;%6oN?#|_iAyo3tLcx+X}X)6q2lCvSuA7-Y;Z1LYP{-MV}G?igJD!ZSFnguBc76l kaI1MIW$~$};dWGA`-N`z;$NRZ7fgKHdI2Z%yc+5KA2wDhu>b%7 diff --git a/internal/php7/php7.y b/internal/php7/php7.y index 602859b..586a9aa 100644 --- a/internal/php7/php7.y +++ b/internal/php7/php7.y @@ -1884,16 +1884,21 @@ parameter: } } - $$ = &ast.Parameter{ast.Node{}, $1, variable, nil} - + pos := position.NewTokenPosition($4) if $1 != nil { - $$.GetNode().Position = position.NewNodeTokenPosition($1, $4) + pos = position.NewNodeTokenPosition($1, $4) } else if $2 != nil { - $$.GetNode().Position = position.NewTokensPosition($2, $4) + pos = position.NewTokensPosition($2, $4) } else if $3 != nil { - $$.GetNode().Position = position.NewTokensPosition($3, $4) - } else { - $$.GetNode().Position = position.NewTokenPosition($4) + pos = position.NewTokensPosition($3, $4) + } + + $$ = &ast.Parameter{ + Node: ast.Node{ + Position: pos, + }, + Type: $1, + Var: variable, } } | optional_type is_reference is_variadic T_VARIABLE '=' expr @@ -1932,16 +1937,23 @@ parameter: } } - $$ = &ast.Parameter{ast.Node{}, $1, variable, $6} - + pos := position.NewTokenNodePosition($4, $6) if $1 != nil { - $$.GetNode().Position = position.NewNodesPosition($1, $6) + pos = position.NewNodesPosition($1, $6) } else if $2 != nil { - $$.GetNode().Position = position.NewTokenNodePosition($2, $6) + pos = position.NewTokenNodePosition($2, $6) } else if $3 != nil { - $$.GetNode().Position = position.NewTokenNodePosition($3, $6) - } else { - $$.GetNode().Position = position.NewTokenNodePosition($4, $6) + pos = position.NewTokenNodePosition($3, $6) + } + + $$ = &ast.Parameter{ + Node: ast.Node{ + Position: pos, + }, + Type: $1, + Var: variable, + EqualTkn: $5, + DefaultValue: $6, } } ; diff --git a/pkg/ast/node.go b/pkg/ast/node.go index 5242bf6..8d4b885 100644 --- a/pkg/ast/node.go +++ b/pkg/ast/node.go @@ -68,6 +68,7 @@ type Parameter struct { Node Type Vertex Var Vertex + EqualTkn *token.Token DefaultValue Vertex }