3e063de46e
The word regex is too loose and matches long streaks of characters that should actually be separate tokens. Add these problematic test cases. Separate the lines with text that will remain identical in the pre- and post-image so that the diff algorithm will not lump removals and additions of consecutive lines together. This makes the expected output easier to read. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
36 lines
2.0 KiB
Plaintext
36 lines
2.0 KiB
Plaintext
<BOLD>diff --git a/pre b/post<RESET>
|
|
<BOLD>index 1229cdb..3feae6f 100644<RESET>
|
|
<BOLD>--- a/pre<RESET>
|
|
<BOLD>+++ b/post<RESET>
|
|
<CYAN>@@ -1,30 +1,30 @@<RESET>
|
|
Foo() : x(0<RED>&&1<RESET><GREEN>&42<RESET>) { <RED>foo0<RESET><GREEN>bar<RESET>(x<RED>.f<RESET><GREEN>.F<RESET>ind); }
|
|
cout<<"Hello World<RED>!<RESET><GREEN>?<RESET>\n"<<endl;
|
|
<GREEN>(<RESET>1 <RED>-1e10<RESET><GREEN>+1e10<RESET> 0xabcdef<GREEN>)<RESET> '<RED>x<RESET><GREEN>y<RESET>'
|
|
// long double<RESET>
|
|
<RED>3.141592653e-10l<RESET><GREEN>3.141592654e+10l<RESET>
|
|
// float<RESET>
|
|
120<RED>E5f<RESET><GREEN>E6f<RESET>
|
|
// hex<RESET>
|
|
<RED>0xdeadbeaf+8<RESET><GREEN>0xdeadBeaf+7<RESET>ULL
|
|
// octal<RESET>
|
|
<RED>01234567<RESET><GREEN>01234560<RESET>
|
|
// binary<RESET>
|
|
<RED>0b1000<RESET><GREEN>0b1100<RESET>+e1
|
|
// expression<RESET>
|
|
<RED>1.5-e+2+f<RESET><GREEN>1.5-e+3+f<RESET>
|
|
// another one<RESET>
|
|
str<RED>.e+65<RESET><GREEN>.e+75<RESET>
|
|
[a] b<RED>-><RESET><GREEN>->*<RESET>v d<RED>.e<RESET><GREEN>.*e<RESET>
|
|
<GREEN>~<RESET>!a <GREEN>!<RESET>~b c<RED>++<RESET><GREEN>+<RESET> d<RED>--<RESET><GREEN>-<RESET> e*<GREEN>*<RESET>f g<RED>&<RESET><GREEN>&&<RESET>h
|
|
a<RED>*<RESET><GREEN>*=<RESET>b c<RED>/<RESET><GREEN>/=<RESET>d e<RED>%<RESET><GREEN>%=<RESET>f
|
|
a<RED>+<RESET><GREEN>++<RESET>b c<RED>-<RESET><GREEN>--<RESET>d
|
|
a<RED><<<RESET><GREEN><<=<RESET>b c<RED>>><RESET><GREEN>>>=<RESET>d
|
|
a<RED><<RESET><GREEN><=<RESET>b c<RED><=<RESET><GREEN><<RESET>d e<RED>><RESET><GREEN>>=<RESET>f g<RED>>=<RESET><GREEN>><RESET>h
|
|
a<RED>==<RESET><GREEN>!=<RESET>b c<RED>!=<RESET><GREEN>=<RESET>d
|
|
a<RED>^<RESET><GREEN>^=<RESET>b c<RED>|<RESET><GREEN>|=<RESET>d e<RED>&&<RESET><GREEN>&=<RESET>f
|
|
a<RED>||<RESET><GREEN>|<RESET>b
|
|
a?<GREEN>:<RESET>b
|
|
a<RED>=<RESET><GREEN>==<RESET>b c<RED>+=<RESET><GREEN>+<RESET>d <RED>e-=f<RESET><GREEN>e-f<RESET> g<RED>*=<RESET><GREEN>*<RESET>h i<RED>/=<RESET><GREEN>/<RESET>j k<RED>%=<RESET><GREEN>%<RESET>l m<RED><<=<RESET><GREEN><<<RESET>n o<RED>>>=<RESET><GREEN>>><RESET>p q<RED>&=<RESET><GREEN>&<RESET>r s<RED>^=<RESET><GREEN>^<RESET>t u<RED>|=<RESET><GREEN>|<RESET>v
|
|
a,b<RESET>
|
|
a<RED>::<RESET><GREEN>:<RESET>b
|