Resolve redirecting factories.

dart/sdk/lib/_internal/compiler/implementation/resolution/members.dart

Index: dart/sdk/lib/_internal/compiler/implementation/resolution/members.dart
diff --git a/dart/sdk/lib/_internal/compiler/implementation/resolution/members.dart b/dart/sdk/lib/_internal/compiler/implementation/resolution/members.dart
index 2f79c0cd536da9eeef2b6c1f14244afcd81af69a..18eff2c85b3e7a896346ecf61413e4010475afd8 100644
--- a/dart/sdk/lib/_internal/compiler/implementation/resolution/members.dart
+++ b/dart/sdk/lib/_internal/compiler/implementation/resolution/members.dart
@@ -1875,9 +1875,10 @@ class ResolverVisitor extends CommonResolverVisitor<Element> {
 
   visitReturn(Return node) {
     if (node.isRedirectingFactoryBody) {
-      unimplemented(node, 'redirecting constructors');
+      useElement(node.expression, resolveRedirectingFactory(node));
+    } else {
+      visit(node.expression);
     }
-    visit(node.expression);
   }
 
   visitThrow(Throw node) {
@@ -1951,6 +1952,10 @@ class ResolverVisitor extends CommonResolverVisitor<Element> {
     return node.accept(new ConstructorResolver(compiler, this));
   }
 
+  FunctionElement resolveRedirectingFactory(Return node) {
+    return node.accept(new ConstructorResolver(compiler, this));
+  }
+
   DartType resolveTypeRequired(TypeAnnotation node) {
     bool old = typeRequired;
     typeRequired = true;
@@ -2945,22 +2950,31 @@ class ConstructorResolver extends CommonResolverVisitor<Element> {
     inConstContext = node.isConst();
     Node selector = node.send.selector;
     Element e = visit(selector);
-    if (!Elements.isUnresolved(e) && identical(e.kind, ElementKind.CLASS)) {
+    return finishConstructorReference(e, node.send.selector, node);
+  }
+
+  /// Finishes resolution of a constructor reference and record the

[Johnni Winther, 2012/11/05 15:13:53]

record => records

[ahe, 2012/11/06 09:18:45]

Done.

+  /// type of the constructed instance on [expression].
+  FunctionElement finishConstructorReference(Element e,
+                                             Node diagnosticNode,
+                                             Expression expression) {
+    if (Elements.isUnresolved(e)) {
+      type = compiler.dynamicClass.computeType(compiler);
+    } else if (e.isClass()) {
       ClassElement cls = e;
       cls.ensureResolved(compiler);
       if (cls.isInterface() && (cls.defaultClass == null)) {
-        error(selector, MessageKind.CANNOT_INSTANTIATE_INTERFACE, [cls.name]);
+        // TODO(ahe): Remove this check and error message when we
+        // don't have interfaces anymore.
+        error(diagnosticNode,
+              MessageKind.CANNOT_INSTANTIATE_INTERFACE, [cls.name]);
       }
-      e = lookupConstructor(cls, selector, const SourceString(''));
-    }
-    if (type == null) {
-      if (Elements.isUnresolved(e)) {
-        type = compiler.dynamicClass.computeType(compiler);
-      } else {
+      e = lookupConstructor(cls, diagnosticNode, const SourceString(''));
+      if (type == null) {
         type = e.getEnclosingClass().computeType(compiler).asRaw();
       }
     }
-    resolver.mapping.setType(node, type);
+    resolver.mapping.setType(expression, type);
     return e;
   }
 
@@ -3018,4 +3032,11 @@ class ConstructorResolver extends CommonResolverVisitor<Element> {
     }
     return e;
   }
+
+  /// Assumed to be called by [resolveRedirectingFactory].
+  Element visitReturn(Return node) {
+    Expression expression = node.expression;
+    return finishConstructorReference(visit(expression),
+                                      expression, expression);
+  }
 }