Correct lookup scope for subclasses of mixin application.

pkg/compiler/lib/src/elements/modelx.dart

 // Copyright (c) 2013, 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.modelx;
 
 import '../common.dart';
 import '../common/resolution.dart' show Resolution, Parsing;
 import '../compiler.dart' show Compiler;
 import '../constants/constant_constructors.dart';
@@ skipping 2828 matching lines @@
 }
 
 abstract class MixinApplicationElementX extends BaseClassElementX
     with MixinApplicationElementCommon
     implements MixinApplicationElement {
   Link<ConstructorElement> constructors = const Link<ConstructorElement>();
   Link<Element> members = const Link<Element>();
 
   InterfaceType mixinType;
 
+  final ScopeX localScope = new ScopeX();
+
   MixinApplicationElementX(String name, Element enclosing, int id)
       : super(name, enclosing, id, STATE_NOT_STARTED);
 
   ClassElement get mixin => mixinType != null ? mixinType.element : null;
 
   bool get isMixinApplication => true;
   bool get hasConstructor => !constructors.isEmpty;
-  bool get hasLocalScopeMembers => !constructors.isEmpty;
+  bool get hasLocalScopeMembers {
+    return constructors.isNotEmpty || members.isNotEmpty;
+  }
 
   get patch => null;
   get origin => null;
 
   bool get hasNode => true;
 
   Token get position => node.getBeginToken();
 
   Node parseNode(Parsing parsing) => node;
 
   void addMember(Element element, DiagnosticReporter reporter) {
     members = members.prepend(element);
+    addToScope(element, reporter);
   }
 
   void addToScope(Element element, DiagnosticReporter reporter) {
-    reporter.internalError(this, 'Cannot add to scope of $this.');
+    localScope.add(element, reporter);
   }
 
   void addConstructor(FunctionElement constructor) {
     constructors = constructors.prepend(constructor);
   }
 
   void setDefaultConstructor(
       FunctionElement constructor, DiagnosticReporter reporter) {
     assert(!hasConstructor);
     addConstructor(constructor);
@@ skipping 20 matching lines @@
     members.forEach(f);
   }
 
   buildScope() {
     Scope parentScope = mixin?.buildScope();
     if (parentScope == null) {
       parentScope = new NoScope();
     }
     return new MixinApplicationScope(parentScope, this);
   }
+
+  Element localLookup(String name) {
+    for (Link<Element> link = constructors; !link.isEmpty; link = link.tail) {
+      if (link.head.name == name) return link.head;
+    }
+    return localScope.lookup(name);
+  }
 }
 
 class NamedMixinApplicationElementX extends MixinApplicationElementX
     implements DeclarationSite {
   final NamedMixinApplication node;
 
   NamedMixinApplicationElementX(
       String name, CompilationUnitElement enclosing, int id, this.node)
       : super(name, enclosing, id);
 
@@ skipping 232 matching lines @@
 
   bool get hasResolvedAst {
     return definingElement.hasNode && definingElement.hasTreeElements;
   }
 
   ResolvedAst get resolvedAst {
     return new ResolvedAst(
         declaration, definingElement.node, definingElement.treeElements);
   }
 }