From 19fa9c0ca018ccc00299222e015a182e73816dc1 Mon Sep 17 00:00:00 2001 From: Arthur Schreiber Date: Mon, 14 Jul 2014 22:20:02 +0200 Subject: [PATCH 1/2] New test files for the javascript diff driver. --- tests/resources/userdiff/.gitted/index | Bin 1336 -> 1558 bytes .../09/65b377c214bbe5e0d18fcdaf556df7fa7ed7c8 | Bin 0 -> 850 bytes .../0c/20ef1409ae1df4d5a76cdbd98d5c33ccdb6bcc | Bin 0 -> 120 bytes .../39/ea75107a09091ba54ff86fcc780b59477e42cd | Bin 0 -> 854 bytes .../3c/c08384deae5957247bc36776ab626cc9e0582b | Bin 0 -> 116 bytes .../46/8d6f2afc940e14c76347fa9af26e429a3c9044 | Bin 0 -> 851 bytes .../53/917973acfe0111f93c2cfaacf854be245880e8 | Bin 0 -> 846 bytes .../63/1d44e0c72e8cd1b594fa11d7d1ee8a6d67ff67 | Bin 0 -> 183 bytes .../f3/be389d351e4bcc6dcc4b5fe22134ef0f63f8bd | Bin 0 -> 117 bytes .../resources/userdiff/after/file.javascript | Bin 2785 -> 2520 bytes .../resources/userdiff/before/file.javascript | Bin 2812 -> 2556 bytes .../userdiff/expected/driver/diff.javascript | Bin 1343 -> 862 bytes .../expected/nodriver/diff.javascript | Bin 1181 -> 972 bytes .../resources/userdiff/files/file.javascript | Bin 2785 -> 2520 bytes 14 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 tests/resources/userdiff/.gitted/objects/09/65b377c214bbe5e0d18fcdaf556df7fa7ed7c8 create mode 100644 tests/resources/userdiff/.gitted/objects/0c/20ef1409ae1df4d5a76cdbd98d5c33ccdb6bcc create mode 100644 tests/resources/userdiff/.gitted/objects/39/ea75107a09091ba54ff86fcc780b59477e42cd create mode 100644 tests/resources/userdiff/.gitted/objects/3c/c08384deae5957247bc36776ab626cc9e0582b create mode 100644 tests/resources/userdiff/.gitted/objects/46/8d6f2afc940e14c76347fa9af26e429a3c9044 create mode 100644 tests/resources/userdiff/.gitted/objects/53/917973acfe0111f93c2cfaacf854be245880e8 create mode 100644 tests/resources/userdiff/.gitted/objects/63/1d44e0c72e8cd1b594fa11d7d1ee8a6d67ff67 create mode 100644 tests/resources/userdiff/.gitted/objects/f3/be389d351e4bcc6dcc4b5fe22134ef0f63f8bd diff --git a/tests/resources/userdiff/.gitted/index b/tests/resources/userdiff/.gitted/index index b69d5cfb169871c97c93f562deb25d9580880f5e..548dc7bfd80fcb1fa448fd7cd4ac35ce317c1ccb 100644 GIT binary patch delta 791 zcmdnNHH}Bb#WTp6fq{Vui1~xVuLS^U1{lrAz`)9$K56Mh6$=}fSnv_^&mc8Wxn&Ft zjZ1*MuRtLY1_sU>!4oTs*ZgA?{Ar`}Yt4_4eJT+RFDA~Ak$~%m+5y$SeBv1kTyiTX z%P^u?`~}J4RcIFf;Y{6Jen@2Z(+3y(&#n*6{r;=&`iaRC7;)OXdh#0<)yXdzg>hNG zZn6lI11`z+lXI9na7k{MdI&3%jls}V!Gw!P;k^jwI@vE*m*?ER*&Abg=63d(#I%ys zA_ijx1Fp~eEasZZd7sHW;~oD<(d0dU@{he~nK`M&U|E|3%`NxVMTV_V!>5+D)%C<-?DE$&{xwz-sv9&2hnPpJh z`_kTAH`yob71b>8cjeck%YKOdKb@D4q#*8}gsi*r+DA6GH+#hCD8?s-)d_QVcqpri TZ{o~ycNUT8()vDGXwnA&J-zYT delta 562 zcmbQnvx7^;#WTp6fq{Vui1~vaeVGHK8DKOY0|N`2$kI;}RV$y z28PBZ3=E84fpQ`Y3|tRuE+1X7>cfi(=Klj~BKFS^sC}M~%F&+`Q~7 z&eqfVZ2s)}DKh=h{{_8p&ZHSiF?g)_v}PO2)t6&H$~ z2^;aMQm8~*4eiLrO3s}Tn^1TFavWx!5}>(yXaf>!43x)w3fhGVkYyQ{Svv?vW66b= z#v|oL1zbRRf@euChCK6_?>kzqu}nCmIYZ?4B}-KZ{9Zz(;fzPuPqehK|5TO5h_Bl5 zNAlEKEEJZhx0i}UCUTx~FHe0YRkpS&j_DLY7=W{Bg3Yd2bQi`Wr(q8%=rN1^hwgXUSG3%F2N^jS~3 z3yhwj;#h_jHiMl>a?j6_X}oh>0D57jBo3|-@9g*0uZBzMYUN&9quT3M70-DfYgEs_ ze7&qHU#Q8i(Z1+>`+jNGm#G#&kO**0QV_=YuhLo)LDA00Zj93H@{C5ZR33PIB!rui z^cGI6bOi>6u&giE)2LYDVq2+X=1J46+EjJ1y{&s!5t6iE=^j#78tPbSA+ z5G9E)Te-Ua+pv4k&D}a|kRF_s`thA>&r5bvww&o{_rl0<`;o(KkY<;fnOW(yS(uMsa c*UXn0xAI3HTCjU))$}cov$nvOe<#!ZX@{+$*#H0l literal 0 HcmV?d00001 diff --git a/tests/resources/userdiff/.gitted/objects/0c/20ef1409ae1df4d5a76cdbd98d5c33ccdb6bcc b/tests/resources/userdiff/.gitted/objects/0c/20ef1409ae1df4d5a76cdbd98d5c33ccdb6bcc new file mode 100644 index 0000000000000000000000000000000000000000..fa149da98b2bceba595d89743a43c8490a30f03e GIT binary patch literal 120 zcmV-;0Ehp00V^p=O;s>7HexU_00M=?w35^!hR^#f=9)3OG;Zo z|NHDaUz&`DGO1D;pYM5W-(z3;QPPL@!9n|#FM}|aPB4iFd6>kGl7A+lk}k+uny5T; zVVwArNH*YM1NgtkYw!U&k(f($yn$=?Lcw=AMTCw$-0c8z7iVb2*Nzb);gLg4!nDh+2cx<>0>*-cw}Y+X8w z7#Zk5e&;f^$O}R<757q=|Qe+YMnJ`7M#JMz^8n$YF4exEWO4KuW z1Mk}K(Hw@U;4%TmH|A#36dzy#GQy}Rdrib3Cocfm-7P@O$(3T6KaHigI+k92EDTbP zr4FPV3+a*5df?LH0bEGb?*CSw#kWA1g_h?NL6s!2N>$Y7*w+0-C?D5#iK*2*Yjgoe ziikexUUxz8GbD{=xWi_!GfwX1X)=v>jtW38%*f*4An{IrUHxphoUV56rZukJPSx>T z26>I^`R6Z}Rp$%p{TlC!v#;MS%>Xmi0tgZXj!6o_7=M)3QV1kFW4kdaGNX+9(kWwl4q*U(y(tYT%rCJt4Tzcv&%3T`Pb9WAFdG+i3CPsS*d z?7oDg+gU?F%B&@s0g@c7&4eVphDK}p8J-taOpE^+B43GVnPZT|xt!%z?=&cqAix<# zx84ttkGvpC5@n`xb^Nzr@1UUvtjl}oPP8{dHVyN^$m}Z)*U|tC=n`5UbhmTF9RMY) z{X>E`wWV>|$Ghv!zW#%t6R!nn+g;Ct&?&9PSh=73lxyfwZOuoDmY@FK@bID+wm#SP gPtV0G(uMs)*YuZZxAIHjp)YuBvqj_hFHF?@?IyINumAu6 literal 0 HcmV?d00001 diff --git a/tests/resources/userdiff/.gitted/objects/3c/c08384deae5957247bc36776ab626cc9e0582b b/tests/resources/userdiff/.gitted/objects/3c/c08384deae5957247bc36776ab626cc9e0582b new file mode 100644 index 0000000000000000000000000000000000000000..29b72fbbca6d39e3390f4effef4dc5081a4873eb GIT binary patch literal 116 zcmV-)0E_>40V^p=O;s>7G-EI{FfcPQQAo?oN!80J$<1MC*Og4OH*%fa8Ce~)?@dbh z!8_CCkribnmL(P^7iAWdFmR@BEqz`+oR_mS5gD~b!Fo_2;OkzjyzmrgK7x*kqgv?wR zC;lYjHF(?r`t8vfoI)pJb1sfI@a%yJ_`&BWBn)TEYu@wuRt*mUTsT8q?WC;YTXC+~ z95DFK?Rhc+Ow#z1+@r=VS^09lrCnKgrOIFej= zX*^V3RKPiuCwP`j#DHfW^L7_q05CKve;MKA!6mt3mUu&;?v5Ec&7+ z-33O^P;o3n3!A~tICLE3_}$-@ad&^<}CB5F`Q|lN5w8epOmaA}HD!*{xB!Tb|KK7Rm!pPlRw= zklw+Gm9D_R5SI1DdKwi=Tx=_q%sgqDRh!B#wzqZfNoWwMcqPc5wE}nzM0II3#!7pdQ>vk-YHR+YX!_}Y8y;Tt%+}||{^+@QMY^zm d=$iR5<5qm>K?8OVteU>%an=^K<9{Gt{azZmp)ddd literal 0 HcmV?d00001 diff --git a/tests/resources/userdiff/.gitted/objects/53/917973acfe0111f93c2cfaacf854be245880e8 b/tests/resources/userdiff/.gitted/objects/53/917973acfe0111f93c2cfaacf854be245880e8 new file mode 100644 index 0000000000000000000000000000000000000000..debf7e40f9e252e788bee02699a7c5f191eadb73 GIT binary patch literal 846 zcmV-U1F`&g0hLy5PuoBY-e-P=K^mlMNTGuXF*a!ud#T2@icvv@_;775ZA3`2OG;Zo z|NHDaUz&`DGO1D$pYM5W-(z0~Q8Iw`VSDeDFM}|aPB4jwd6>kGl7A+lk}k+uny5T; z;V$tfk!--j2JpMbYw!WOk(f*MegoI;g@W&Ljz-3Cw!GG@oNqO75x|90#MLBK7vGw< z8XCuj!r0D8+%Y>qJ`OXF3?jp74D~+clO6hdpPAyjR*udE)mHDh+2cxo>Pr(20jiicDgqBoqNdh7o%@6Q(GZIG1Kq!&c3&;hn8kiFyWa;B6Z|n!_*^ zTqeNy#@uY0;sY!|Mi>=kuZbAsR_8F}0d!jV|EC5YZ>y$}R|g zhNQ6!ci0Se?vi_XnoQ%J;{wnNGqN~1C%n^Nmp>aWr>mWNX^m^ITXj5>L0;o}_W8?2 z)%l!yzsCE#^Yz<>nNOx#070U_F-buf3V~#2Y}dx=X1T^KSt<`aJ~F~}$$A4P z*17@%Ls-@q>uFr9aPe5VWai1;OvhBE*xuG>S23CqP@{{`4v|%=P%@vW*rm$TgJod!h`1URGU*83syu@^*1 zqRdpTj{g?yA2#%Wb$JiniS|awreQuDn|;OMS{i^MT|&!)?sbp31E7R;a76H?wlq!$ zcz4~}&wmhf;&cAUDX%@G-*- z!)4!d13jCMRz(0=qomQICmCb1(a}6{4AC#qu`%3v3e4)DDt`?o6qDwlttDsBiDsY3 zNAX28`pd^NO_Y%{R4d$Tef;jSZ)9S literal 0 HcmV?d00001 diff --git a/tests/resources/userdiff/.gitted/objects/f3/be389d351e4bcc6dcc4b5fe22134ef0f63f8bd b/tests/resources/userdiff/.gitted/objects/f3/be389d351e4bcc6dcc4b5fe22134ef0f63f8bd new file mode 100644 index 0000000000000000000000000000000000000000..cfbef992da8d846c0d415bad157136287afd3e19 GIT binary patch literal 117 zcmV-*0E+*30V^p=O;s>7G-EI{FfcPQQAo?oN!80J$<1LPL;Zm?`P z>^Vc^H>I7FCw?!XvUny(S7_ZUyBTYbtxIQ-AOqF=x0abhUJ#lsXppH?r+S{rV3LJG zQ(mqvo;?bHI0A3ehMQlC(OsMjyoOuku!kZEN3xw{6YX*0hQ{u$-`r|JJLxMaa*36a zPy`G)MjV(-n4(zXT$)V-TQ$Fecdl9`>KVL-xBKwX9)_*pG6BZ7=4R6tA7BA;gi%rU zhKNBc`rdA7_(FdFuV)V(hvJZlvF=;Hv9WH~Nae6OL(`mAE zTmS}fP8JX6L~#1+@@K>6bd7U2t8wjis*Yze(lxGUpTAsGozJQFYrN0fU%y@0`DCjF z5Tyz{n-s(e{wS@b5J+~`c5R(*mTTOSrSibzBO_dwtT%AttSc}ugk^oPp4P<)7mt-o zW}n>6bWBx>?QL^*6{8&iHM)r15Lu-PCG|ulRt?;6n=B3E@oqn{>P&a~4z4T?01a7NLs_e1Dm5RKAQ*{NI||1H=%Y?uM-^B%er z-Hnh>W8ELxeZ}EA8h}1sLd%2hc8<9NpoDdBMDVt@G)`~v?z(fI{~(yeYeDwiuIEAM zlvZP`+|PZ=H4Lb>_D_nDpZUKL;6*Q7eXiU~&&Mm$hl3;E_Lpt9@<-ueE_iIS1-|?R D9c=MJ literal 2785 zcmb_eQE%He5Poic#jOvuop^HEhdspghHlG{3~dvv!GIwM3Pw6v%xF;~DSKY)|Gqm? zq@~6|_b?*}Z1VWs-FM#|IXgZA_@Gw^xh@d!Z)ZgAuz=F&6;#eO_G~s=N>{b_S*};J zhgL~ZE2X!^%;rWb^&75HsO-TK(x#Gm1(j$TtSvYV_Xq-Jm1>!bY1v`Mj?C5UoX1$g%|6HjOq8WKAgd6zr=b z!no{Z^UzucmebUw2j^_3v_e+4wGHNumZb&yt2HQHFVVnSC|M9vFYIvcz9nalD65^2 zlqlA^T~_2ztQv*T2Bd5JzmA(L%ez+NCeNO~3t#guF!eyTlE%aRFm?0Q6zNTuHJfybk$x6jm-! zE-N>>n|ezi4r|Ihy1gCw-(MQpkmue?Q^Cx&(G4269o_k$fNJboL+N(DUkC6B{Lpzh z>!O;I?;U5}&*Q2rEjk#Z>ZhUo>WywF#M2lvP*vIZEtZ_&Y3IJsUH+6+3FB|1eJ|b< zUY0;65t>;_t8lV_z7?FnOAe7gyGYXkKz4rs(MQ#X`$Pt!|`Nqiz<|k_5%!;H=|toCO>NDX!tM@Y<;pPB8zi@%LRCJ>S`y<)xW4B)jd%`G zm1NDcrBfvjH)%7Z_O-P0#u%~95^`pF4raMfYTR{d_E(E$`+*MRPMbHhF}f{;6W{h@ zyBkd=QBxj26=MOVP!iOV zLiy=2znb7-pU; z6eiMh!1xgEV>1e($8wk06keU4Cerp)byt%pit{xMs<+ZQq}yXW3ha;Qg6->K8kCrT zo;)6Cq2q%(43F=oL4UL3#sB%Ci`omWC!jC8J5)E^s!SjYwcpDtsF)nX^pk>4UUR2z|@yrt=Jq0S_BM?~Kmi1iCSw z3;A&a&+fT|A7YL|!tl0O`%cWa8h8lc!ztn#Csmcei3`Qfm=8r&Dbk{?hH>O#CFkCd zk10F=HHvbk1!%4x#(=~I1LcXBf^ne(KPgQw>__`f`l*pXLLSxx_vrMKcRr5@+ zNfvOWvvpPRY^MOC5WGzrY<|h(yC@lY4R=UEk9ZQqqLXA3 zz&Z&i0)`wTW+rKJQ5;b&&8C5^ir>J2t5wPM4Bo=~J@{l>Ve7X{fbgxj*|enxSb&Hz zDxJM?L?Fj&fV5f#i0xY`mihBo`m1B<*T+I2F>*54WH6A%Dt>cwb!jGo{3P^sGfcKdQnwA*OOnPect)@{lcy< zTP=VvmEhT=AWHCGr?n)4rk#~tTcw-j8I5GAJn;BP2-hX)4IDe^3JeTkSzoNDRdK|{ zwo=LLlcrg>sp?{T+w`s?v@4*77m-^ct5_k0n#jbmfd+1q$U$olGc{bH5vZK@b@VlE z9ZObuCBWth?ArW|ptw)aq_}bnonCR%)2sH`8YL&Kb)59Nuei|6taUPjwVY@Qzv9Ml z`UO90Rm_n81xJD8)3T32nkX?-j_-O=q+y6VO5b@uxf-!BPE%>Oa&`T;VfRDBELfjx z%2#4OjnrUd?TY3)Hvj{D2`wAl>mJbrKnZLAP{ZqN?B6ZkU3c#D34%$y7G%#^0lWmF zyR;f(r9I6l)sX4h+Mg(fe&*K(!;7A~`dqn}zK>U=5BrC{oi96X<&QqJVE4eOnOh!b IZGkWU0Cgz(*Z=?k literal 2812 zcmb_eQE%He5Pr|Exb>m76HgBMu!p4H&}|)(qHT&b7%&7y!AO+Fj21PLvX`~~@B5Av zWqL``JxmB3o4ot(?z@jCE{>0g-kY_g(o~YtE$Y3SHbeAZ;5}Hq?l&ldU6f=vI;-Z)IDlc15qmM!-pRo~-N) zZGlUor8k$?q*VzYn0w&(Mv_;^>XNp?(bm{M*x$4{MDL`nR9%znyUtioss+j|l6`gr zjLWQ=yWV+nT&Af5I9EHz3ani3I$3%wD@XWi4QbP^q@|6}ssd7$cJ#aL5zK?K)(eF~ zWo!CXgLq=yX-S>%UfM_ir(PT#FOJTqb>Eg=p@!*JwUyb<=o9BTK^^40Ri&St^TI}0 zs!aJ(%QY>*5!)76=-0CK;}_n>@8B^aucZG?$t|;SK~oMuco?wM3f90IkZ&e&Z!TW58b`H!PSCr>>Ro6~>no6Cg zXTs{W=@9xfVoPaGVCI1S+MjVa;P>5GKzp9F&{ zT5(^D$c5t(SCm5Q>2L^(KYMBK-@~Ew#=gMDt)6ijOJNf|j~G9O`_K$YWGoMb&FR_c zp0qtx!@EpW)yoYe_F6eF@w%B#BKs4(k#k+lqrOM>zvv!mf%`!p4&8V2sK3SW^8bAB zW)FhP1oZEj5xW~-!%QFxH6I%J*!V9;jPdwnJTmdazzC{i8?Q7E^zh{8t2aO4a>W`k nqLS4U^m4pC$&F7+9uyH(6JzkHklTZ>@kECSw40^N*ZI*u?cq~P diff --git a/tests/resources/userdiff/expected/driver/diff.javascript b/tests/resources/userdiff/expected/driver/diff.javascript index 4e65d074662535061295fe4f92462e2ac9a5152e..44ea9cf777118686c50098f6859f053c69141ca6 100644 GIT binary patch literal 862 zcmcJMPfvp|7{>4Y6mNEdKsy+JwuP8*P!r=09z2X=H_EJTfY42d@w;1EnQU>!iyRvI z^vV1D^1La}GQfDl1<-NEx2#qtd8P+iuPa^(SpBRco~Ntgy5(fTkj4Rfs~gB_q4yz!oeM za#)XUnD9OzYXHljVZ2fTncRJf^VqQ*b6f*i+}u7!x+5p-@LVVOl~1Rxi(IfqkhG$2 zYEy>FP#YpC71V|z%W5W;{ZC?pH?hH=*&0VzJiH`;K`!dc*01?rk_I8No{tE90;c`{ Au>b%7 literal 1343 zcmb7D$!^;)5Isj4*>AP8ugl3389LDEi_^xr!}Ew-~1 zEf0h=e0-dF^JXow48kxM7Fa(Mk{h>2-`Jj+REw>J)yr{DlxzMSR|Py__!y4zuB%#txzT8+skOr2HiKpT(fJ8M#=%csBNzY zznU5V+A#PFIEJ+q`~?F(#F$#Oe!C2lQ7{ERNrK5qhQg4RDC||)$WFNiP_*fy{MZn_ zMitO3N=p3nPx{pDwc-Qjxh*g0j0Em^k14m;?v%ENU-U{D=o+5f&$)Tx=tW-<;9 z{rLLcukRz0aSV(tr2^55WrC$y`HR?ya#6@!!Te{P$TY$VoN?gK2Sd*N!Pp&+hu}I+ z;CX~GcCI3^ZToE1$pn~3J+M7G0KJJYmML2CI$bE4rB;D&Ygr%#tn#c-C52TMtrP6R z2LXVMDBvDzxPqhRtx)}1b4`ZG|t)~8LWV^6e`znyn0vBYDSY@|*%B=&EMg#<`* zCpTy=<@$R4>#bUH^(;%C%LGdSzD&F$(Tn%2?|*pm#C(@ml=gYpMp1{Eo2+V;bsO5bktkh Q?nn8TP6ti&&^|-*1&;qHng9R* literal 1181 zcmb7DU2mH(6n!qg;_jshGZ08vK9psOCRNH_x;{*MsjA5#20S?!*-o-*I6Jxjt-oo2JgdW4WyS(i%)lW{Ntf@=!Pr3d!eQw5petTM2Gjm)kD+urt?%8K!# zG`+jP3mq1CRWXIQ14@*K+n)PwQFD*{11e}ynr>^sPROJwnYvN3X3E_6?&cnNR`YOT zH4mq_wweKW4*fS=U(@S86Oqhw&CC~B`#$_?wE}cyAPYE!bxQw&0Rjn1Xr4!>Bpn4) zAZZ#*PL$vTIXkco8o_IoLf|Wbf|;*auB9@ozTeFcP{s<8otS2JLEFdfqYXqL!Dr_R z{rQoR^%=)UX^h-DA`2&$wi~P^c>!>o(zA{w(vyWO<$;lq>p<7}T(ob~??I=q2q{Nos7OK=^!@mr~b0l=q<8%_oP$$$!RyadJe zj0zoqQM@Ra;#FaH+cU>)kQMsTe2qC|n0x#QbkyF3DY=epRY$p0S2Qd8`L4PL;Zm?`P z>^Vc^H>I7FCw?!XvUny(S7_ZUyBTYbtxIQ-AOqF=x0abhUJ#lsXppH?r+S{rV3LJG zQ(mqvo;?bHI0A3ehMQlC(OsMjyoOuku!kZEN3xw{6YX*0hQ{u$-`r|JJLxMaa*36a zPy`G)MjV(-n4(zXT$)V-TQ$Fecdl9`>KVL-xBKwX9)_*pG6BZ7=4R6tA7BA;gi%rU zhKNBc`rdA7_(FdFuV)V(hvJZlvF=;Hv9WH~Nae6OL(`mAE zTmS}fP8JX6L~#1+@@K>6bd7U2t8wjis*Yze(lxGUpTAsGozJQFYrN0fU%y@0`DCjF z5Tyz{n-s(e{wS@b5J+~`c5R(*mTTOSrSibzBO_dwtT%AttSc}ugk^oPp4P<)7mt-o zW}n>6bWBx>?QL^*6{8&iHM)r15Lu-PCG|ulRt?;6n=B3E@oqn{>P&a~4z4T?01a7NLs_e1Dm5RKAQ*{NI||1H=%Y?uM-^B%er z-Hnh>W8ELxeZ}EA8h}1sLd%2hc8<9NpoDdBMDVt@G)`~v?z(fI{~(yeYeDwiuIEAM zlvZP`+|PZ=H4Lb>_D_nDpZUKL;6*Q7eXiU~&&Mm$hl3;E_Lpt9@<-ueE_iIS1-|?R D9c=MJ literal 2785 zcmb_eQE%He5Poic#jOvuop^HEhdspghHlG{3~dvv!GIwM3Pw6v%xF;~DSKY)|Gqm? zq@~6|_b?*}Z1VWs-FM#|IXgZA_@Gw^xh@d!Z)ZgAuz=F&6;#eO_G~s=N>{b_S*};J zhgL~ZE2X!^%;rWb^&75HsO-TK(x#Gm1(j$TtSvYV_Xq-Jm1>!bY1v`Mj?C5UoX1$g%|6HjOq8WKAgd6zr=b z!no{Z^UzucmebUw2j^_3v_e+4wGHNumZb&yt2HQHFVVnSC|M9vFYIvcz9nalD65^2 zlqlA^T~_2ztQv*T2Bd5JzmA(L%ez+NCeNO~3t#guF!eyTlE%aRFm?0Q6zNTuHJfybk$x6jm-! zE-N>>n|ezi4r|Ihy1gCw-(MQpkmue?Q^Cx&(G4269o_k$fNJboL+N(DUkC6B{Lpzh z>!O;I?;U5}&*Q2rEjk#Z>ZhUo>WywF#M2lvP*vIZEtZ_&Y3IJsUH+6+3FB|1eJ|b< zUY0;65t>;_t8lV_z7?FnOAe7gyGYXkKz4rs(MQ#X`$Pt!|`Nqiz<|k_5%!;H=|toCO>NDX!tM@Y<;pPB8zi@%LRCJ>S`y<)xW4B)jd%`G zm1NDcrBfvjH)%7Z_O-P0#u%~95^`pF4raMfYTR{d_E(E$`+*MRPMbHhF}f{;6W{h@ zyBkd=QBxj26=MOVP!iOV zLiy=2znb7-pU; z6eiMh!1xgEV>1e($8wk06keU4Cerp)byt%pit{xMs<+ZQq}yXW3ha;Qg6->K8kCrT zo;)6Cq2q%(43F=oL4UL3#sB%Ci`omWC!jC8J5)E^s!SjYwcpDtsF)nX^pk>4UUR2z|@yrt= Date: Thu, 9 Oct 2014 22:21:34 +0200 Subject: [PATCH 2/2] Update the javascript diff driver's function pattern. --- src/userdiff.h | 6 +++--- .../userdiff/expected/driver/diff.javascript | Bin 862 -> 932 bytes 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/userdiff.h b/src/userdiff.h index 523f2f8d4..91c1f42dc 100644 --- a/src/userdiff.h +++ b/src/userdiff.h @@ -191,9 +191,9 @@ PATTERNS("php", "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"), PATTERNS("javascript", - "^[ \t]*(function[ \t][a-zA-Z_][^\\{]*)\n" - "^[ \t]*(var[ \t]+[a-zA-Z_][a-zA-Z0-9_]*[ \t]*=[ \t]*function[ \t\\(][^\\{]*)\n" - "^[ \t]*([a-zA-Z_][a-zA-Z0-9_]*[ \t]*:[ \t]*function[ \t\\(][^\\{]*)", + "([a-zA-Z_$][a-zA-Z0-9_$]*(\\.[a-zA-Z0-9_$]+)*[ \t]*=[ \t]*function([ \t][a-zA-Z_$][a-zA-Z0-9_$]*)?[^\\{]*)\n" + "([a-zA-Z_$][a-zA-Z0-9_$]*[ \t]*:[ \t]*function([ \t][a-zA-Z_$][a-zA-Z0-9_$]*)?[^\\{]*)\n" + "[^a-zA-Z0-9_\\$](function([ \t][a-zA-Z_$][a-zA-Z0-9_$]*)?[^\\{]*)", /* -- */ "[a-zA-Z_][a-zA-Z0-9_]*" "|[-+0-9.e]+[fFlL]?|0[xX]?[0-9a-fA-F]+[lL]?" diff --git a/tests/resources/userdiff/expected/driver/diff.javascript b/tests/resources/userdiff/expected/driver/diff.javascript index 44ea9cf777118686c50098f6859f053c69141ca6..4cefe5cff67766681c702c6f0cd0ee1d4f6084e8 100644 GIT binary patch delta 131 zcmcb|wuF7c0%e7?(!Au7%=|o!qSV6D%%W5sh180I{GyU#9fjQdl+v73&5a8T8I=Qa z5-U@S^a_gdOY%!93sUuR^UG303lwY-226g+*rS1=E~O~399dOzeqKpxMakq=rkeoY C1Tu2~ delta 26 hcmZ3&evfU!f{lj_87Jp4icgke>IBlVldmvc004`s3J(AP