phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into pmd/7.0.x

Browse Source
This commit is contained in:
Andreas Dangel
2020-12-11 19:48:54 +01:00
parent 10a2b40731 1a4ca95f6c
commit 384d32ddd0
44 changed files with 754 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pmd-cpp/etc/grammar/Cpp.jj
View File

@ -193,12 +193,14 @@ TOKEN :
TOKEN:
{
< #DECIMALDIGIT: ["0"-"9"] >
< #BINARYDIGIT: ["0"-"1"] >
| < #OCTALDIGIT: ["0"-"7"] >
| < #DECIMALDIGIT: ["0"-"9"] >
| < #HEXDIGIT: ["a"-"f", "A"-"F", "0"-"9"] >
| < #INT_SUFFIX: ["u", "U", "l", "L"] | "uL" | "Ul" | "UL" | "ul" | "lu" | "Lu" | "lU" | "LU" >
| < ZERO: "0" >
| < BINARY_INT_LITERAL: "0" ["b", "B"] ("'" | <BINARYDIGIT>)+ (<INT_SUFFIX>)? >
| < OCTAL_INT_LITERAL: "0" ("'" | <OCTALDIGIT>)+ (<INT_SUFFIX>)? >
| < DECIMAL_INT_LITERAL: ["1"-"9"] ("'" | <DECIMALDIGIT>)* (<INT_SUFFIX>)? >
| < HEXADECIMAL_INT_LITERAL: "0" ["x", "X"] <HEXDIGIT> ("'" | <HEXDIGIT>)+ (<INT_SUFFIX>)? >

3
pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/literals.cpp vendored
View File

@ -37,4 +37,7 @@
auto hex_literal = 0x0F00'abcd'6f3d;
auto silly_example = 1'0'0'000'00;
// boolean literals
int b1 = 0B001101; // C++ 14 binary literal
int b2 = 0b000001; // C++ 14 binary literal
}

14
pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/literals.txt vendored
View File

@ -118,6 +118,18 @@ L38
[=] 24 25
[1'0'0'000'00] 26 38
[;] 38 39
L40
L41
[int] 5 8
[b1] 9 11
[=] 12 13
[0B001101] 14 22
[;] 22 23
L42
[int] 5 8
[b2] 9 11
[=] 12 13
[0b000001] 14 22
[;] 22 23
L43
[}] 1 2
EOF