From a53b9e99adbfd06dd24333ed14bee0a0e4967976 Mon Sep 17 00:00:00 2001 From: develar Date: Thu, 8 Aug 2013 21:28:41 +0400 Subject: [PATCH] JS backend: removed some useless util methods. --- js/js.translator/lib/dart-ast.jar | Bin 113179 -> 112886 bytes .../PrimitiveBinaryOperationFIF.java | 3 +-- .../reference/CallParametersResolver.java | 6 ++---- .../translate/test/JSRhinoUnitTester.java | 3 +-- .../k2js/translate/test/QUnitTester.java | 3 +-- .../translate/utils/JsDescriptorUtils.java | 17 ----------------- 6 files changed, 5 insertions(+), 27 deletions(-) diff --git a/js/js.translator/lib/dart-ast.jar b/js/js.translator/lib/dart-ast.jar index 9395c2dce62e66d120fa73229feeb3eb537d0f08..dbf3f9dd080fad7471d57aeec1473e2e2aceed8e 100644 GIT binary patch delta 7921 zcmZWu2Rv2p8^6a0*Ok4qWo7SdkqAE{NraTjh*Ff1(B#(BInY zvEQCb*zY7QZiJ2kY5z!(L(FCWT2F=`6LbM=91kgy&6qgJQ4pTV$=Af3Jakl_Y{@u? zy-2d?!&9u#_up@1LDD4pLK*n72Ev|N+T)opz|c_x3UNvmdxM|+18I{RBi6tXRS-XA z2i0>8hB7ubKu83NnIIz@MoPvTP=>7c)5IWeM|^x3Fdlce0W6sf;VB+Ww`e2;u-ihD z83j-zS^OEXr>{z%X(E0(8Bnqocxe`MF1XRiJ|K@$hst#7Fr)z(I?M$mj>m%jOXQnmgRxh7_Ss zO@E?7Nzh`(jHHxCcVos-xVstuxKGjYyGFw!Zb;%GOYD{Mj8A~}B+fZOd-}=!lm>pr zXF#b~Ze10RBJ+4mY{rNIUOZTxT|U%O`gYQ}Kj5`i@Il21;+3-Tlp{S} zm+!8j7N{K|z45ELX#B>NaL(t~S1J4(fx!{cNP-WkNycJ7bwn(y)M3Y+UEX6sZUp#C z&lWE6$tya;Emr2oT-y8ECGX9M#7_FQXg>CA$>r%ByXHTV8T2tzWxG~yue#lquxUy? zpIz0^gRrBU~@$WnY_4NE5B8 z9KG79GFI2WtZ2UT(8!T?e?!fXtUJ4OS<3`%NYCF!C-~oM(k{2E%^XUI)#uUg<0@LX zUG?J3ZtG2aO(yZ`9b6&e{<@v@ICpXL)Gp07yDf`0?|V%azw9G!?-foZ6VEi*O#k;P zy3o8PME+^@*E_>nk4LYaae0>+^Cdk%@UqHv=lU;+d)pKr`?^ibMG~gg7j%lstDpAY z)VwGav&2)gRD5R3nf(3JVaj0%9=ZpH;#^#9C^|it;xb2?{q>_Ch6Dzvsyh?#7K155 z>e{CqjRPdYETXn`tb6k^r+c#jQG6s(KTl}>W=-|JLT`5G1~E0ZLoYIRe-hZ2a&YT% z`MS^{&s*EgNyoS+d|DoDUK;vUqu+Kb+Jhjp=hE@nfZGBe25~GWTU<^HGUsr-@I~o``V6&;aShgQ?g`(uwh3d;!J^) z4&z9=nf$ADAJ5FZRkiRto-M`8lp^3A*u>9E7@JZg>Yt4N?#BOVHi^KtA=-ZM(a$=OcyIQthmeG`;ft|*bNFWqmb*wC@8tXB&O(G2vR2iP zL)+bWB%I`}z9%_8f044(Qarq<-d?rva=&}ImTJ$=$})5*ptMH{_dTU9*wcE@}BV zS0i9h{H^khM-c_?t==(HVNWA=NiN3=lN#=+FUilm#CReA)|{@XF1Rs8ax zK~@Cmw0w?rW%rAs=U--X%3d5vI1;GPw*MjLd4q}l8QmO{p$~JqRg}L~i%ac`)gEyr zDXVd5ogN<(xS@E&tz*KZvQF*DE0$}=)y>l_oK*?RXJ6i4Y=0Ll_f4)}^XcaWrlc$W zR+~aNnZ4E3QY=HJC-q&{N4Z6XWU)?_d5EzT+V&hizp(dV&D0@BTNYLcA)QMFOgJ3N zS{x2J1MuNk!C$1iQ=%iJXnij_!iX}PZG*jmwh1?!hd3!O8xPZ(EHW-t0*kShi14ie zpZs4#DK=n14~DN6flhkBYh^e_M;K6?Z;#MM#L&^GKa$|6YB0kN_p8yAgCPftS3+zQ zLP;HMG8h}n&>A`-`eQ!8`=xK8O)cb%u=6JeO&~H^Z$4+D=s(^{TLQ*C<>vEP42>9j zvK$z@C#@YdmPTNvj5|nTB33AHQXv?=r|kJKGUb<(5CQWK8N8{rzzD~&^S>jePa#S& zu%G}cy9HFv^nW9B6BwEDa2o{@r@Cx~NWVSOrbh0AVp;KjQc(p?I+(r4ywQgXEn? z*aopfyq3HB^P9s?;mgV-Z>I^t%6<>hz8=tfr|{OjS->=l=vO8c@Pg%&h45fIRk7E= zEBkO{2q9|5*Ayr*~4vXjtRS_lRjXvG`aWaq&-$|8`o4i~EPy$s}-aIA|M< zG*@ObgqaCugf)lhT0aofz7#c&N?u@=TKDH3}cT^eilAbAdvo#svdFO4KXowz6`nh zIax^}l{>ewF0;73o|!(Ke~~LiPBM7Ut2Nr8OAKy5YG>x3^XZ(c&ufcw5_V|m>Xo_7 zFY3a2)$mZMYD2<;{KQRGD-MFsqnq}2 zA}yyC8HbJTesb*KTZ##zydxIMq-qJi{pvNPpmFX~h;r(As+S&Tp+F%t_bx^_TW!OM zeF;_n29eQFvvI{f{Q8s-$RDWb}z`Hl*!oQifwO)?#zS?%PR@RO8S&*X5&CQeD?cp=o zjshc_T@*yQa&2~6`EKuT);3EvvdUyMsxtK&Im)AFS-W#--~B{3A>N(aFO?-JXO5a8 zt*IlMRFKDj!&R^OyETD>uOgh90I|T#Y0xXIs6V7Zud&_sG#OH&9UQs4X*kXla4>z6 z0I?ID?GFu`amCDhmEj1^(5>JbA39(8AjBy-k|8#-I^MT0&cf+qO5m;?zb>px@a~3W zm1Ngi?^<#?lY9BJrLX1Z=O5nRy_UOJ_w)1Ij2=#2|6NJ)XFTD(#(OQJJ^H)D4?Y_@ zxo@|0$>7{(?s$g1YQ5X!`{xwc3fXTch_!n6*tik(rIdin-?kHw=>I! zAK0Chy<7GrBMuG`fU6j?{~JtKjUg*?nA}nGJ3Lsv)FAj)S^3E~O1$Qbm-yGd2Woq+ zKeV}g?c5ZD!?H5mEZ-{HrWyq9KUcmo^lLl5`FpWV*uNfNh^sAcF`p0X_&+*a5%C_Ods zUWs6x7V};B{y5*>Na3I~em}>Z>)K_r{_CT76t{nSe`j0OFP%ExwbKh?_jHIOGWuFV572l2TxN8!F> zG7(#jeUSXcfYjD|$)dPr2#1RXqmO>5v{oSp8iLGY3QZ7?a}&bQb%# zq=Ii;3C30JnmQN<1z;73eq_O4;~-A>@D&J8os5EJ*I-}9=E0B=(Zv?2#$URrt@hhQ z7*3mP(#X8u1u6F%GFMzt;!%*|iM8ghN~YjN*BL$vbpN>PE63!slPwTz?Sd~@QvAUr ztFU*2^Hs^%_VL28vBI%K*TrV3-o*(x*ASCaYz0G&`YB{#*^)qgo!DWwe#vAlk!+oU zeL`)DV%5P~vPqRhIg5bdAa>H*n$WJFB@cO?SUhR&%V=m7pyp4KpGW)JRmDVpYQqf z)pgC;C6Bfkhp*Q|3oqX%wgg!xM5(=tc^<<5O;g?Gr>cd!qa`tps3M1#PJM9Gm9XQb zRZf6{d&B1wT^C6FB)d)yBiqSzsm?L(IHoay~`3??(1;ygL|38 z{+``GZZ-bHhPPcZ*wLyo9qRd^#bD9E+(Eyevy)#qxa*Cxg(5rSYxSXxq}Rk62GS(- zE3(!WC#>32n(A|&=w^Io#IY#UAkc^3I~C5DadJ918hAO3wDm5}QRCK;#qO_9J}W7{ zAwKBZd~R5a`vhBni+4#``Pll5bH3w3Cu7cKSNRbnc+#>vqykFn@5$N8Z27{!R>l7{YUL)VDP8#wvO3}D`f8$(*irE%Ou5ZI75$SvWhoGbSapl~%@%s-ee{nA}vAys{ z`c>bggIz$*0aNLhn=;*>>mjwR_$&B>J?NXd%t&oR40zn1Q^4v^b|xGXtVD)nuyS-F zLps<~A{iVMkXs(Omke28Pn?;ME%xM<3H^gTHD*H2Snmzaf<$1+EJzu?lm$s*w3$Xo zgn`6Bc7l|U8y+4m#1uZ_#HyyBJ02_G}_-VA-L)-y84b21pTel)z1CcYl7U3Y* zL{gaa!5lz6#lJ!&kj(^H;SISfizW&Hdq^A=H)PEYs}`Z7IB!TNY)J!IWrM0T!XN+q9&mj?2h^iOebhxzYH-)Z z6_sZBK&7cZN+u6%WdA>vk9-Ag1_D<_fvfs-!rmLAL2I~?NnzBNmy0BXo#DhY4g`6Jl0#GhS9L|Ie8eok;?Xb`n=K_l~w;~jE8LkK-Bt$iVbtIXK%L%;Qm<4%>oDrS=K(d$pWHN{ z0t;5HctNNERJkBP)q*{0Xn_$qT6KI5#IKwchqI;&j7SJTZbi2gYHN&XPEZ^`UI&RW zr$e3!1xQ`8*C@yT@Ba`)Y3OkP(1vf-K)jfN4#?h52}jL_>sJh%$OF_9Q3#cspv3{J z=dWzPno_{I6^n8vqS@f@r7N5uP;k%`vIMrK&L&OkTn^9;3hecGzwR3a8*wR`tA_^*7-IQfs-qidH-10Q~L5c zQrLPx0sY2&o{OT3%-62!a8FBsmF4*;=j<^~*sowETro&1A1Xo(Vp#(Tz$xHz9dpeT ziDYvr%1S7Pq);=fn(j5VgQCe2{(GN4s6>(A4wbgggOR*0Ttt=1tMkKm@@VD1`d-3< zE;6poD0*f_7&fh^p&N3ltZo4}=Rg7K(xLZK$+xmq;k43~O2Q-C;!G=`>cd_YwDsGQ zDTiFadI)r;jdbg|uLGnC+z7S}>YL-IF*p+VR>k}G*8cYBEe+~Hko=U5N8{Zna}=r zXS_5?)=1Zbm+~Qg%<|%L;LpS}Ks8-eQl<@n8u$jjRS2n&-G5@c2U}263s_gCF_z9_ ztlUsf>@&z!o*)l%oPUqbO&?G=>`_NEP|aC0vK+Xu7F0QX+MqcEssW!arwxP?q=OSb z0Bjg|P7h_DN1$6UvrGzsS-}ekMH@~jTxm)KBwd4F5waH9)Oij3t(;ald+VsF=Rl0E zfEdxwq!}hS_9`R_{_~3)xgDbQdqZT5jI&~_!;)ffDmY@Gep`C9UeE&8NrSvt(d9*m z3x>6o>8F?Vh7IdOJ^jFzqM}ZWvv`96BsPP!C;ze;n60rDX(1*~Isu2|c9t9%+X*iNf z3+d_`1Wh_U0*5eYLn6cj8@15zlHX=Zr~tPQ*harKxQ-xrIhZXCe97gl;FBzuOwIv( z7x+=5ldo_T!5d@N+qD4WxI;0G;3k6WkA&6Vq4eiO)3D!o^yUH&PXf1Sn+FkCavTE~ zr$Pj{H;d+iQp$RvPr#I&z=id6Ci#UUcu{yc9U`DzYV~&kta=%Utc}1Rs=?rD<=|xq zk7mn0XZWlxXe(@>oh#CboTB0JSD2l2;^K3zCsYrFm2c*(R`IcJWU%fW_`i48~lZ_I0Hb1IiC z6Y_h50{YuS1^u0%%R^g7fY@I$lHlJEI}F%8G+x zw9N!URw(Bo7VJr8Jsy~Yq2QmH5HIC}h7`6mBxww{=0NNeqUB!V#722!6^3!?CHJE!3V+%#_9S*e5PM1$ux3R$h*U$WG%Liwf*P}V`w>jv7rZg- zmj&@qcIuQcq1X{FV>rJQVu9JOLR=K5N=^)FZ*B}5T!uI)-6wzGQRwFF#*|pYUtGXY z%F@6D2B*oCv(KW2l4*WrX9B;DC@Z3yDMOM4n8xZHV@ln3Im}=13Eo}_aZ|kKFh|HV z)xuRkwfsUCJE~gjf-&4*2Junm+MZz>ha^oXcjfkBpMV>b#ljE&S_69)0e{9~Z~Ox{ zrU>58C!l;0qsHXbXUuR_ImAJcf1!zjDAhU2C8F;7OguA}=X zU+`zwkY;5A(k-UvuuU@Sjp60X5F2?QrU_*xQjICA&w4RyX;!877-OVLL_chu7K+sZ zh=p?Oa3!`xOD*o0XL zOrpepiNb;hl1Hgz(?Df#ry;a~tYyGV&Z`k6xp+ABSn+S%$hSXp2ksA{Z$5v1<}o1f#ikY1<$8d3m%JiS2T6e{fN_gi^0DWDt^h z|N2)_lXA=+@A^wE?tq(=t{?H? z<)gFrYNI>vh!L2$8TyZwo-g(?$}yE~b*FlmNr2f9yq(PqN4f*Dc-+M|yoGYWH!Mnaou% z&oeH1D|THDWC}Nyy~ays39zD^H#vaHo!3piX|RyWyI8l!$8g81G1mt=673aPT`Cb*Q&*$axq7PW!rRwramH#@j^Mc1K3Bz@ z_Tn5VRTJE>6z!?UPlU_5S~)v|xv!{A1-LzAmIi}V3rbYH}1c!WE?PeWl4f+ z_c7b*4a<1Ey1JQLw&&i+x!QU+_bU(5?!f!bo*s^z^Re%;5VG98JadVKk9zKr)WJIG zjX0NK=57-Ebm|GYNS1?>f9y_T)BYIuk?@RJ_6Wy2C295h&*jIeGiPNM2)=tY1LZ1` zn__G7=hod)!lw`5CxSl=$v=Bs+{|lT`eaiQpY~nl2aw02N%4w5?|~2R3gmlaV>44m z9@p*jGy7q=M@#Rb@Ey@Jv6dg2x>~-PEHb6mddihAK_rD`#faiPZn5Bh?>?^uy^WcT z%EH^SKW3h9PvyCC(9t%%yi~bdSKaT)27z{~OH41VbK@KKItp&tRaB5n+B~YabuQX! ziLpki%Qij3$?rg!6?GtI|93`yPT`^#pZQDwI{G6^vgnHUR^3MPhD)g?8-g=TokC&{ zRUNH0+%E6vxqYiz!HnRi)87>L`0kW_$4IptzEJIS`$eE!lT^h@vfBHLI&zX0uBWG2 zU&Zw0?eAcf*1EZ*|2D4@N8YG>SK}13gAEJet=xjmZAKjK5IYV>Yv%ko0{DaUP+B4A zJ6`io2{9y#;h&>L%HG^0BL`FsUNa+1Oe;vwvp{XOFkr^Ybw`vj<%_KzR%s(fw_#9P ze@VOo`io_HDOPhpucSEaRmWQIP~H#*ZD%wgcQE`wmC_n&OA%!R7VLC^+Hoygn5EHdP7JBmU8WpUm@t_*TE^MF< zia=2WwtwGo;D!ju5D~+6$&e|@W!Q;t7yn97jaMtL$`_Hr!$!jmV}Ykhf6q$(#X6w*{)(%-dGK1=GPmTk zX|{6Le#0z6Q^MGMzZ6js-;i1E~~CIv8=lN#a_FZf-~x*{nvjI z9mrJiUXup9U5VF9+eU;J-6-Oln*SCTBwDE3FudP(S^1~fWi)rHBCx_ZTe#s8J zcA1d5dOVXMKrX=1t*R(mmDMFKZvk&|@S*L*ABE9-1naYZu!at_jp%Q3-5i)byBgrk zw8%B%SstW)pCobjkbl%Q`DB>_lf5L5pi1JLPD^?^Z+BY^QE&1uF2P;fV>vrhYBo;3 zo06H$sp>Uw{$bI`Y}%AI$-4BH8rP$IhoRQ8)Y=%~ZJMjRJ(?FT zimDUD$AZ#!I_!Tc5hr!6xU-|TfXQQnF{eZOUG3)E!o^R$35v$JrmpoCMsg|>Bs}Fv z;0J}BvkN^2{GfYQSUf9>N&dCnW8=MHue5W}h#N>2mnOTN$-H2J(k^XmxJwmlE1{4RQDm72>Ae zIs=U{tiAW6L69+87G%~d!<%ctYrK6Z#0HDiL2RUSr}m)k&HNkrlHaedpI~>AjC9z2 zk9f$V&Bw`Ez(pF5zv|2{AC?rblbYmV#3gkmW#8i%yp^-G;3=FGe!%1#gKUwYjnUBq zAsycu9)C~HA8urHdwfYnrGEE)!VPWr163lQIP3)4>%I21+$)226%5!cUXvoIZCEb; z9F|thN5W6#!TUA7BsVKr4SMv}$VeAymAH0E=jB^22dNdz>-d+PQHnEpy-8rc+3=}8 zKJceyE3?Pnf~-drPs*G2$uBD|2boyqM|_F1Tc2}&`VVzY&WL=ewm`E<*6YiA^5TPd z$HEUi)Ff}6SGo*s4cF~3J2fextRV0pd-D}O-`f!+j)bsfeskf62g}qp+#V8E3LJ|{ zta>BOw<&0}+L`4;tc<|w9nm-iV<^wW zQ(ByunC4_0^GI4GG^R$u=7_fU#1V(08HpV>Bu@9hvaInta!CPi=ejcpo2iN zigU|@4Cj{j{$=l?u9O}3l@Pj`7qf&H^J5g^bmt9)Tn;BR+B{8x(wW@}3gssGj*A4Y z$8B)+!G&VfAS_)X2xA+Aw=d+F0v4NEBiU$$jm^Yv`YT8_6Hx*x6EAr zw0n`$!A6{gaJA50C4vEm+l2r9Dv)XCA33k-wGb~UJ^iqKw*&vQ=VslK@W`Yx9``I#_L*FLF`(0P6FE6@h{{yO0kZFK>M#d}m-mm3_32TPkKvtlTIJ%<~U^gr%<{9Rnd5SVUrC;So`*{qx@AeqP5UZW{-|T$#YqAz9C1-g z?o8UI@B`hmUxLG$&#Qe3BAoQEckxd+@F3NCrhDLI;N&)ziWnE}!;Rwso1VS)cz?67 zkb7D5L}&R3Nj65$eami(m{=akt*Pr*JA(FJtD6oUy%?>>IbUt}a?x~GVjsKMr+?~iy3w|d+jXc;>e`@x`5Kqe*^K6}{ywdhH6f zA>aLi*x%2M1f-0sPBVWYN=+OvzmgkxCG&E+o&DC1<16b(le!AL%u4GYmc*OK?{@o3 z#=SuCy&{jErsXsL753ukIPFu$TgDH`Ugczv@Ck^1`t=*Zt3W}fJ87Mnop6w~@S$y1 z;);oN@`-hFN{?Cj)LCI|K^`_9^ERntTKzrBdd8253ZK+o+;~_%+wCc{Y+~**`Mk5? z8C$c1n*h&oeRI;wD9>}&JN{71U*VA-&uUw>e4H@x^htrKu$kon_OIfD1rd-&j5=p9 z+b*K*6Wi1uxmWFE?El>1+kLTBR@FgJ5z>{{=C88py`yp|W5~Sq&bf??p(52;=J+Kj zWKzsoL%vVmH#Mj`ZJmx_o&MS47Nzwy(d#Zd-Pk-e8CMZ-bJR!f8Q&?mn%&_`&~Ft{iUvOu3cr9n36lMxxRL!T1J&`zX5b-ZDk6N7L#DR8@u z;VCj?L>qv?`neDbjxQNQ?wDnM2<7$MAC(dQmzA$=0?P=r2&5UMh3)z zN-D1aiK{sxQO@T2*I_S{5VoMH(1!EDbQC2~p&gVsD;fzL0z*Q` z8Hu-zJ+%lz-wi@Ryn&JEwI#NvB8Ca{0$|DrG0BfMbhD28h5tOVM=IwGrJ z@F;?4Q!MHElLF307`Tb_iRRdgAi+FR3f+H!X03`BV#6IdcK9vGF)H~~0wk?INYKeY z3(+_s^buM!$1eigRyMz;Udf%hp(^U69gQtl<)W8ee_4H;VHwS z^!T87uK*x^529pB7p3N-h=thPQy4LWsEKEP1klBRn?9!IVKl3^p?+k8qrwmrf$T4* za==qpF}ozA9ex}Hnz*=dI9)nz5l4#P{Zs*e^aQJmd z0Ckjf39Q~I2CJHI+a=7=-8t1n0!a2a@9zoMx(1NyuxcJ8g6>x<1N-wT5!TQ$%zc*& zlq0SnQxLd9^qESmLXcqgiw3Ht{uJ2`l!|^(_31B~HHDmd$N+wt|I2R%>cJFQ6v@*Gjqx{EKz>+3 zMmNyqiLr%tB(|VVuF#xhdxR)hefEFIpOyoFL>ofRfBjdjH!lFI>Cb>4>KTO)D>;zJ zj}&K=bbywrl}=2`467DEyogb?E%_r9Uqc<* z&FNg==)=&m2+-#`H8~N4x(6ylcm37IaP&eMSpX zevL334{kCVy9=}?&@qkP+P=bHhgpnv5SnJdT{M7$(lMLOY~*-py*~=rO@9|#XAvt_ zv#~O2$`<}@5@`1Vfu~2>en(qWN7k=?BT2hAdGmlk4?c1UQx*8m?$Zd^9Q&Vo#oJ3$D2$HWz`YkU$fuke@Q}{`Y=F76HU7R%A16PKa@e)81lsbD*5( z&C$M!Gi_%#3gK|mS_e$?ntt4Xk99b}B4q!&LIP=VABaMAbu$H}N#@P&jACfvkwnP9oFDG}fw zf*(yf*5MQs?|Sps>sWFfi2svR+Vv2F^N&Luf(|x#kU$*H7yMaVkHfK(fm+=E04wto AXaE2J diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/PrimitiveBinaryOperationFIF.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/PrimitiveBinaryOperationFIF.java index f614a2d4870..bb7869a2aab 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/PrimitiveBinaryOperationFIF.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/PrimitiveBinaryOperationFIF.java @@ -20,7 +20,6 @@ import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableMap; import com.google.dart.compiler.backend.js.ast.*; -import com.google.dart.compiler.util.AstUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; @@ -52,7 +51,7 @@ public enum PrimitiveBinaryOperationFIF implements FunctionIntrinsicFactory { assert arguments.size() == 1 : "RangeTo must have one argument."; assert rangeStart != null; JsExpression rangeEnd = arguments.get(0); - JsNameRef expr = AstUtil.newQualifiedNameRef("Kotlin.NumberRange"); + JsNameRef expr = new JsNameRef("NumberRange", "Kotlin"); HasArguments numberRangeConstructorInvocation = context.isEcma5() ? new JsInvocation(expr) : new JsNew(expr); //TODO: add tests and correct expression for reversed ranges. setArguments(numberRangeConstructorInvocation, rangeStart, rangeEnd); diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/CallParametersResolver.java b/js/js.translator/src/org/jetbrains/k2js/translate/reference/CallParametersResolver.java index 017b6286e92..ff1434af799 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/CallParametersResolver.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/reference/CallParametersResolver.java @@ -21,7 +21,6 @@ import com.google.dart.compiler.backend.js.ast.JsLiteral; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCallWithTrace; @@ -29,10 +28,10 @@ import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall import org.jetbrains.jet.lang.resolve.scopes.receivers.ClassReceiver; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExtensionReceiver; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.jet.lang.resolve.scopes.receivers.ThisReceiver; import org.jetbrains.k2js.translate.context.TranslationContext; import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getDeclarationDescriptorForReceiver; -import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getDeclarationDescriptorForExtensionCallReceiver; public final class CallParametersResolver { public static CallParameters resolveCallParameters(@Nullable JsExpression qualifier, @@ -116,7 +115,6 @@ public final class CallParametersResolver { if (qualifier != null) { return qualifier; } - DeclarationDescriptor receiverDescriptor = getDeclarationDescriptorForExtensionCallReceiver(resolvedCall); - return context.getThisObject(receiverDescriptor); + return context.getThisObject(((ThisReceiver) resolvedCall.getReceiverArgument()).getDeclarationDescriptor()); } } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/test/JSRhinoUnitTester.java b/js/js.translator/src/org/jetbrains/k2js/translate/test/JSRhinoUnitTester.java index 997726babc6..6ea28e61da1 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/test/JSRhinoUnitTester.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/test/JSRhinoUnitTester.java @@ -18,13 +18,12 @@ package org.jetbrains.k2js.translate.test; import com.google.dart.compiler.backend.js.ast.JsExpression; import com.google.dart.compiler.backend.js.ast.JsNameRef; -import com.google.dart.compiler.util.AstUtil; import org.jetbrains.annotations.NotNull; public final class JSRhinoUnitTester extends CommonUnitTester { @NotNull - private static final JsNameRef TEST_FUN_REF = AstUtil.newQualifiedNameRef("JsTests.test"); + private static final JsNameRef TEST_FUN_REF = new JsNameRef("test", "JsTests"); @NotNull @Override diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/test/QUnitTester.java b/js/js.translator/src/org/jetbrains/k2js/translate/test/QUnitTester.java index d461a5e7c99..324017cfa2c 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/test/QUnitTester.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/test/QUnitTester.java @@ -18,12 +18,11 @@ package org.jetbrains.k2js.translate.test; import com.google.dart.compiler.backend.js.ast.JsExpression; import com.google.dart.compiler.backend.js.ast.JsNameRef; -import com.google.dart.compiler.util.AstUtil; import org.jetbrains.annotations.NotNull; public final class QUnitTester extends CommonUnitTester { @NotNull - private static final JsNameRef TEST_FUN_REF = AstUtil.newQualifiedNameRef("QUnit.test"); + private static final JsNameRef TEST_FUN_REF = new JsNameRef("test", "QUnit"); @Override @NotNull diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsDescriptorUtils.java b/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsDescriptorUtils.java index 431ac96dc4e..7ecd7edbc15 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsDescriptorUtils.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsDescriptorUtils.java @@ -22,10 +22,7 @@ import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.JetExpression; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ClassReceiver; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ExtensionReceiver; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.expressions.OperatorConventions; @@ -177,18 +174,4 @@ public final class JsDescriptorUtils { return null; } - - @NotNull - public static DeclarationDescriptor getDeclarationDescriptorForExtensionCallReceiver( - @NotNull ResolvedCall resolvedCall - ) { - ReceiverValue receiverArgument = resolvedCall.getReceiverArgument(); - if (receiverArgument instanceof ExtensionReceiver) { - return ((ExtensionReceiver) receiverArgument).getDeclarationDescriptor(); - } - if (receiverArgument instanceof ClassReceiver) { - return ((ClassReceiver) receiverArgument).getDeclarationDescriptor(); - } - throw new IllegalStateException("Unexpected receiver of type " + receiverArgument.getClass()); - } }