diff options
| author | Johannes Sixt <j6t@kdbg.org> | 2021-10-08 19:09:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-08 20:04:07 (GMT) |
| commit | 3e063de46e6270606e058b96bfcc0baebc4aea81 (patch) | |
| tree | 414a5dff81f7d2a1e84d670b04d405d7a4219154 /t/t4034/cpp/expect | |
| parent | 1cf93847c1edf3128f3a2fd87db6a490470ce4ec (diff) | |
| download | git-3e063de46e6270606e058b96bfcc0baebc4aea81.zip git-3e063de46e6270606e058b96bfcc0baebc4aea81.tar.gz git-3e063de46e6270606e058b96bfcc0baebc4aea81.tar.bz2 | |
t4034: add tests showing problematic cpp tokenizations
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>
Diffstat (limited to 't/t4034/cpp/expect')
| -rw-r--r-- | t/t4034/cpp/expect | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/t/t4034/cpp/expect b/t/t4034/cpp/expect index 4197697..63e53a6 100644 --- a/t/t4034/cpp/expect +++ b/t/t4034/cpp/expect @@ -1,11 +1,25 @@ <BOLD>diff --git a/pre b/post<RESET> -<BOLD>index c5672a2..4229868 100644<RESET> +<BOLD>index 1229cdb..3feae6f 100644<RESET> <BOLD>--- a/pre<RESET> <BOLD>+++ b/post<RESET> -<CYAN>@@ -1,16 +1,16 @@<RESET> -Foo() : x(0<RED>&&1<RESET><GREEN>&42<RESET>) { <GREEN>bar(x);<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<GREEN>) (<RESET>-1e10<GREEN>) (<RESET>0xabcdef<GREEN>)<RESET> '<RED>x<RESET><GREEN>y<RESET>' +<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 |