Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Unified Diff: compiler/java/com/google/dart/compiler/type/TypeAnalyzer.java

Issue 10383251: Issue 3067. When we check getter/setter compatibility, we should compare propagated type variables. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | compiler/javatests/com/google/dart/compiler/type/TypeAnalyzerCompilerTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: compiler/java/com/google/dart/compiler/type/TypeAnalyzer.java
diff --git a/compiler/java/com/google/dart/compiler/type/TypeAnalyzer.java b/compiler/java/com/google/dart/compiler/type/TypeAnalyzer.java
index e80a4b12a39852c24a53eeb741d8a5c4a4e57cbf..a0dc97229ff7d7f1f20d38fbb7813f60d6a0b8e5 100644
--- a/compiler/java/com/google/dart/compiler/type/TypeAnalyzer.java
+++ b/compiler/java/com/google/dart/compiler/type/TypeAnalyzer.java
@@ -118,6 +118,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -1173,7 +1174,24 @@ public class TypeAnalyzer implements DartCompilationPhase {
MethodElement getterElement = Elements.lookupFieldElementGetter(currentClass.getElement(),
methodElement.getName());
if (getterElement != null) {
- Type getterType = getterElement.getReturnType();
+ // prepare "getter" type
+ Type getterType;
+ {
+ // prepare super types between "getter" and "setter" enclosing types
+ Type getterDeclarationType = getterElement.getEnclosingElement().getType();
+ List<InterfaceType> superTypes = getIntermediateSuperTypes(currentClass, getterDeclarationType);
+ // convert "getter" function type to use "setter" type parameters
+ FunctionType getterFunctionType = (FunctionType) getterElement.getType();
+ for (InterfaceType superType : superTypes) {
+ List<Type> superArguments = superType.getArguments();
+ List<Type> superParameters = superType.getElement().getTypeParameters();
+ getterFunctionType = (FunctionType) getterFunctionType.subst(
+ superArguments, superParameters);
+ }
+ // get return type
+ getterType = getterFunctionType.getReturnType();
+ }
+ // compare "getter" and "setter" types
if (!types.isAssignable(setterType, getterType)) {
typeError(parameterElement, TypeErrorCode.SETTER_TYPE_MUST_BE_ASSIGNABLE,
setterType.getElement().getName(),
@@ -1185,6 +1203,23 @@ public class TypeAnalyzer implements DartCompilationPhase {
return typeAsVoid(node);
}
+ /**
+ * @return "super" {@link InterfaceType}s used in declarations from "subType" to "superType",
+ * first item is given "superType". May be empty, but not <code>null</code>.
+ */
+ private List<InterfaceType> getIntermediateSuperTypes(InterfaceType subType, Type superType) {
+ LinkedList<InterfaceType> superTypes = Lists.newLinkedList();
+ InterfaceType t = subType.getElement().getSupertype();
+ while (t != null) {
+ superTypes.addFirst(t);
+ if (Objects.equal(t.getElement().getType(), superType)) {
+ break;
+ }
+ t = t.getElement().getSupertype();
+ }
+ return superTypes;
+ }
+
private void analyzeFactory(DartExpression name, final ConstructorElement methodElement) {
ASTVisitor<Void> visitor = new ASTVisitor<Void>() {
@Override
« no previous file with comments | « no previous file | compiler/javatests/com/google/dart/compiler/type/TypeAnalyzerCompilerTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698