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

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

Issue 8948001: Updates dartc to recognize 'default' keyword on interface and updated factory method syntax (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Got rid of some problems. Created 9 years 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
Index: compiler/java/com/google/dart/compiler/type/FunctionTypeImplementation.java
diff --git a/compiler/java/com/google/dart/compiler/type/FunctionTypeImplementation.java b/compiler/java/com/google/dart/compiler/type/FunctionTypeImplementation.java
index 166768b9906e4946be160bbe317245aadfcea812..54d5c33d6c060f653986cb6c1ff16da5588c4596 100644
--- a/compiler/java/com/google/dart/compiler/type/FunctionTypeImplementation.java
+++ b/compiler/java/com/google/dart/compiler/type/FunctionTypeImplementation.java
@@ -19,20 +19,17 @@ class FunctionTypeImplementation extends AbstractType implements FunctionType {
private final Type returnType;
private final Map<String, Type> namedParameterTypes;
private final Type rest;
- private final List<TypeVariable> typeVariables;
private FunctionTypeImplementation(ClassElement element,
List<Type> parameterTypes,
Map<String, Type> namedParameterTypes,
Type rest,
- Type returnType,
- List<TypeVariable> typeVariables) {
+ Type returnType) {
this.classElement = element;
this.parameterTypes = parameterTypes;
this.namedParameterTypes = namedParameterTypes == null ? EMPTY_MAP : namedParameterTypes;
this.rest = rest;
this.returnType = returnType;
- this.typeVariables = typeVariables;
}
@Override
@@ -54,7 +51,7 @@ class FunctionTypeImplementation extends AbstractType implements FunctionType {
Type substitutedReturnType = getReturnType().subst(arguments, parameters);
return new FunctionTypeImplementation(getElement(),
substitutedParameterTypes, substitutedNamedParameterTypes,
- substitutedRest, substitutedReturnType, getTypeVariables());
+ substitutedRest, substitutedReturnType);
}
@Override
@@ -82,10 +79,6 @@ class FunctionTypeImplementation extends AbstractType implements FunctionType {
return namedParameterTypes;
}
- public List<TypeVariable> getTypeVariables() {
- return typeVariables;
- }
-
@Override
public Type getRest() {
return rest;
@@ -173,13 +166,9 @@ class FunctionTypeImplementation extends AbstractType implements FunctionType {
* interface Function in the core library.
*/
static FunctionType of(ClassElement element, List<Type> parameterTypes,
- Map<String, Type> namedParameterTypes, Type rest, Type returnType,
- List<TypeVariable> typeVariables) {
+ Map<String, Type> namedParameterTypes, Type rest, Type returnType) {
assert element.isDynamic() || element.getName().equals("Function");
- if (typeVariables == null) {
- typeVariables = Collections.emptyList();
- }
return new FunctionTypeImplementation(element, parameterTypes, namedParameterTypes, rest,
- returnType, typeVariables);
+ returnType);
}
}

Powered by Google App Engine
This is Rietveld 408576698