Georg Romstorfer
🐛
![dependabot[bot]](https://avatars.githubusercontent.com/in/29110?v=4?s=100)
If a nested type is package-qualified, this method
+ * will only return a non-null result for the leftmost (=innermost)
+ * ASTClassType node. For instance in {@code java.util.Map.Entry},
+ * the node {@code java.util.Map} has package qualifier
+ * {@code "java.util"}, while the node for {@code Entry}
+ * has package qualifier {@code null}. Note that the
+ * {@linkplain JClassSymbol#getPackageName() package name}
+ * of the symbol and type mirror will reflect that package
+ * name anyway, on both nodes.
+ */
+ public @Nullable String getPackageQualifier() {
+ if (isFullyQualified()) {
+ assert symbol != null : "Symbol should be non-null if isFullyQualified returns true";
+ return symbol.getPackageName();
+ }
+ return null;
+ }
+
@Override
protected Invalid literals or overflows result in {@code 0L}.
*/
static long parseIntegralValue(Chars image) {
- final int base = getBase(image);
+ final int base = getBase(image, true);
if (base == 8) {
image = image.subSequence(1); // 0
} else if (base != 10) {
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRecordComponentList.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRecordComponentList.java
index 082a3e55e7..0ed93007be 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRecordComponentList.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRecordComponentList.java
@@ -6,7 +6,6 @@
package net.sourceforge.pmd.lang.java.ast;
import net.sourceforge.pmd.lang.java.ast.ASTList.ASTMaybeEmptyListOf;
-import net.sourceforge.pmd.lang.java.ast.InternalInterfaces.AllChildrenAreOfType;
import net.sourceforge.pmd.lang.java.symbols.JConstructorSymbol;
/**
@@ -18,8 +17,7 @@ import net.sourceforge.pmd.lang.java.symbols.JConstructorSymbol;
*
*
*/
-public final class ASTRecordComponentList extends ASTMaybeEmptyListOf Their syntax is identical though, and described on {@link ASTSwitchLike}.
*/
-public final class ASTSwitchExpression extends AbstractJavaExpr
- implements ASTExpression,
- ASTSwitchLike {
+public final class ASTSwitchExpression extends AbstractJavaExpr implements ASTSwitchLike {
ASTSwitchExpression(int id) {
super(id);
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableId.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableId.java
index 88f97fecfe..c9085fb226 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableId.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableId.java
@@ -43,7 +43,7 @@ import net.sourceforge.pmd.lang.java.types.JTypeMirror;
* Note: This node has been called ASTVariableDeclaratorId in PMD 6.
*/
// @formatter:on
-public final class ASTVariableId extends AbstractTypedSymbolDeclarator
* Type variables do not, in general, use reference identity. Use
* equals to compare them.
*/
-public interface JTypeVar extends JTypeMirror, SubstVar {
+public interface JTypeVar extends SubstVar {
/**
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/Lub.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/Lub.java
index 80e6ac5575..9a589aa79d 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/Lub.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/Lub.java
@@ -340,10 +340,21 @@ final class Lub {
JTypeMirror componentGlb = glb(ts, setOf(((JArrayType) ci).getComponentType(),
((JArrayType) primaryBound).getComponentType()));
primaryBound = ts.arrayType(componentGlb);
+
} else {
- throw new IllegalArgumentException(
- "Bad intersection, unrelated class types " + ci + " and " + primaryBound + " in " + types
- );
+ // We have two primary bounds. This may happen during capture
+ // of recursive F-bounded types. Here we do a last resort check
+ // to see if one of the bounds is a subtype (unchecked) of the other.
+ // In that case we pick this as primary bound as it is more specific.
+
+ int cmp = compareRelatedness(ci.getErasure(), primaryBound.getErasure());
+ if (cmp == 0) {
+ throw new IllegalArgumentException(
+ "Bad intersection, unrelated class types " + ci + " and " + primaryBound + " in " + types
+ );
+ } else if (cmp < 0) {
+ primaryBound = ci;
+ }
}
} else {
bounds.add(ci);
@@ -366,6 +377,15 @@ final class Lub {
return new JIntersectionType(ts, primaryBound, bounds);
}
+ private static int compareRelatedness(JTypeMirror t, JTypeMirror s) {
+ if (TypeOps.isConvertiblePure(t, s.getErasure()).withoutWarnings()) {
+ return -1;
+ } else if (TypeOps.isConvertiblePure(s, t.getErasure()).withoutWarnings()) {
+ return 1;
+ }
+ return 0;
+ }
+
private static void checkGlbComponent(Collection types, JTypeMirror ci) {
if (ci.isPrimitive() || ci instanceof JWildcardType || ci instanceof JIntersectionType) {
throw new IllegalArgumentException("Bad intersection type component: " + ci + " in " + types);
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/TypeOps.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/TypeOps.java
index 5104bbedfa..66f237ae61 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/TypeOps.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/TypeOps.java
@@ -1091,14 +1091,10 @@ public final class TypeOps {
Hello, world Hello, world Hello, world Hello, world Hello, world Hello, world
* str.trim().length()==0
*
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/JAccessibleElementSymbol.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/JAccessibleElementSymbol.java
index 956c2fd1ef..37be4bd6d6 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/JAccessibleElementSymbol.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/JAccessibleElementSymbol.java
@@ -16,7 +16,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
*
* @since 7.0.0
*/
-public interface JAccessibleElementSymbol extends JElementSymbol, AnnotableSymbol {
+public interface JAccessibleElementSymbol extends AnnotableSymbol {
/**
* Conventional return value of {@link #getPackageName()} for
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/JExecutableSymbol.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/JExecutableSymbol.java
index 076db24b92..c8bbac2c0f 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/JExecutableSymbol.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/JExecutableSymbol.java
@@ -19,7 +19,7 @@ import net.sourceforge.pmd.lang.java.types.Substitution;
* Common supertype for {@linkplain JMethodSymbol method}
* and {@linkplain JConstructorSymbol constructor symbols}.
*/
-public interface JExecutableSymbol extends JAccessibleElementSymbol, JTypeParameterOwnerSymbol {
+public interface JExecutableSymbol extends JTypeParameterOwnerSymbol {
/**
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/JTypeDeclSymbol.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/JTypeDeclSymbol.java
index fbe2aee615..638bcbee7d 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/JTypeDeclSymbol.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/JTypeDeclSymbol.java
@@ -21,7 +21,7 @@ import net.sourceforge.pmd.lang.java.types.JTypeMirror;
*
* @since 7.0.0
*/
-public interface JTypeDeclSymbol extends JElementSymbol, JAccessibleElementSymbol {
+public interface JTypeDeclSymbol extends JAccessibleElementSymbol {
/**
* Returns true if this class is a symbolic reference to an unresolved
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/internal/ast/AstUnnamedClassSym.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/internal/ast/AstUnnamedClassSym.java
index 1d575cd9d5..c8b8c6da48 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/internal/ast/AstUnnamedClassSym.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/internal/ast/AstUnnamedClassSym.java
@@ -16,12 +16,11 @@ import net.sourceforge.pmd.lang.java.ast.ASTFieldDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTMethodDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTVariableId;
import net.sourceforge.pmd.lang.java.ast.JModifier;
-import net.sourceforge.pmd.lang.java.symbols.JClassSymbol;
import net.sourceforge.pmd.lang.java.symbols.JFieldSymbol;
import net.sourceforge.pmd.lang.java.symbols.JMethodSymbol;
import net.sourceforge.pmd.lang.java.symbols.internal.EmptyClassSymbol;
-class AstUnnamedClassSym extends EmptyClassSymbol implements JClassSymbol {
+class AstUnnamedClassSym extends EmptyClassSymbol {
private final List