Fix AvoidUsingOctalValue false-positive

pmd · May 16, 2024 · 9a5bdbc · 9a5bdbc
1 parent feddca0
commit 9a5bdbc
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 3 deletions.
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNumericLiteral.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNumericLiteral.java
@@ -132,10 +132,19 @@ static int getBase(Chars image) {
  case 'b':
  case 'B':
  return 2;
- case '.':
- return 10;
  default:
- return 8;
+ if (image.indexOf('.') != -1 || image.indexOf('e') != -1 || image.indexOf('E') != -1) {
+ return 10;
+ }
+ switch (image.charAt(image.length() - 1)) {
+ case 'f':
+ case 'F':
+ case 'd':
+ case 'D':
+ return 10;
+ default:
+ return 8;
+ }
  }
  }
  return 10;

diff --git a/...rces/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UseUnderscoresInNumericLiterals.xml b/...rces/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UseUnderscoresInNumericLiterals.xml
@@ -244,6 +244,16 @@ public class Foo {
  ]]></code>
  </test-code>
 
+ <test-code>
+ <description>ok, float literal in hexadecimal with decimal and exponent</description>
+ <expected-problems>0</expected-problems>
+ <code><![CDATA[
+public class Foo {
+ float f = 0x1.0000_ffff_eeeep+2f;
+}
+ ]]></code>
+ </test-code>
+
  <test-code>
  <description>ok, Lengthy numeric literal with variable name as serialVersionUID</description>
  <expected-problems>0</expected-problems>

diff --git a/...est/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/AvoidUsingOctalValues.xml b/...est/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/AvoidUsingOctalValues.xml
@@ -54,6 +54,48 @@ public class Foo {
  ]]></code>
  </test-code>
 
+ <test-code>
+ <description>OK, double value</description>
+ <expected-problems>0</expected-problems>
+ <code><![CDATA[
+public class Foo {
+ double d = 012.0;
+}
+ ]]></code>
+ </test-code>
+
+ <test-code>
+ <description>OK, double suffix</description>
+ <expected-problems>0</expected-problems>
+ <code><![CDATA[
+public class Foo {
+ double d1 = 012d;
+ double d2 = 012D;
+}
+ ]]></code>
+ </test-code>
+
+ <test-code>
+ <description>OK, float suffix</description>
+ <expected-problems>0</expected-problems>
+ <code><![CDATA[
+public class Foo {
+ float f = 012f;
+ float f = 012F;
+}
+ ]]></code>
+ </test-code>
+
+ <test-code>
+ <description>OK, double value with exponent</description>
+ <expected-problems>0</expected-problems>
+ <code><![CDATA[
+public class Foo {
+ double d = 012e0;
+}
+ ]]></code>
+ </test-code>
+
  <test-code>
  <description>bad, 012L</description>
  <expected-problems>1</expected-problems>