userdiff-cpp: prepare test cases with yet unsupported features

We are going to add support for C++'s digit-separating single-quote and
the spaceship operator. By adding the test cases in this separate
commit, the effect on the word highlighting will become more obvious
as the features are implemented and the file cpp/expect is updated.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Sixt 2021-10-10 17:03:02 +00:00 committed by Junio C Hamano
parent 350b87cd65
commit bfaaf191a5
3 changed files with 18 additions and 18 deletions

View File

@ -1,21 +1,21 @@
<BOLD>diff --git a/pre b/post<RESET> <BOLD>diff --git a/pre b/post<RESET>
<BOLD>index 1229cdb..3feae6f 100644<RESET> <BOLD>index 144cd98..64e78af 100644<RESET>
<BOLD>--- a/pre<RESET> <BOLD>--- a/pre<RESET>
<BOLD>+++ b/post<RESET> <BOLD>+++ b/post<RESET>
<CYAN>@@ -1,30 +1,30 @@<RESET> <CYAN>@@ -1,30 +1,30 @@<RESET>
Foo() : x(0<RED>&&1<RESET><GREEN>&42<RESET>) { <RED>foo0<RESET><GREEN>bar<RESET>(x.<RED>find<RESET><GREEN>Find<RESET>); } Foo() : x(0<RED>&&1<RESET><GREEN>&42<RESET>) { <RED>foo0<RESET><GREEN>bar<RESET>(x.<RED>find<RESET><GREEN>Find<RESET>); }
cout<<"Hello World<RED>!<RESET><GREEN>?<RESET>\n"<<endl; cout<<"Hello World<RED>!<RESET><GREEN>?<RESET>\n"<<endl;
<GREEN>(<RESET>1 <RED>-<RESET><GREEN>+<RESET>1e10 0xabcdef<GREEN>)<RESET> '<RED>x<RESET><GREEN>y<RESET>' <GREEN>(<RESET>1 <RED>-<RESET><GREEN>+<RESET>1e10 0xabcdef<GREEN>)<RESET> '<RED>x<RESET><GREEN>.<RESET>'
// long double<RESET> // long double<RESET>
<RED>3.141592653e-10l<RESET><GREEN>3.141592654e+10l<RESET> 3.141'592'<RED>653e-10l<RESET><GREEN>654e+10l<RESET>
// float<RESET> // float<RESET>
<RED>120E5f<RESET><GREEN>120E6f<RESET> <RED>120E5f<RESET><GREEN>120E6f<RESET>
// hex<RESET> // hex<RESET>
<RED>0xdeadbeaf<RESET><GREEN>0xdeadBeaf<RESET>+<RED>8ULL<RESET><GREEN>7ULL<RESET> 0xdead'<RED>beaf<RESET><GREEN>Beaf<RESET>+<RED>8ULL<RESET><GREEN>7ULL<RESET>
// octal<RESET> // octal<RESET>
<RED>01234567<RESET><GREEN>01234560<RESET> 0123'<RED>4567<RESET><GREEN>4560<RESET>
// binary<RESET> // binary<RESET>
<RED>0b1000<RESET><GREEN>0b1100<RESET>+e1 <RED>0b10<RESET><GREEN>0b11<RESET>'00+e1
// expression<RESET> // expression<RESET>
1.5-e+<RED>2<RESET><GREEN>3<RESET>+f 1.5-e+<RED>2<RESET><GREEN>3<RESET>+f
// another one<RESET> // another one<RESET>
@ -25,7 +25,7 @@ str.e+<RED>65<RESET><GREEN>75<RESET>
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 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 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 e<RED>><RESET><GREEN>>=<RESET>f g<RED>>=<RESET><GREEN>><RESET>h i<=<GREEN>><RESET>j
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 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<RED>||<RESET><GREEN>|<RESET>b

View File

@ -1,16 +1,16 @@
Foo() : x(0&42) { bar(x.Find); } Foo() : x(0&42) { bar(x.Find); }
cout<<"Hello World?\n"<<endl; cout<<"Hello World?\n"<<endl;
(1 +1e10 0xabcdef) 'y' (1 +1e10 0xabcdef) '.'
// long double // long double
3.141592654e+10l 3.141'592'654e+10l
// float // float
120E6f 120E6f
// hex // hex
0xdeadBeaf+7ULL 0xdead'Beaf+7ULL
// octal // octal
01234560 0123'4560
// binary // binary
0b1100+e1 0b11'00+e1
// expression // expression
1.5-e+3+f 1.5-e+3+f
// another one // another one
@ -20,7 +20,7 @@ str.e+75
a*=b c/=d e%=f a*=b c/=d e%=f
a++b c--d a++b c--d
a<<=b c>>=d a<<=b c>>=d
a<=b c<d e>=f g>h a<=b c<d e>=f g>h i<=>j
a!=b c=d a!=b c=d
a^=b c|=d e&=f a^=b c|=d e&=f
a|b a|b

View File

@ -2,15 +2,15 @@ Foo():x(0&&1){ foo0( x.find); }
cout<<"Hello World!\n"<<endl; cout<<"Hello World!\n"<<endl;
1 -1e10 0xabcdef 'x' 1 -1e10 0xabcdef 'x'
// long double // long double
3.141592653e-10l 3.141'592'653e-10l
// float // float
120E5f 120E5f
// hex // hex
0xdeadbeaf+8ULL 0xdead'beaf+8ULL
// octal // octal
01234567 0123'4567
// binary // binary
0b1000+e1 0b10'00+e1
// expression // expression
1.5-e+2+f 1.5-e+2+f
// another one // another one
@ -20,7 +20,7 @@ str.e+65
a*b c/d e%f a*b c/d e%f
a+b c-d a+b c-d
a<<b c>>d a<<b c>>d
a<b c<=d e>f g>=h a<b c<=d e>f g>=h i<=j
a==b c!=d a==b c!=d
a^b c|d e&&f a^b c|d e&&f
a||b a||b