Resolve redirecting factories.

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

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 abstract class TreeElements {
   Element operator[](Node node);
   Selector getSelector(Send send);
   DartType getType(Node node);
   bool isParameterChecked(Element element);
 }
@@ skipping 1814 matching lines @@
       visit(link.head);
     }
   }
 
   visitOperator(Operator node) {
     unimplemented(node, 'operator');
   }
 
   visitReturn(Return node) {
     if (node.isRedirectingFactoryBody) {
-      unimplemented(node, 'redirecting constructors');
+      return resolveRedirectingFactory(node);
     }
     visit(node.expression);
   }
 
   visitThrow(Throw node) {
     if (!inCatchBlock && node.expression == null) {
       error(node, MessageKind.THROW_WITHOUT_EXPRESSION);
     }
     visit(node.expression);
   }
@@ skipping 55 matching lines @@
 
   /**
    * Try to resolve the constructor that is referred to by [node].
    * Note: this function may return an ErroneousFunctionElement instead of
    * [null], if there is no corresponding constructor, class or library.
    */
   FunctionElement resolveConstructor(NewExpression node) {
     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;
     DartType result = resolveTypeAnnotation(node);
     typeRequired = old;
     return result;
   }
 
   void analyzeTypeArgument(DartType annotation, DartType argument) {
     if (argument == null) return;
@@ skipping 947 matching lines @@
     } else if (inConstContext && !result.modifiers.isConst()) {
       error(diagnosticNode, MessageKind.CONSTRUCTOR_IS_NOT_CONST);
     }
     return result;
   }
 
   visitNewExpression(NewExpression node) {
     inConstContext = node.isConst();
     Node selector = node.send.selector;
     Element e = visit(selector);
+    e = finishConstructorReference(e, node.send.selector);
+    resolver.mapping.setType(node, type);

[Johnni Winther, 2012/10/22 09:47:34]

I don't like the implicit handling of [type]. Couldn't
[finishConstructorReference] return an Element/DartType tuple?

+    return e;
+  }
+
+  FunctionElement finishConstructorReference(Element e, Node node) {
     if (!Elements.isUnresolved(e) && identical(e.kind, ElementKind.CLASS)) {
       ClassElement cls = e;
       cls.ensureResolved(compiler);
       if (cls.isInterface() && (cls.defaultClass == null)) {
-        error(selector, MessageKind.CANNOT_INSTANTIATE_INTERFACE, [cls.name]);
+        error(node, MessageKind.CANNOT_INSTANTIATE_INTERFACE, [cls.name]);
       }
-      e = lookupConstructor(cls, selector, const SourceString(''));
+      e = lookupConstructor(cls, node, const SourceString(''));
     }
     if (type == null) {
-      type = e.getEnclosingClass().computeType(compiler);
+      if (Elements.isUnresolved(e)) {
+        type = compiler.dynamicClass.computeType(compiler);
+      } else {
+        type = e.getEnclosingClass().computeType(compiler).asRaw();

[Johnni Winther, 2012/10/22 09:47:34]

This is the right type!

+      }
     }
-    resolver.mapping.setType(node, type);
     return e;
   }
 
   visitTypeAnnotation(TypeAnnotation node) {
     assert(invariant(node, type == null));
     type = resolver.resolveTypeRequired(node);
     return resolver.mapping[node];
   }
 
   visitSend(Send node) {
@@ skipping 37 matching lines @@
     } else if (identical(e.kind, ElementKind.TYPEDEF)) {
       error(node, MessageKind.CANNOT_INSTANTIATE_TYPEDEF, [name]);
     } else if (identical(e.kind, ElementKind.TYPE_VARIABLE)) {
       error(node, MessageKind.CANNOT_INSTANTIATE_TYPE_VARIABLE, [name]);
     } else if (!identical(e.kind, ElementKind.CLASS)
         && !identical(e.kind, ElementKind.PREFIX)) {
       error(node, MessageKind.NOT_A_TYPE, [name]);
     }
     return e;
   }
+
+  /// Assumed to be called by [resolveRedirectingFactory].
+  Element visitReturn(Return node) {
+    Element e = visit(node.expression);
+    e = finishConstructorReference(e, node.expression);
+    resolver.mapping.setType(node, type);
+    // TODO(ahe): Remove this debug warning when this is fully implemented.
+    warning(node.expression, MessageKind.GENERIC, ['e = $e; type = $type']);
+    return e;
+  }
 }
 
 abstract class Scope {
   final Element element;
   final Scope parent;
 
   Scope(this.parent, this.element);
   abstract Element add(Element element);
 
   Element lookup(SourceString name) {
@@ skipping 213 matching lines @@
     return result;
   }
   Element lookup(SourceString name) => localLookup(name);
   Element lexicalLookup(SourceString name) => localLookup(name);
 
   Element add(Element newElement) {
     throw "Cannot add an element in a patch library scope";
   }
   String toString() => 'PatchLibraryScope($origin,$patch)';
 }