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

Catch a few numbers that shouldn't parse

Browse Source 
Fix literals
This commit is contained in:
Clément Fournier
2020-01-25 07:05:51 +01:00
parent 01ef998d17
commit 694d473f4d
3 changed files with 41 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
pmd-java/etc/grammar/Java.jjt
View File

@ -521,67 +521,53 @@ TOKEN :
TOKEN :
{
< INTEGER_LITERAL:
<DECIMAL_LITERAL> (["l","L"])?
| <HEX_LITERAL> (["l","L"])?
| <BINARY_LITERAL> (["l","L"])?
| <OCTAL_LITERAL> (["l","L"])?
<DECIMAL_NUMERAL> (["l","L"])?
| <HEX_NUMERAL> (["l","L"])?
| <BINARY_NUMERAL> (["l","L"])?
| <OCTAL_NUMERAL> (["l","L"])?
>
|
< #DECIMAL_LITERAL: (["0"-"9"]((["0"-"9","_"])*["0"-"9"])?) >
|
< #HEX_LITERAL: "0" ["x","X"] (["0"-"9","a"-"f","A"-"F"]((["0"-"9","a"-"f","A"-"F","_"])*["0"-"9","a"-"f","A"-"F"])?) >
|
< #BINARY_LITERAL: "0" ["b","B"] (["0","1"]((["0","1","_"])*["0","1"])?) >
|
< #OCTAL_LITERAL: "0" (["0"-"7"]((["0"-"7","_"])*["0"-"7"])?) >
| < #DECIMAL_NUMERAL: ["1"-"9"] (("_")* ["0"-"9"])* >
| < #HEX_NUMERAL: "0" ["x","X"] <HEX_DIGIT_SEQ> >
| < #BINARY_NUMERAL: "0" ["b","B"] ["0","1"] (("_")* ["0","1"])* >
| < #OCTAL_NUMERAL: "0" (("_")* ["0"-"7"])* >
|
< FLOATING_POINT_LITERAL:
(["0"-"9"]((["0"-"9","_"])*["0"-"9"])?) "." (["0"-"9"]((["0"-"9","_"])*["0"-"9"])?)? (<EXPONENT>)? (["f","F","d","D"])?
| "." (["0"-"9"]((["0"-"9","_"])*["0"-"9"])?) (<EXPONENT>)? (["f","F","d","D"])?
| (["0"-"9"]((["0"-"9","_"])*["0"-"9"])?) <EXPONENT> (["f","F","d","D"])?
| (["0"-"9"]((["0"-"9","_"])*["0"-"9"])?) (<EXPONENT>)? ["f","F","d","D"]
<DECIMAL_FLOATING_POINT_LITERAL>
| <HEX_FLOATING_POINT_LITERAL>
>
|
< HEX_FLOATING_POINT_LITERAL:
(<HEX_LITERAL> (".")? | "0" ["x","X"] (["0"-"9","a"-"f","A"-"F"]((["0"-"9","a"-"f","A"-"F","_"])*["0"-"9","a"-"f","A"-"F"])?)? "." (["0"-"9","a"-"f","A"-"F"]((["0"-"9","a"-"f","A"-"F","_"])*["0"-"9","a"-"f","A"-"F"])?)) ["p","P"] (["+","-"])? (["0"-"9"]((["0"-"9","_"])*["0"-"9"])?) (["f","F","d","D"])?
| < #DECIMAL_FLOATING_POINT_LITERAL:
<DIGIT_SEQ> "." (<DIGIT_SEQ>)? (<EXPONENT>)? (["f","F", "d","D"])?
| "." <DIGIT_SEQ> (<EXPONENT>)? (["f","F", "d","D"])?
| <DIGIT_SEQ> <EXPONENT> (["f","F", "d","D"])?
| <DIGIT_SEQ> (<EXPONENT>)? ["f","F", "d","D"]
>
|
< #EXPONENT: ["e","E"] (["+","-"])? (["0"-"9"]((["0"-"9","_"])*["0"-"9"])?) >
|
< CHARACTER_LITERAL:
"'"
( (~["'","\\","\n","\r"])
| ("\\"
( ["n","t","b","r","f","\\","'","\""]
| ["0"-"7"] ( ["0"-"7"] )?
| ["0"-"3"] ["0"-"7"] ["0"-"7"]
)
)
)
"'"
>
| < #STRING_ESCAPE:
"\\"
( ["n","t","b","r","f","\\","'","\""]
// octal escapes
| ["0"-"7"] ( ["0"-"7"] )?
| ["0"-"3"] ["0"-"7"] ["0"-"7"]
)
>
|
< STRING_LITERAL:
"\""
( (~["\"","\\","\n","\r"])
| <STRING_ESCAPE>
)*
"\""
| < #HEX_FLOATING_POINT_LITERAL:
"0" ["x","X"] <HEX_DIGIT_SEQ> (".")? <HEX_EXPONENT> (["f","F", "d","D"])?
| "0" ["x","X"] (<HEX_DIGIT_SEQ>)? "." <HEX_DIGIT_SEQ> <HEX_EXPONENT> (["f","F", "d","D"])?
>
| < #DIGIT_SEQ: ["0"-"9"] (("_")* ["0"-"9"])* >
| < #HEX_DIGIT_SEQ: ["0"-"9","a"-"f","A"-"F"] (("_")* ["0"-"9","a"-"f","A"-"F"])* >
| < #EXPONENT: ["e","E"] <EXPONENT_TAIL> >
| < #HEX_EXPONENT: ["p","P"] <EXPONENT_TAIL> >
| < #EXPONENT_TAIL: (["+","-"])? <DIGIT_SEQ> >
| < CHARACTER_LITERAL: "'" ( ~["'", "\\","\n","\r"] | <STRING_ESCAPE> ) "'" >
| < STRING_LITERAL: "\"" ( ~["\"","\\","\n","\r"] | <STRING_ESCAPE> )* "\"" >
|
< TEXT_BLOCK_LITERAL:
"\"\"\"" (<HORIZONTAL_WHITESPACE>)* <LINE_TERMINATOR>
( ~["\"", "\\"] | "\"" ~["\""] | "\"\"" ~["\""] | <STRING_ESCAPE> )*
"\"\"\""
>
| < #STRING_ESCAPE:
"\\"
( ["n","t","b","r","f","\\","'","\""]
// octal escapes
| ["0"-"7"] ( ["0"-"7"] )?
| ["0"-"3"] ["0"-"7"] ["0"-"7"]
)
>
}
/* IDENTIFIERS */
@ -1829,7 +1815,6 @@ void NumericLiteral():
{
( t=<INTEGER_LITERAL> { jjtThis.setIntLiteral(); }
| t=<FLOATING_POINT_LITERAL> { jjtThis.setFloatLiteral(); }
| t=<HEX_FLOATING_POINT_LITERAL> { jjtThis.setFloatLiteral(); }
)
{ jjtThis.setImage(t.image); }
}

2
pmd-java/src/main/java/net/sourceforge/pmd/cpd/JavaTokenizer.java
View File

@ -62,7 +62,7 @@ public class JavaTokenizer extends JavaCCTokenizer {
if (ignoreLiterals && (javaToken.kind == JavaTokenKinds.STRING_LITERAL
|| javaToken.kind == JavaTokenKinds.CHARACTER_LITERAL
|| javaToken.kind == JavaTokenKinds.DECIMAL_LITERAL
|| javaToken.kind == JavaTokenKinds.INTEGER_LITERAL
|| javaToken.kind == JavaTokenKinds.FLOATING_POINT_LITERAL)) {
image = String.valueOf(javaToken.kind);
}

7
pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTLiteralTest.kt
View File

@ -331,8 +331,11 @@ $delim
// this starts with zero so is octal,
// but 9 is too big for an octal digit
// "099" shouldNot parse()
// "099" shouldNot parse()
"099" shouldNot parse()
"00_8" shouldNot parse()
"08_" shouldNot parse()
"0x8_" shouldNot parse()
"8_" shouldNot parse()
"0b" shouldNot parse()
"0x" shouldNot parse()
"0" should parseAs {