undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

userdiff-cpp: permit the digit-separating single-quote in numbers

Browse Source 
Since C++17, the single-quote can be used as digit separator:

   3.141'592'654
   1'000'000
   0xdead'beaf

Make it known to the word regex of the cpp driver, so that numbers are
not split into separate tokens at the single-quotes.

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:03 +00:00 committed by Junio C Hamano
parent bfaaf191a5
commit 637b80cd6a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
t/t4034/cpp/expect
View File

@ -7,15 +7,15 @@ Foo() : x(0<RED>&&1<RESET><GREEN>&42<RESET>) { <RED>foo0<RESET><GREEN>bar<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>.<RESET>' <GREEN>(<RESET>1 <RED>-<RESET><GREEN>+<RESET>1e10 0xabcdef<GREEN>)<RESET> '<RED>x<RESET><GREEN>.<RESET>'
// long double<RESET> // long double<RESET>
3.141'592'<RED>653e-10l<RESET><GREEN>654e+10l<RESET> <RED>3.141'592'653e-10l<RESET><GREEN>3.141'592'654e+10l<RESET>
// float<RESET> // float<RESET>
<RED>120E5f<RESET><GREEN>120E6f<RESET> <RED>120E5f<RESET><GREEN>120E6f<RESET>
// hex<RESET> // hex<RESET>
0xdead'<RED>beaf<RESET><GREEN>Beaf<RESET>+<RED>8ULL<RESET><GREEN>7ULL<RESET> <RED>0xdead'beaf<RESET><GREEN>0xdead'Beaf<RESET>+<RED>8ULL<RESET><GREEN>7ULL<RESET>
// octal<RESET> // octal<RESET>
0123'<RED>4567<RESET><GREEN>4560<RESET> <RED>0123'4567<RESET><GREEN>0123'4560<RESET>
// binary<RESET> // binary<RESET>
<RED>0b10<RESET><GREEN>0b11<RESET>'00+e1 <RED>0b10'00<RESET><GREEN>0b11'00<RESET>+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>

6
userdiff.c
View File

@ -67,11 +67,11 @@ PATTERNS("cpp",
/* identifiers and keywords */ /* identifiers and keywords */
"[a-zA-Z_][a-zA-Z0-9_]*" "[a-zA-Z_][a-zA-Z0-9_]*"
/* decimal and octal integers as well as floatingpoint numbers */ /* decimal and octal integers as well as floatingpoint numbers */
"|[0-9][0-9.]*([Ee][-+]?[0-9]+)?[fFlLuU]*" "|[0-9][0-9.']*([Ee][-+]?[0-9]+)?[fFlLuU]*"
/* hexadecimal and binary integers */ /* hexadecimal and binary integers */
"|0[xXbB][0-9a-fA-F]+[lLuU]*" "|0[xXbB][0-9a-fA-F']+[lLuU]*"
/* floatingpoint numbers that begin with a decimal point */ /* floatingpoint numbers that begin with a decimal point */
"|\\.[0-9]+([Ee][-+]?[0-9]+)?[fFlL]?" "|\\.[0-9][0-9']*([Ee][-+]?[0-9]+)?[fFlL]?"
"|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->\\*?|\\.\\*"), "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->\\*?|\\.\\*"),
PATTERNS("csharp", PATTERNS("csharp",
/* Keywords */ /* Keywords */