From 997f7bc6e4898c9935ac9b2d0674cd029a801e34 Mon Sep 17 00:00:00 2001 From: Vadym Slizov Date: Fri, 4 Dec 2020 22:13:12 +0200 Subject: [PATCH] refactoring: fix panic when empty return type --- internal/php5/php5.go | Bin 267837 -> 268877 bytes internal/php7/php7.go | Bin 220826 -> 221826 bytes internal/php7/php7.y | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/php5/php5.go b/internal/php5/php5.go index 7f98c4875cbb683aff626e774209541b44786463..9995ca6065740c2e0b1b043341002b24b7ca03ee 100644 GIT binary patch delta 6971 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 Y0xr2(&AP6qPCITESkI<#KNrUT2TsI$ng9R* delta 5394 zcmX|_dwkC28^>SQbwAde4UJ;Y^I$YKiTzkwPN8WB4Y8R~YhqidjTzE@mcz^;=5#02 z)`_rXPB;BbW-=z^d@7YWq);dp+Us}ShwuH*^LoEN*XO$Kp2bJ+eXWo zq)I&G4H&NJGfOSU7)>l212fb-2k_7oN8FGCd$cI#rNK)E@4N}|jF)B5f~LI%Lzy5P zhgyiqghYb}vtXr5tM5&RSB!cu8ybUFgJwWCnuYhlBmSEMj~m?f9&|U@a27N%*mpLB z8C*5T;@w3miyHa8PiZ?Var|fSF;mDpu7fBou3QK28fVyg zS`cz(YR^*}V2q~X4Ui#c!!3Gmgk;)3guMJK$kk%nCWuf2bn{~+v_L8xx!Iv|OV4kC z7#;m`3yjbdxYg0}w;D~<+Xm^n6|rUq%yH>v`j$dA?Lyi1FW~+M$ zU3EG(cJv^a}V*N4LY5G3%BpfmEQ*hN3$~ptbwU~MqZWuB1yd#di;D}=4 zkI-9J5+{CwrZi30X}x``AeOQuPQ5G_RAIBLkZG{!8f;ehrVM$-t?Q6yLLdANZ)oK1 zn{o-L3jffO|1CJGyH@KD_?3)u0qWm&rfAx2XlF*Y=dL4m{0pudvDS% zMAHR7L!z=V(!(#qqNWM@fgnsX{?-0CSBLsH!v)55r#ZQlx;F4hMA?70=+_c!siC+< zss|GdUTKXJjA3G1q~lY1d14Sw()4E##_Rl)_PAaDw~3y?NT-N$&JDo?9mkG%#uWYM z8Kl1;6|d-mOLcr&DAG1Q_ACvuepfuJNceQa1S95z(WI*ItuUHCA}>#U7RN|hq64$K zW09u8&*3^nqD45KHx>MQ7^67Y1Jh~gBWT7(^g{X1NXYB=p}I=U?Sp@r`0BpsLt95$ z%ll&|rFwbO2#k{A6rK4Xf;y}`cLyLH{(6!kouQwO#HWlH5RGc5x%s?k6XvcMOwlO| zV$8e>??9}rQ^ZRzTg-^HxN4BaeS@TgOPX9dd2itp$I*H!YBwIUG?k7gqtry$ z1f(ZN;kCDLmdTl)?l@a#7$;wC$$uivn5sB)qEqMJi5NxytMAdGq-NnJ`oom?+%ycL zKTL@;-@(@n`n-z^=+9NETXL`-2*N1SiI7?Nw83e!F~s2hITjnwwKytIuD|c{e78L{a0AEH^=tIkoSRnu$1@2 zN~^Y9rBrzb9J^Yn5=+*|*-$sb2On9rUxCH<3$d*+ocsja7;OHTJdsq|$j`Ag2*N%j z$mP4VR@o%B{nBE}dfStd4Yq#|H)2DR)}a_18%+EP>E5e~eYnZ0-<8-3k8iP4o3vH+ zPqy~OHZ>NBx3-=UomQ><+N#ZW;q%(dCzU!o>y|?zWj9__S3|cLvlpjn z=k|RVXL7Q>b@tosZ?V2<)Lns%3=TYCG5eq#ZL1SB@5PlCFCLOlr`fF9{zMm~dUQ(x_d^xyKC7)#Vo-qCj%1gFX3$9tU%XN92DmCPH z+^mt;+(5d(kd;rnNl&W^U%QESRoEjQ{(+^clt-MqgV}UPsHVYBxrf*2##xQWOl-(Q z9IIk(alQt(7%W1TZ*Y_kqr*#8_o;2MxUR)v4J_6)Vxh)6s0pL9RHaR8%ElS=@n>fZ z)-+?n;Hf99A*qEm3=fco+ijSKclNO1nl?Bj+Im?flj0N|nHR_=YiiY&#c5jEmTl6M z){aFh5@*^mdK&1Z%gdVuv3N<7^*fkvdqx+2`8vj5?LZAGI@f^`6}=eDhKs^r)>?bS z zv|8bet}7CGs~#*tz94$}njUg2lA85o@q(x`y;{mw$MW9n1B281GWo(O)g~{pbJS0X z^#`yLjr^yV*>eC>*UA_u`pRaV7f+J%bx>XEIZjya&^r!^zn8PcwdFSqFJJpHZD*q8>XQZ+1@uU(j~kr|S)NPd zxzE`m+C>F4&b+m3xxrpvGCBfPZw7B*DVol2a9Vq1Ba6{m*+!?Y;YBRh^z~9P8(=VU zlY@M7iDM1f%;>CE!`i*YK_0t};_@>KKeUb3Ls9?j4t?X0=q}hCx*_eL)l(m35_Zbx zN#TvJ9pu@&Os1&bC0AR<*M7d6>CZQO{~kJ#4#OQT~emx@dJJ}P7{IMf!iKefQu;V&hbd<$1 zExJ#zksMCS)8_T2X!zp_c%TK77O&;@wLZ?w!R|G{r8##9}9gDo`J^cMTXlsf$< z>tNdQ{v~^>(jNWIrW(WYYPP}{q8`a@s|+Ro%A;Q4$r_ewyd%NoG*O4SZW%-KS}ysx z%i)yx81#rJUza@f>(ke@?Ak8*4MO6!I<72(G4;qGNbR8o{!Ihd679-p=%NLY3Ebu9 jqPHbU*$#dAgiq3kAt^*RcLDw%WE@r) diff --git a/internal/php7/php7.go b/internal/php7/php7.go index e224ae31333e59f00639df1252ae5449931eeed9..e67e0952de7bac9570e19e3c9ccf3623a465dd66 100644 GIT binary patch delta 6819 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 delta 5428 zcmY+Id3esp7RR4+CK5rAL=x-o4I#0VB1!Ejs$z*yE=7u1YNw4#RcTNvq*V#7vGo@1 zrKl~!w4|0^s_kQ~duin=dNtHdX{vNl+*!`decwOwKA-bFXU;h@@BHRBZ(ctZw&s(t zxkYdn`0kPD6VV72fXl!B`~?P$4Bc=vGRSHdiDsCP6BVrE>0nC-gCSmdeSA&`B=L43 z#-Yt2eval9{TxYrbD(KUQkJ!$0l`s~0?eg>W@u&W?OPeBq@*PNz~7O?XH>CqzG~8o ze+HP7!UD|i1I-at1H9k(n^aOKJz32!E|GVyZWl*-6ZzplvwgVr-j0wB?G3kMwfT5N zfVsurq>?)BoydT=m>L0Qfxnr^D@FO0Oymm!&4*uAC z+VO5ZKSwgJ<@uROe3|E0BZ*h>S@UqLESc-G!P+cWTS}MI=B!vhlS*pG3-$dR$^3^v zb993M?Hif2W@XTW{k<_6r;5=c!matczG!NyLYSbE@RpjIE zIEqR%n#bQtgux~*D9O@nOX8O#m}An26PcL#Wh0=jjAW+1XsU_5a7 z>51Q;gdK#(yQt2z`pHwUoiOids7P4Y-QmSlxXw)M)!uN6iL-s7LJ*gqp13za3L1IP zVCZ8gYcOOOciCXb0v?_r55=6JP#`2N)#q(Je&{(^u1>{zB5N2-BN0cC$cskEmDld( znGj;!V!%jS&f7(`lNG+&2wwQsm+3@Ec9# z!ppEW$V{bR7L=2^;WcPW_*)KiAnZRE+7WJ@2g3;C=R4fE00xp8y%55Hm*;^`bjyWW zggJ{K3x!lypz&>50uKm}=0l!A{=#zj+W5z>fWhRyx)R#xG@fX?3a(gO14j(0A%(_Q{|M$FFW3*0)JLrF4nPgy8;T*8|D_mu3rQD1xqN)}K}gdif)9Zp@!P|4 z8z{FJd<1G5Q51X%UlZmXgd>zs8-&EO@-aLwyFU6a*|nrC6i{*jo;S!xexn{+If`F$G~^sz;(*s?-IO67EXV zBqD=wIEe)n@U#)<2BR#lB1K^crjg$Z#l>d$@le!GW_y^%AUl}TUYy_52p*l729$~9!+-Y!MO&q099gn|W7xnq;iR5}HS60vC zxQE}EOox5gl7?5Wj~V2DvjL7bk&$t>`sO&?VYKXqxW$Z4Y2^B7mw;C(QTrwiJ2b-( zn$oD|u2NwOTt=0~w6sg|ZA+Bbb=}^b*0#N}M3je$76&EU$TP{9Kw?ZA>|@*u+K`(+ zY-5{W*p`|XwcDXQ0QA~D)!yOc4i5j?(c!^P4zH&;tlrtJ-o`F=Ne6bt`ZT?j-Eaa5 zNX2|vCsn@m3wz))P2%~UD34Pmim|;Nj_ZR@Q|QTb%r%3u`=Y+;di+*j9AjoSt)HEE zSwGi9PJi1&s{t6Q-;kadItV8dmJUJlHuXeU2JS}lJLvK-%q7gt#Ks`xucLYN8)?93 ztO8=>80<~L$>*^-VV!Zof*V$TGJk0xRZQqw0pbZASuf)eFpg*T}d}7rq`FIGKL2fVk=@SWS)fcHTdmYWi zCyL*3YNdDOUN8Xz)}y?R=-8bbYz7|np4^sNT>2i)1U_$*Oxxt|I0%Hq?ndA@Hp?jO z8ufwPO9q#2QB%|Ep{)*YZ^NpjdfT0vz60f@M#s+HsRCq4Pi)aqqppf?yc)^INA6ZdM{}{(o=pXx0-kNl1VzEqBeoRhjM=|b^Zx4m9 zAH+=g@=?e>MKs9ckIC~!iG0N|lsA`SI7xlPik#1|TwcOISC79=TK`M=fa<3H`6Vu) zqVrB*8cpTLQ_q6@(?_ZL z(KY{9ISJ+G4;;<-4bPh~Q+}8K1X1V{dH3l$NJFB=C^l?+p;6uNU45KVNK;LSH*Vh z%8DtrW;ZsI0(N(2D=A=HFFSW}vNw~@k{R}Uxut>snLs<;rxeWFS;iO?M;BUj3&;2qv$Cs@?od`vvm`qgdwu0I==^MF0Q* diff --git a/internal/php7/php7.y b/internal/php7/php7.y index 6dd4946..afa2f69 100644 --- a/internal/php7/php7.y +++ b/internal/php7/php7.y @@ -1993,7 +1993,7 @@ type: return_type: /* empty */ { - $$ = nil + $$ = &ast.ReturnType{} } | ':' type_expr {