stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6557966: Multiple upper bounds of the TypeVariable

Browse Source 
Adjusting javax.lang.model javadoc regarding IntersectionType, IntersectionType.accept now calls visitIntersection for all kinds of IntersectionTypes.

Co-authored-by: Joe Darcy <joe.darcy@oracle.com>
Reviewed-by: darcy, vromero
This commit is contained in:
Jan Lahoda 2013-11-20 13:44:39 +01:00
parent f4c2201eb4
commit 5fd77a7cef
6 changed files with 58 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
langtools/src/share/classes/com/sun/tools/javac/code/Type.java
View File

@ -970,13 +970,6 @@ public abstract class Type extends AnnoConstruct implements TypeMirror {
public boolean allInterfaces;
public enum IntersectionKind {
EXPLICIT,
IMPLICT;
}
public IntersectionKind intersectionKind;
public IntersectionClassType(List<Type> bounds, ClassSymbol csym, boolean allInterfaces) {
super(Type.noType, List.<Type>nil(), csym);
this.allInterfaces = allInterfaces;
@ -1008,9 +1001,7 @@ public abstract class Type extends AnnoConstruct implements TypeMirror {
@Override
public <R, P> R accept(TypeVisitor<R, P> v, P p) {
return intersectionKind == IntersectionKind.EXPLICIT ?
v.visitIntersection(this, p) :
v.visitDeclared(this, p);
return v.visitIntersection(this, p);
}
}

4
langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
View File

@ -3982,10 +3982,6 @@ public class Attr extends JCTree.Visitor {
return bounds.head.type;
} else {
Type owntype = types.makeCompoundType(TreeInfo.types(bounds));
if (tree.hasTag(TYPEINTERSECTION)) {
((IntersectionClassType)owntype).intersectionKind =
IntersectionClassType.IntersectionKind.EXPLICIT;
}
// ... the variable's bound is a class type flagged COMPOUND
// (see comment for TypeVar.bound).
// In this case, generate a class tree that represents the

10
langtools/src/share/classes/javax/lang/model/type/DeclaredType.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -49,14 +49,6 @@ import javax.lang.model.util.Types;
* Types#directSupertypes(TypeMirror)} method. This returns the
* supertypes with any type arguments substituted in.
*
* <p> This interface is also used to represent intersection types.
* An intersection type is implicit in a program rather than being
* explictly declared. For example, the bound of the type parameter
* {@code <T extends Number & Runnable>}
* is an intersection type. It is represented by a {@code DeclaredType}
* with {@code Number} as its superclass and {@code Runnable} as its
* lone superinterface.
*
* @author Joseph D. Darcy
* @author Scott Seligman
* @author Peter von der Ah&eacute;

14
langtools/src/share/classes/javax/lang/model/type/IntersectionType.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -30,9 +30,15 @@ import java.util.List;
/**
* Represents an intersection type.
*
* As of the {@link javax.lang.model.SourceVersion#RELEASE_8
* RELEASE_8} source version, intersection types can appear as the target type
* of a cast expression.
* <p>An intersection type can be either implicitly or explicitly
* declared in a program. For example, the bound of the type parameter
* {@code <T extends Number & Runnable>} is an (implicit) intersection
* type. As of {@link javax.lang.model.SourceVersion#RELEASE_8
* RELEASE_8}, this is represented by an {@code IntersectionType} with
* {@code Number} and {@code Runnable} as its bounds. Also as of the
* {@link javax.lang.model.SourceVersion#RELEASE_8 RELEASE_8},
* intersection types can explicitly appear as the target type of a
* cast expression.
*
* @since 1.8
*/

9
langtools/src/share/classes/javax/lang/model/type/TypeVariable.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -62,10 +62,9 @@ public interface TypeVariable extends ReferenceType {
* <p> If this type variable was declared with no explicit
* upper bounds, the result is {@code java.lang.Object}.
* If it was declared with multiple upper bounds,
* the result is an intersection type (modeled as a
* {@link DeclaredType}).
* Individual bounds can be found by examining the result's
* {@linkplain Types#directSupertypes(TypeMirror) supertypes}.
* the result is an {@linkplain IntersectionType intersection type};
* individual bounds can be found by examining the result's
* {@linkplain IntersectionType#getBounds() bounds}.
*
* @return the upper bound of this type variable
*/

48
langtools/test/tools/javac/processing/model/type/IntersectionPropertiesTest.java
View File

@ -31,26 +31,27 @@
*/
import com.sun.source.util.*;
import com.sun.tools.javac.api.*;
import com.sun.tools.javac.file.*;
import com.sun.tools.javac.util.Assert;
import javax.annotation.processing.*;
import javax.lang.model.SourceVersion;
import javax.lang.model.type.*;
import javax.lang.model.util.ElementFilter;
import javax.lang.model.element.*;
import javax.tools.*;
import java.util.*;
import java.io.*;
import javax.lang.model.util.Types;
public class IntersectionPropertiesTest {
private int errors = 0;
private static final String Intersection_name = "IntersectionTest.java";
private static final String Intersection_contents =
"import java.util.AbstractList;\n" +
"import java.util.List;\n" +
"import java.io.Serializable;\t" +
"public class IntersectionTest<S extends List & Serializable> {\n" +
" void method(S s) { }\n" +
"public class IntersectionTest<S extends List & Serializable, One extends AbstractList & Runnable & Serializable, Two extends AbstractList & Serializable & Runnable> {\n" +
" void method(S s, One o, Two t) { }\n" +
" public static abstract class SubType extends AbstractList implements Runnable, Serializable { } \n" +
"}";
private static final File classesdir = new File("intersectionproperties");
@ -116,7 +117,8 @@ public class IntersectionPropertiesTest {
TypeParameterElement typeParameterElement = ((TypeParameterElement) typeVariable.asElement());
final List<? extends TypeMirror> bounds = typeParameterElement.getBounds();
final HashSet<TypeMirror> actual = new HashSet<TypeMirror>(processingEnv.getTypeUtils().directSupertypes(upperBound));
Types types = processingEnv.getTypeUtils();
final HashSet<TypeMirror> actual = new HashSet<TypeMirror>(types.directSupertypes(upperBound));
final HashSet<TypeMirror> expected = new HashSet<TypeMirror>(bounds);
if (!expected.equals(actual)) {
System.err.println("Mismatched expected and actual bounds.");
@ -128,6 +130,40 @@ public class IntersectionPropertiesTest {
System.err.println(" " + tm);
errors++;
}
TypeVariable oneTypeVariable = (TypeVariable) method.getParameters().get(1).asType();
TypeMirror oneUpperBound = oneTypeVariable.getUpperBound();
TypeVariable twoTypeVariable = (TypeVariable) method.getParameters().get(2).asType();
TypeMirror twoUpperBound = twoTypeVariable.getUpperBound();
TypeElement oneUpperBoundElement = (TypeElement) types.asElement(oneUpperBound);
Assert.checkNonNull(oneUpperBoundElement);
Assert.check("java.util.AbstractList".equals(oneUpperBoundElement.getSuperclass().toString()),
oneUpperBoundElement.getSuperclass().toString());
List<String> superInterfaces = new java.util.ArrayList<>();
for (TypeMirror tm : oneUpperBoundElement.getInterfaces()) {
superInterfaces.add(tm.toString());
}
Assert.check(java.util.Arrays.asList("java.lang.Runnable",
"java.io.Serializable").equals(superInterfaces),
superInterfaces);
Assert.check(types.isSameType(upperBound, types.capture(upperBound)));
Assert.check(types.isSameType(types.erasure(typeVariable), types.erasure(upperBound)));
TypeElement subTypeClass = processingEnv.getElementUtils().getTypeElement("IntersectionTest.SubType");
Assert.checkNonNull(subTypeClass);
Assert.check(types.isAssignable(subTypeClass.asType(), oneUpperBound));
Assert.check(types.isSameType(oneUpperBound, twoUpperBound));
Assert.check(!types.isSameType(upperBound, twoUpperBound));
Assert.check(types.isSubtype(subTypeClass.asType(), oneUpperBound));
Assert.check(types.isSubtype(oneUpperBound, upperBound));
}
}