Prepare for separate setter scope.

pkg/front_end/lib/src/fasta/builder/class_builder.dart

 // Copyright (c) 2016, 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 fasta.class_builder;
 
 import '../errors.dart' show internalError;
 
 import 'builder.dart'
     show
         Builder,
         ConstructorReferenceBuilder,
         LibraryBuilder,
+        MemberBuilder,
         MetadataBuilder,
         MixinApplicationBuilder,
         NamedTypeBuilder,
         TypeBuilder,
         TypeDeclarationBuilder,
         TypeVariableBuilder;
 
 import '../scope.dart' show AccessErrorBuilder, AmbiguousBuilder, Scope;
 
 abstract class ClassBuilder<T extends TypeBuilder, R>
@@ skipping 43 matching lines @@
     }
     return constructorReferences.length;
   }
 
   Scope computeInstanceScope(Scope parent) {
     if (typeVariables != null) {
       Map<String, Builder> local = <String, Builder>{};
       for (TypeVariableBuilder t in typeVariables) {
         local[t.name] = t;
       }
-      parent = new Scope(local, parent, isModifiable: false);
+      parent = new Scope(local, null, parent, isModifiable: false);
     }
-    return new Scope(membersInScope, parent, isModifiable: false);
+    return new Scope(membersInScope, null, parent, isModifiable: false);
   }
 
   /// Used to lookup a static member of this class.
   Builder findStaticBuilder(String name, int charOffset, Uri fileUri,
       {bool isSetter: false}) {
     Builder builder = members[name];
     if (builder?.next != null) {
       Builder getterBuilder;
       Builder setterBuilder;
       Builder current = builder;
@@ skipping 26 matching lines @@
     }
     if (builder == null) {
       return null;
     } else if (isSetter && builder.isGetter) {
       return null;
     } else {
       return builder.isInstanceMember ? null : builder;
     }
   }
 
-  Builder findConstructorOrFactory(String name);
+  Builder findConstructorOrFactory(String name, int charOffset, Uri uri) {
+    return constructors[name];
+  }
 
   /// Returns a map which maps the type variables of [superclass] to their
   /// respective values as defined by the superclass clause of this class (and
   /// its superclasses).
   ///
   /// It's assumed that [superclass] is a superclass of this class.
   ///
   /// For example, given:
   ///
   ///     class Box<T> {}
@@ skipping 44 matching lines @@
             argument = argument.subst(substitutionMap);
           }
           directSubstitutionMap[variables[i]] = argument;
         }
         substitutionMap = directSubstitutionMap;
       }
     }
     return substitutionMap;
   }
 
+  void forEach(void f(String name, MemberBuilder builder)) {
+    members.forEach(f);
+  }
+
+  /// Don't use for scope lookup. Only use when an element is known to exist
+  /// (and isn't a setter).
+  MemberBuilder operator [](String name) {
+    // TODO(ahe): Rename this to getLocalMember.
+    return members[name] ?? internalError("Not found: '$name'.");
+  }
+
   void addCompileTimeError(int charOffset, String message) {
     library.addCompileTimeError(charOffset, message, fileUri: fileUri);
   }
 
   void addWarning(int charOffset, String message) {
     library.addWarning(charOffset, message, fileUri: fileUri);
   }
 
   void addNit(int charOffset, String message) {
     library.addNit(charOffset, message, fileUri: fileUri);
   }
 }