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

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

Issue 10700089: Another round of JUnit tests to finish off ResovlerErrorCodes I could reproduce (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 6 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
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 107ab72de55a50fb2b41f6b97f104ed48b2d3fd5..58375300f96342c32b0209c344a0326cac0b3c04 100644
--- a/compiler/java/com/google/dart/compiler/type/TypeAnalyzer.java
+++ b/compiler/java/com/google/dart/compiler/type/TypeAnalyzer.java
@@ -1039,10 +1039,10 @@ public class TypeAnalyzer implements DartCompilationPhase {
@Override
public Type visitTypeNode(DartTypeNode node) {
- return validateTypeNode(node, false);
+ return validateTypeNode(node);
}
- private Type validateTypeNode(DartTypeNode node, boolean badBoundIsError) {
+ private Type validateTypeNode(DartTypeNode node) {
Type type = node.getType(); // Already calculated by resolver.
switch (TypeKind.of(type)) {
case NONE:
@@ -1052,8 +1052,7 @@ public class TypeAnalyzer implements DartCompilationPhase {
InterfaceType itype = (InterfaceType) type;
validateBounds(node.getTypeArguments(),
itype.getArguments(),
- itype.getElement().getTypeParameters(),
- badBoundIsError);
+ itype.getElement().getTypeParameters());
return itype;
}
default:
@@ -1063,8 +1062,7 @@ public class TypeAnalyzer implements DartCompilationPhase {
private void validateBounds(List<? extends DartNode> diagnosticNodes,
List<Type> arguments,
- List<Type> parameters,
- boolean badBoundIsError) {
+ List<Type> parameters) {
if (arguments.size() == parameters.size() && arguments.size() == diagnosticNodes.size()) {
List<Type> bounds = Lists.newArrayListWithCapacity(parameters.size());
for (Type parameter : parameters) {
@@ -1080,13 +1078,8 @@ public class TypeAnalyzer implements DartCompilationPhase {
Type t = bounds.get(i);
Type s = arguments.get(i);
if (!types.isAssignable(t, s)) {
- if (badBoundIsError) {
zundel 2012/07/03 18:22:09 I could not find any way to exercise this code, an
- onError(diagnosticNodes.get(i),
- ResolverErrorCode.TYPE_NOT_ASSIGNMENT_COMPATIBLE, s, t);
- } else {
- onError(diagnosticNodes.get(i),
- TypeErrorCode.TYPE_NOT_ASSIGNMENT_COMPATIBLE, s, t);
- }
+ onError(diagnosticNodes.get(i),
+ TypeErrorCode.TYPE_NOT_ASSIGNMENT_COMPATIBLE, s, t);
}
}
}
@@ -1295,11 +1288,11 @@ public class TypeAnalyzer implements DartCompilationPhase {
setCurrentClass(type);
visit(node.getTypeParameters());
if (node.getSuperclass() != null) {
- validateTypeNode(node.getSuperclass(), false);
+ validateTypeNode(node.getSuperclass());
}
if (node.getInterfaces() != null) {
for (DartTypeNode interfaceNode : node.getInterfaces()) {
- validateTypeNode(interfaceNode, false);
+ validateTypeNode(interfaceNode);
}
}
visit(node.getMembers());
@@ -1833,13 +1826,12 @@ public class TypeAnalyzer implements DartCompilationPhase {
if (defaultClassType != null && defaultClassType.getElement() != null) {
validateBounds(typeNode.getTypeArguments(),
itype.getArguments(),
- defaultClassType.getElement().getTypeParameters(),
- false);
+ defaultClassType.getElement().getTypeParameters());
type = itype;
}
}
if (type == null) {
- type = validateTypeNode(typeNode, false);
+ type = validateTypeNode(typeNode);
}
DartNode typeName = typeNode.getIdentifier();
@@ -2439,7 +2431,7 @@ public class TypeAnalyzer implements DartCompilationPhase {
@Override
public Type visitTypeParameter(DartTypeParameter node) {
if (node.getBound() != null) {
- validateTypeNode(node.getBound(), true);
+ validateTypeNode(node.getBound());
}
return voidType;
}

Powered by Google App Engine
This is Rietveld 408576698