Fix field-accesses for private fields that were "shadowed" by other private fields.

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 1041 matching lines @@
   /**
    * Lookup local members in the class. This will ignore constructors.
    */
   Element lookupLocalMember(SourceString memberName) {
     var result = localLookup(memberName);
     if (result !== null && result.isConstructor()) return null;
     return result;
   }
 
   /**
-  * Lookup super members for the class. This will ignore constructors.
+   * Lookup super members for the class. This will ignore constructors.
    */
   Element lookupSuperMember(SourceString memberName) {
+    return lookupSuperMemberInLibrary(memberName, getLibrary());
+  }
+
+  /**
+   * Lookup super members for the class that is accessible in [library].
+   * This will ignore constructors.
+   */
+  Element lookupSuperMemberInLibrary(SourceString memberName,
+                                     LibraryElement library) {
     bool isPrivate = memberName.isPrivate();
     for (ClassElement s = superclass; s != null; s = s.superclass) {
       // Private members from a different library are not visible.
-      if (isPrivate && getLibrary() !== s.getLibrary()) continue;
+      if (isPrivate && library !== s.getLibrary()) continue;
       Element e = s.lookupLocalMember(memberName);
       if (e === null) continue;
       // Static members are not inherited.
       if (e.modifiers.isStatic()) continue;
       return e;
     }
     if (isInterface()) {
       return lookupSuperInterfaceMember(memberName, getLibrary());
     }
     return null;
   }
 
   Element lookupSuperInterfaceMember(SourceString memberName,
                                      LibraryElement fromLibrary) {
     bool isPrivate = memberName.isPrivate();
     for (Type t in interfaces) {
       Element e = t.element.lookupLocalMember(memberName);
       if (e === null) continue;
       // Private members from a different library are not visible.
       if (isPrivate && fromLibrary !== e.getLibrary()) continue;
       // Static members are not inherited.
       if (e.modifiers.isStatic()) continue;
       return e;
     }
     return null;
   }
 
   /**
+   * Find the first member in the class chain with the given [selector].
+   *
+   * This method is NOT to be used for resolving
+   * unqualified sends because it does not implement the scoping
+   * rules, where library scope comes before superclass scope.
+   */
+  Element lookupSelector(Selector selector) {
+    SourceString memberName = selector.name;
+    LibraryElement library = selector.library;
+    Element localMember = lookupLocalMember(memberName);
+    if (localMember != null &&
+        (!memberName.isPrivate() || getLibrary() == library)) {
+      return localMember;
+    }
+    return lookupSuperMemberInLibrary(memberName, library);
+  }
+
+  /**
    * Find the first member in the class chain with the given
    * [memberName]. This method is NOT to be used for resolving
    * unqualified sends because it does not implement the scoping
    * rules, where library scope comes before superclass scope.
    */
   Element lookupMember(SourceString memberName) {
     Element localMember = lookupLocalMember(memberName);
     return localMember === null ? lookupSuperMember(memberName) : localMember;
   }
 
@@ skipping 345 matching lines @@
   Node parseNode(compiler) => cachedNode;
 
   String toString() => "${enclosingElement.toString()}.${name.slowToString()}";
 
   TypeVariableElement cloneTo(Element enclosing, DiagnosticListener listener) {
     TypeVariableElement result =
         new TypeVariableElement(name, enclosing, node, type, bound);
     return result;
   }
 }