diff options
| author | Johannes Sixt <j6t@kdbg.org> | 2021-10-10 17:03:04 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-10 15:24:21 -0700 |
| commit | c4fdba338355d80e40b84391af9f8c022d4f21af (patch) | |
| tree | de9dcbd5a9df019265ee907fb7ebbc385f4016d7 /userdiff.c | |
| parent | 637b80cd6a2a73eb6723aec2f52aed1135d99de4 (diff) | |
| download | git-c4fdba338355d80e40b84391af9f8c022d4f21af.tar.gz | |
userdiff-cpp: learn the C++ spaceship operator
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>
Diffstat (limited to 'userdiff.c')
| -rw-r--r-- | userdiff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/userdiff.c b/userdiff.c index c1084650dd..7b143ef36b 100644 --- a/userdiff.c +++ b/userdiff.c @@ -72,7 +72,7 @@ PATTERNS("cpp", "|0[xXbB][0-9a-fA-F']+[lLuU]*" /* floatingpoint numbers that begin with a decimal point */ "|\\.[0-9][0-9']*([Ee][-+]?[0-9]+)?[fFlL]?" - "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->\\*?|\\.\\*"), + "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->\\*?|\\.\\*|<=>"), PATTERNS("csharp", /* Keywords */ "!^[ \t]*(do|while|for|if|else|instanceof|new|return|switch|case|throw|catch|using)\n" |