hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

Merge branch 'pr-1819'

Browse Source
This commit is contained in:
Andreas Dangel
2019-05-12 19:27:02 +02:00
parent 465b303f3c 615ebb6fe3
commit 7d276f81ee
3 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pmd-cpp/etc/grammar/cpp.jj
View File

@ -284,27 +284,31 @@ TOKEN :
TOKEN [IGNORE_CASE] :
{
< OCTALINT : "0" (["0"-"7"])* >
< OCTALINT : "0" (["'", "0"-"7"])* >
| < OCTALLONG : <OCTALINT> "l" >
| < UNSIGNED_OCTALINT : <OCTALINT> "u" >
| < UNSIGNED_OCTALLONG : <OCTALINT> ("ul" | "lu") >
| < DECIMALINT : ["1"-"9"] (["0"-"9"])* >
| < #DECIMALDIGIT : ["'", "0"-"9"] >
| < DECIMALINT : ["1"-"9"] (<DECIMALDIGIT>)* >
| < DECIMALLONG : <DECIMALINT> ["u","l"] >
| < UNSIGNED_DECIMALINT : <DECIMALINT> "u" >
| < UNSIGNED_DECIMALLONG : <DECIMALINT> ("ul" | "lu") >
| < HEXADECIMALINT : "0x" (["0"-"9","a"-"f"])+ >
| < HEXADECIMALINT : "0x" (<DECIMALDIGIT> | ["a"-"f"])+ >
| < HEXADECIMALLONG : <HEXADECIMALINT> (["u","l"])? >
| < UNSIGNED_HEXADECIMALINT : <HEXADECIMALINT> "u" >
| < UNSIGNED_HEXADECIMALLONG : <HEXADECIMALINT> ("ul" | "lu") >
| < FLOATONE : ((["0"-"9"])+ "." (["0"-"9"])* | (["0"-"9"])* "." (["0"-"9"])+)
("e" (["-","+"])? (["0"-"9"])+)? (["f","l"])? >
| < FLOATONE : (["0"-"9"](<DECIMALDIGIT>)* "."
| "." (<DECIMALDIGIT>)+
| ["0"-"9"](<DECIMALDIGIT>)* "." (<DECIMALDIGIT>)+)
("e" (["-","+"])? (<DECIMALDIGIT>)+)? (["f","l"])? >
| < FLOATTWO : (["0"-"9"])+ "e" (["-","+"])? (["0"-"9"])+ (["f","l"])? >
| < FLOATTWO : ["0"-"9"](<DECIMALDIGIT>)* "e" (["-","+"])? (<DECIMALDIGIT>)+ (["f","l"])? >
}
TOKEN :

12
pmd-cpp/src/test/java/net/sourceforge/pmd/cpd/CPPTokenizerTest.java
View File

@ -159,6 +159,18 @@ public class CPPTokenizerTest {
tokenizer.tokenize(code, new Tokens());
}
@Test
public void testDigitSeparators() {
final String code = "auto integer_literal = 1'000'000;" + PMD.EOL
+ "auto floating_point_literal = 0.000'015'3;" + PMD.EOL
+ "auto hex_literal = 0x0F00'abcd'6f3d;" + PMD.EOL
+ "auto silly_example = 1'0'0'000'00;";
Tokens tokens = parse(code);
assertTrue(TokenEntry.getEOF() != tokens.getTokens().get(0));
assertEquals("1'000'000", tokens.getTokens().get(3).toString());
assertEquals(21, tokens.size());
}
private Tokens parse(String snippet) {
try {
return parse(snippet, false, new Tokens());