From daebb598690c47600cf033be77acaad1ae8c4a70 Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Mon, 27 Jan 2014 14:57:03 -0800 Subject: [PATCH] Add PHP tests and fix bug in PHP builtin driver --- src/userdiff.h | 2 +- tests/resources/userdiff/.gitted/index | Bin 912 -> 1336 bytes tests/resources/userdiff/.gitted/info/refs | Bin 59 -> 59 bytes .../userdiff/.gitted/objects/info/packs | Bin 54 -> 54 bytes ...f78c35e3ca74fffd9d6c2b6dcd60d6ab6a614a.idx | Bin 2192 -> 0 bytes ...52578900ac63564f2a24b9714529821276ceb9.idx | Bin 0 -> 2500 bytes ...578900ac63564f2a24b9714529821276ceb9.pack} | Bin 5697 -> 7102 bytes tests/resources/userdiff/.gitted/packed-refs | Bin 98 -> 98 bytes .../userdiff/.gitted/refs/dummy-marker.txt | Bin tests/resources/userdiff/after/file.php | Bin 0 -> 1338 bytes tests/resources/userdiff/before/file.php | Bin 0 -> 1310 bytes .../userdiff/expected/driver/diff.php | Bin 0 -> 1011 bytes .../userdiff/expected/nodriver/diff.php | Bin 0 -> 950 bytes tests/resources/userdiff/files/file.php | Bin 0 -> 1338 bytes 14 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 tests/resources/userdiff/.gitted/objects/pack/pack-03f78c35e3ca74fffd9d6c2b6dcd60d6ab6a614a.idx create mode 100644 tests/resources/userdiff/.gitted/objects/pack/pack-1652578900ac63564f2a24b9714529821276ceb9.idx rename tests/resources/userdiff/.gitted/objects/pack/{pack-03f78c35e3ca74fffd9d6c2b6dcd60d6ab6a614a.pack => pack-1652578900ac63564f2a24b9714529821276ceb9.pack} (56%) create mode 100644 tests/resources/userdiff/.gitted/refs/dummy-marker.txt create mode 100644 tests/resources/userdiff/after/file.php create mode 100644 tests/resources/userdiff/before/file.php create mode 100644 tests/resources/userdiff/expected/driver/diff.php create mode 100644 tests/resources/userdiff/expected/nodriver/diff.php create mode 100644 tests/resources/userdiff/files/file.php diff --git a/src/userdiff.h b/src/userdiff.h index 2257035ac..9318b5476 100644 --- a/src/userdiff.h +++ b/src/userdiff.h @@ -186,7 +186,7 @@ PATTERNS("csharp", "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"), PATTERNS("php", - "^[ \t]*((public|private|protected|static|final)[ \t]+)*((class|function)[ \t].*)$", + "^[ \t]*(((public|private|protected|static|final)[ \t]+)*((class|function)[ \t].*))$", /* -- */ "[a-zA-Z_][a-zA-Z0-9_]*" "|[-+0-9.e]+[fFlL]?|0[xX]?[0-9a-fA-F]+[lL]?" diff --git a/tests/resources/userdiff/.gitted/index b/tests/resources/userdiff/.gitted/index index df041cf72ffbe78022a7b77cdef8226d064d9171..b69d5cfb169871c97c93f562deb25d9580880f5e 100644 GIT binary patch delta 470 zcmbQhzJrU$#WTp6fq{Vui1{b-tn_~NND#DQ zSgoejrlg%pJ=EA9{C6GGbb}S&RxnRu;7d#^NiEV(%gjmDE66CAxM8i&vptLu=di0?9s0yJXdv3Hv@lCYFd6#D%`xuk&JsnpFKJNG6?8C zFby%#*96r-=Figww{Cv}Ut3o#vzd-iAo)MPLXHCYQgD;=^3lu& znF$1wFEg!733~SMD2M~2p`jauY6mO!;NSy=YcV`DK;{&5w&kpSBbz_@w7p616q`G* HikKn+KIV{Y delta 57 zcmdnNHG!SS#WTp6fq{Vuh`A>6tenisxMK2O#vPM+nGa0XWmzt=pu_%vw(R!h>7v2c NAI@Z(D7a*)5dhhd6IK8K diff --git a/tests/resources/userdiff/.gitted/info/refs b/tests/resources/userdiff/.gitted/info/refs index 261695f80d7283e93499ac68a2943dba7c42fc2e..b0743141df0eba528a297b88a790ad5f527bc190 100644 GIT binary patch literal 59 zcmXprNHtC~PckwwNi;P!FikZ|woFSjNli0IwXif#Gfpxz0TLD|DV#;AX~p^(sfj7Y M`nie4C8<{9 literal 59 zcmV~$!4be92n4`)(u|ti04WC%#*ZJd|H-b@hhLb~)*}o=gFa#E25ATetEwUV+8$Y^ L>&UV+kMH{j=rIwq diff --git a/tests/resources/userdiff/.gitted/objects/info/packs b/tests/resources/userdiff/.gitted/objects/info/packs index 6970fd7b0116e62a6db0752767b061bafcb642a1..0c5fc2a30bd433b5dcfa3a3e60b63d7f5c367d4d 100644 GIT binary patch literal 54 zcmWGgC`e4s)-^OUH8M4~urx48Og1w%H8V*wN;EP_vNSg|F*UNZFfueUH%m@UveW~q H=HdbXeaa2U literal 54 zcmWGgC`e4s)-^CrGq*@KHcd57PBb@3OG`_!OfgF~N-|4HPBAk`F-uG`OEfbyNz?ToEoCWSh;bx<8tQLCf&qVQ2kh1*`ErDc9AG;kSjr$vg zBsbIro?HB8@u`+&wIeQ6%QW`O2_r27CFb(dE_KcBT%;sCBkGBDSiko0TS|M6DB{&& zv!vWV8;X<=uJQOk_63KJXy)X04ZQIlL6fxEhC(BJ$55xZ8?Vd3rJqKr39QFF8VTIy zt7gvi*X*3gZnCm>)wdLJ`KC;t_z~k`87q9~&VDss)SL??=Xzg?#+uaO!CrB@A8QSX zOATmdG6*Y`G%}`WX>JxvZwqi1?l!>^rpejtEE0JEww0x6W9qohD~-DMQeOfl{F$zh z<20P9db8hly9>zt_)Qy_>VtXj8iLFeetj?0+W;4!YPm znH>7#^JY`IO9un*K5S}C^*+#2n^!Q{oASNPL%L;rp(D~nV`nVUra`W9!Ywo?G5A&- zjTv2VYbs$!k4WJl&%avYATVr?tgKUHUrjXEVXU?yojAIU<$0se->bSUbMaB9d1& z&aJKGiNZ$%Tqx0wwOVQ_$^=8Zzw2uF$-Al?Gw{mgRr2|cs_2eFzv{b%ZDt+2R#HNq zALpj5cXuCuOirhj4Vi?|L&Jg}xZ0oOI7|rNV>3JMy)C*>CCJ-)mxx{N8jCe=6K!QQ z8Sjy^Kc_-xI!SV_sJ9FRbv?^?_e#n_Q4~>*shW5zNsp7{B8!p zd9SPK&ByR6Z-Tg}g*a-3czFtE9z-q;{@dl?lOU=h0eJVx`9e&k!n_Zh>mmADKu<2fa0lcoCLJPm8SJ9KM?)R*5z9v)6ea-3J4`ir$hrk2h-~m`ouH4yZ(6}8K^e>( z1HB(+`rw{YsG;wPeG+ZgcRQjhEsLuS%-bJqM2nW5Xxg1i4>&Rz9W_c!IxJ D#Jn9@ diff --git a/tests/resources/userdiff/.gitted/objects/pack/pack-1652578900ac63564f2a24b9714529821276ceb9.idx b/tests/resources/userdiff/.gitted/objects/pack/pack-1652578900ac63564f2a24b9714529821276ceb9.idx new file mode 100644 index 0000000000000000000000000000000000000000..6f4381cc71d74b46cc055ed8585ea6e07d58c179 GIT binary patch literal 2500 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 P!;J?Obst>u;k^U^A}cl0 diff --git a/tests/resources/userdiff/.gitted/packed-refs b/tests/resources/userdiff/.gitted/packed-refs index 6d24ee4ed87cf77b89a62132830eb862131457d6..802f67ce0e182d91a06726faa7f5982db6c5a56a 100644 GIT binary patch delta 64 zcmYdFnxJlNW{_%}W}akZVv=ZTY+#ydlx&%nXp)*{kZNIRo@Sh6XaXcGQc@I(Qqzj{ RGg1>%iuH37i%U|AxBzC%6V?C# delta 64 zcmV~$u@QhU2nEpIDeNqh=s&=78X#~sHi?5cvhSIF+a-1911_~$rh}-{DNN>&hGej+ SIx^M~Im;c|XL)qKF_s@xmlJ>h diff --git a/tests/resources/userdiff/.gitted/refs/dummy-marker.txt b/tests/resources/userdiff/.gitted/refs/dummy-marker.txt new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/tests/resources/userdiff/after/file.php b/tests/resources/userdiff/after/file.php new file mode 100644 index 0000000000000000000000000000000000000000..967d6466ca65c2818753fdae029730a8f6a80392 GIT binary patch literal 1338 zcmbtUO>fgc5Iy5xF-S&rK1$&n2oeZ5ArJ_0XsT$t8ON*IyJkO{R4D(wGhWAboN|FZ zM7A^Y=Dj!1e)Fy_>Lk&kLRSlk@JZaET_nlXbeg~vzFD(>fZSLxzCa6G)M$k_*3H2i zu;_!;V08HaL95>Z;a-#h-Anjo?45(1@&)5Gu&d9xlCmyai#cc*rIsycrj6 zOC=!>T6$$Ptk=?L=WUQa>!=N=%pvWElNvgaH(#Z`Q0{Ws@uq2G5reWGhwBD+Gk6{O zA0o$QLEJcn55mg=gx;`Ev@TJW{h~n9t%KX(|Guq;G4Fu!>ND|M^jRuASxYE5*4JjB zl}T37yg~W==q;Jc@c%}ib3{PfP@(q!rzY~_#M9b3$g!$ak^iqEWu~oi$et_b*owH& zHayoUL)}a!gOzi`lU2i{aS@+Gbf2y^W{hEx!^w=-!J%DqBG)mi@pl|9lEic-C(?Qq zJTFzV+36G3MtYYNxG1fU-B=X^_`;eUXxzc->pj}MG`o*`i8a3}nX9eRKF=<`h`p*p z#i8R@5=;&+HgqRsL9a3I(@-RHr8i1%L7aR(E{OgalQuuhfKPAR0d|Ed5i+G)Z&LED egBb6r*Z$;+u5ZW&>Tf>6ldj literal 0 HcmV?d00001 diff --git a/tests/resources/userdiff/before/file.php b/tests/resources/userdiff/before/file.php new file mode 100644 index 0000000000000000000000000000000000000000..63250ad0197d0103425d2123488f2c139d25bc8b GIT binary patch literal 1310 zcmbtUO>fgc5WV|X43bgpG^N}NK>`6M1VTa_nkw3^$MLGpuGx<|5z2pO#_QOQTQ0B% z%j=zw_ujnqn|DpsB#9O~bd8V*pTq;&nD2)ZIzXN{(?)ua$%{Xz7*Fu-QnX zowq^yY``$-xrB7=La=E?fc%#FO1Z1m0Fb)P(N4m~Ivh9dBKBj%*G++w7VtrMS%J_6 zi$OCHbv;f4ByAns2mkkxbZA*5cq_W#Ew;$vIW$cB=0R;q;Tg>sIm$KmxxxlK9sF3%_9WnRxlOcnAm z+?*um`^uUYG`6t*`iQoyP5W^#vEf^ixyCB(%k1Kd*sERGvFG^Ofhpl-K|3KUx~e=* zLyjz!E|lJaIQvCh5c;V31W9inM!;)S@d$0DYJ^PbUYe9-8%oT_Hd23fVz+m6JA<*UIbiJ^aw@1`H zOH6dK1L6L~*=p`39(sDOp{cn}ZcaMab=tHG60h-N)J;5IIISGrp!=^95M(3sbI+CM zt1JbSZ~eo8zCwnZCJF^^siVMZZ(Ayi9wDA)ow+lWj>Wwl&LDcrwWcN-{f}q+yRUX1 z$M7^Ah2Qb2Y@UP{_2YSVHkW-Xxu~nC50p5P(rT(oA6z-)JIt3sI8;v@pCQlKyorz_ zG|R}p^2i~Fn-`KPBF}mXX)bj^4wv9u>m_Hy)Jh&e&;#6kf24{v^6=$IXy@-=q&vlh zVbRq$eB`ZdK@Ha)B!hRATVYbWAL77GEv*6OeoQX*fMG}k9&uyom4jVaao7JJ`*tVG literal 0 HcmV?d00001 diff --git a/tests/resources/userdiff/expected/nodriver/diff.php b/tests/resources/userdiff/expected/nodriver/diff.php new file mode 100644 index 0000000000000000000000000000000000000000..e77c094aaf7d77c0eb67b3615ce0d56a0cad0f01 GIT binary patch literal 950 zcmah|U2mH(6n!4Q;#Q(6kwXe0qnn~teW~^|P1@9_c8XlM4wk^C{%A5){qM7ZCNxN^ zAFjFPaPPV2n36LFalGXQ=q2Md>MkzYs)fgsgMfMHb}6tu24R-@W5D~e5TQ6Eo5pF_uS z=60&Kwn1UEGxN~jKZKl+kstoZj~sHio|@xlJs2{EI@5Z?kJe3e@pw}yxdVYac=-8@ ziq&#=yDzXcT#87yiVMS{iyw5)8{2^DZ!Sm%=cUVNQMo(4 literal 0 HcmV?d00001 diff --git a/tests/resources/userdiff/files/file.php b/tests/resources/userdiff/files/file.php new file mode 100644 index 0000000000000000000000000000000000000000..967d6466ca65c2818753fdae029730a8f6a80392 GIT binary patch literal 1338 zcmbtUO>fgc5Iy5xF-S&rK1$&n2oeZ5ArJ_0XsT$t8ON*IyJkO{R4D(wGhWAboN|FZ zM7A^Y=Dj!1e)Fy_>Lk&kLRSlk@JZaET_nlXbeg~vzFD(>fZSLxzCa6G)M$k_*3H2i zu;_!;V08HaL95>Z;a-#h-Anjo?45(1@&)5Gu&d9xlCmyai#cc*rIsycrj6 zOC=!>T6$$Ptk=?L=WUQa>!=N=%pvWElNvgaH(#Z`Q0{Ws@uq2G5reWGhwBD+Gk6{O zA0o$QLEJcn55mg=gx;`Ev@TJW{h~n9t%KX(|Guq;G4Fu!>ND|M^jRuASxYE5*4JjB zl}T37yg~W==q;Jc@c%}ib3{PfP@(q!rzY~_#M9b3$g!$ak^iqEWu~oi$et_b*owH& zHayoUL)}a!gOzi`lU2i{aS@+Gbf2y^W{hEx!^w=-!J%DqBG)mi@pl|9lEic-C(?Qq zJTFzV+36G3MtYYNxG1fU-B=X^_`;eUXxzc->pj}MG`o*`i8a3}nX9eRKF=<`h`p*p z#i8R@5=;&+HgqRsL9a3I(@-RHr8i1%L7aR(E{OgalQuuhfKPAR0d|Ed5i+G)Z&LED egBb6r*Z$;+u5ZW&>Tf>6ldj literal 0 HcmV?d00001