Ensure that ClassElement.lookupConstructor fails when looking up default constructor using Selector…

lib/compiler/implementation/resolver.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(TypeAnnotation annotation);
   bool isParameterChecked(Element element);
 }
@@ skipping 71 matching lines @@
         return resolveParameter(element);
       }
 
       compiler.unimplemented("resolve($element)",
                              node: element.parseNode(compiler));
     });
   }
 
   bool isNamedConstructor(Send node) => node.receiver !== null;
 
-  SourceString getConstructorName(Send node) {
-    return node.selector.asIdentifier().source;
+  SourceString getConstructorName(Send node, SourceString className) {

[kasperl, 2012/10/15 07:26:38]

Maybe this helper could give you the selector instead of the name and you could
compute the constructorName from that where you need it?

[aam-me, 2012/10/15 12:07:52]

Done.

+    if (!isNamedConstructor(node)) {
+      return const SourceString("");
+    } else {
+      SourceString constructorName = node.selector.asIdentifier().source;
+      if (constructorName.slowToString() != className.slowToString()) {
+        return constructorName;
+      } else {
+        return const SourceString("");
+      }
+    }
   }
 
   String constructorNameForDiagnostics(SourceString className,
                                    SourceString constructorName) {
     String classNameString = className.slowToString();
     String constructorNameString = constructorName.slowToString();
     return (constructorName === const SourceString(''))
         ? classNameString
         : "$classNameString.$constructorNameString";
    }
 
   FunctionElement resolveConstructorRedirection(InitializerResolver resolver,
                                                 FunctionElement constructor) {
     if (constructor.isPatched) {
       checkMatchingPatchSignatures(constructor, constructor.patch);
       constructor = constructor.patch;
     }
     FunctionExpression node = constructor.parseNode(compiler);
 
     // A synthetic constructor does not have a node.
     if (node === null) return null;
     if (node.initializers === null) return null;
     Link<Node> initializers = node.initializers.nodes;
     if (!initializers.isEmpty() &&
         Initializers.isConstructorRedirect(initializers.head)) {
       final ClassElement classElement = constructor.getEnclosingClass();
+      SourceString constructorName = getConstructorName(initializers.head, classElement.name);

[kasperl, 2012/10/15 07:26:38]

Long line.

[aam-me, 2012/10/15 12:07:52]

Done.

       Selector selector;
-      if (isNamedConstructor(initializers.head)) {
-        SourceString constructorName = getConstructorName(initializers.head);
+      if (constructorName != const SourceString("")) {
         selector = new Selector.callConstructor(
-            constructorName,
-            resolver.visitor.enclosingElement.getLibrary());
+          constructorName,
+          resolver.visitor.enclosingElement.getLibrary());
       } else {
         selector = new Selector.callDefaultConstructor(
-            resolver.visitor.enclosingElement.getLibrary());
+          resolver.visitor.enclosingElement.getLibrary());
       }
       return classElement.lookupConstructor(selector);
     }
     return null;
   }
 
   void resolveRedirectingConstructor(InitializerResolver resolver,
                                      Node node,
                                      FunctionElement constructor,
                                      FunctionElement redirection) {
@@ skipping 599 matching lines @@
       visitor.resolveArguments(call.argumentsNode);
     });
     Selector selector = visitor.mapping.getSelector(call);
     bool isSuperCall = Initializers.isSuperConstructorCall(call);
 
     ClassElement lookupTarget = getSuperOrThisLookupTarget(constructor,
                                                            isSuperCall,
                                                            call);
     final SourceString className = lookupTarget.name;
 
-    SourceString constructorName;
+    SourceString constructorName = resolver.getConstructorName(call, className);
     Selector lookupSelector;
-    if (resolver.isNamedConstructor(call)) {
-      constructorName = resolver.getConstructorName(call);
+    if (constructorName != const SourceString('')) {
       lookupSelector = new Selector.callConstructor(
           constructorName,
           visitor.enclosingElement.getLibrary());
     } else {
-      constructorName = const SourceString('');
       lookupSelector = new Selector.callDefaultConstructor(
           visitor.enclosingElement.getLibrary());
     }
 
     FunctionElement lookedupConstructor =
         lookupTarget.lookupConstructor(lookupSelector);
 
     final bool isImplicitSuperCall = false;
     verifyThatConstructorMatchesCall(lookedupConstructor,
                                      selector,
                                      isImplicitSuperCall,
                                      call,
                                      constructorName,

[kasperl, 2012/10/15 07:26:38]

Isn't the constructor name always in lookupSelector.name? Maybe you don't
actually need the constructor name here anymore if you change the
getConstructorName helper to return the selector instead.

[aam-me, 2012/10/15 12:07:52]

Done.

                                      className);
 
     visitor.useElement(call, lookedupConstructor);
     visitor.world.registerStaticUse(lookedupConstructor);
     return lookedupConstructor;
   }
 
   void resolveImplicitSuperConstructorSend(FunctionElement constructor,
                                            FunctionExpression functionNode) {
     // If the class has a super resolve the implicit super call.
@@ skipping 2447 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)';
 }