mirror of
https://github.com/git/git.git
synced 2024-05-07 19:46:08 +02:00
c4fdba3383
Since C++20, the language has a generalized comparison operator <=>. Teach the cpp driver not to separate it into <= and > tokens. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
36 lines
2.1 KiB
Plaintext
36 lines
2.1 KiB
Plaintext
<BOLD>diff --git a/pre b/post<RESET>
|
|
<BOLD>index 144cd98..64e78af 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>find<RESET><GREEN>Find<RESET>); }
|
|
cout<<"Hello World<RED>!<RESET><GREEN>?<RESET>\n"<<endl;
|
|
<GREEN>(<RESET>1 <RED>-<RESET><GREEN>+<RESET>1e10 0xabcdef<GREEN>)<RESET> '<RED>x<RESET><GREEN>.<RESET>'
|
|
// long double<RESET>
|
|
<RED>3.141'592'653e-10l<RESET><GREEN>3.141'592'654e+10l<RESET>
|
|
// float<RESET>
|
|
<RED>120E5f<RESET><GREEN>120E6f<RESET>
|
|
// hex<RESET>
|
|
<RED>0xdead'beaf<RESET><GREEN>0xdead'Beaf<RESET>+<RED>8ULL<RESET><GREEN>7ULL<RESET>
|
|
// octal<RESET>
|
|
<RED>0123'4567<RESET><GREEN>0123'4560<RESET>
|
|
// binary<RESET>
|
|
<RED>0b10'00<RESET><GREEN>0b11'00<RESET>+e1
|
|
// expression<RESET>
|
|
1.5-e+<RED>2<RESET><GREEN>3<RESET>+f
|
|
// another one<RESET>
|
|
str.e+<RED>65<RESET><GREEN>75<RESET>
|
|
[a] b<RED>-><RESET><GREEN>->*<RESET>v d<RED>.<RESET><GREEN>.*<RESET>e
|
|
<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 i<RED><=<RESET><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 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 e<RED>-=<RESET><GREEN>-<RESET>f 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
|