Made dart2js constructor lookup logic "private"-aware, fixed 4740 bug.

lib/compiler/implementation/elements/elements.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.
 
 #library('elements');
 
 #import('dart:uri');
 
 #import('../tree/tree.dart');
 #import('../scanner/scannerlib.dart');
@@ skipping 1356 matching lines @@
     }
     SourceString fieldName = fieldMember.name;
     while (true) {
       Element foundMember = lookupClass.lookupMember(fieldName);
       if (foundMember == fieldMember) return false;
       if (foundMember.isField()) return true;
       lookupClass = foundMember.getEnclosingClass().superclass;
     }
   }
 
-  Element lookupConstructor(SourceString className,
-                            [SourceString constructorName =
-                                 const SourceString(''),
-                            Element noMatch(Element)]) {
+  Element lookupConstructor(Selector selector, [Element noMatch(Element)]) {
     // TODO(karlklose): have a map from class names to a map of constructors
     //                  instead of creating the name here?
-    SourceString normalizedName;
-    if (constructorName !== const SourceString('')) {
-      normalizedName = Elements.constructConstructorName(className,
-                                                         constructorName);
-    } else {
-      normalizedName = className;
-    }
+    SourceString normalizedName =
+        Elements.constructConstructorNameFromOneName(selector.name);
+
     Element result = localLookup(normalizedName);
-    if (result === null || !result.isConstructor()) {
+
+    if (result === null
+        || !result.isConstructor()
+        || (selector.isPrivate() && result.getLibrary() != selector.library)) {
       result = noMatch !== null ? noMatch(result) : null;
     }
     return result;
   }
 
   bool get hasConstructor {
     // Search in scope to be sure we search patched constructors.
     for (var element in localScope.getValues()) {
       if (element.isConstructor()) return true;
     }
@@ skipping 186 matching lines @@
     return isLocal(element);
   }
 
   static SourceString constructConstructorName(SourceString receiver,
                                                SourceString selector) {
     String r = receiver.slowToString();
     String s = selector.slowToString();
     return new SourceString('$r\$$s');
   }
 
+  static SourceString constructConstructorNameFromOneName(SourceString name) {

[kasperl, 2012/09/24 05:52:38]

Somehow it would be simpler if the name stored in the selector was the
normalized one. Where do we need it to contain the dot?

[ahe, 2012/09/24 06:43:31]

I'm uncomfortable about adding this method. The method above,
"constructConstructorName", should be sufficient (but is a hack).

[aam-me, 2012/09/25 04:15:18]

Okay, got rid of the method and storing normalized name in Selector now.
Dotted names are needed for diagnostic only, it seems.

+    var strName = name.slowToString();

[kasperl, 2012/09/24 05:52:38]

Try to avoid abbreviations. I'd go for dotIndex and nameString in this case.

+    var ndxDot = strName.indexOf(".");
+    if (ndxDot >= 0) {
+      return new SourceString(
+          '${strName.substring(0, ndxDot)}\$'
+          '${strName.substring(ndxDot + 1, strName.length)}');
+    } else {
+      return name;
+    }
+  }
+
   static const SourceString OPERATOR_EQUALS =
       const SourceString(@'operator$eq');
 
   static SourceString constructOperatorName(SourceString selector,
                                             bool isUnary) {
     String str = selector.stringValue;
     if (str === '==' || str === '!=') return OPERATOR_EQUALS;
 
     if (str === '~') {
       str = 'not';
@@ skipping 182 matching lines @@
 
   MetadataAnnotation ensureResolved(Compiler compiler) {
     if (resolutionState == STATE_NOT_STARTED) {
       compiler.resolver.resolveMetadataAnnotation(this);
     }
     return this;
   }
 
   String toString() => 'MetadataAnnotation($value, $resolutionState)';
 }