Prepare for separate setter scope.

pkg/front_end/lib/src/fasta/kernel/body_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.body_builder;
 
 import '../fasta_codes.dart'
     show FastaMessage, codeExpectedButGot, codeExpectedFunctionBody;
 
 import '../parser/parser.dart' show FormalParameterType, optional;
@@ skipping 291 matching lines @@
   }
 
   void doFields(int count) {
     for (int i = 0; i < count; i++) {
       Expression initializer = pop();
       Identifier identifier = pop();
       if (initializer != null) {
         String name = identifier.name;
         FieldBuilder field;
         if (classBuilder != null) {
-          field = classBuilder.members[name];
+          field = classBuilder[name];
         } else {
-          field = library.members[name];
+          field = library[name];
         }
         if (field.next != null) {
           // TODO(ahe): This can happen, for example, if a final field is
           // combined with a setter.
           internalError(
               "Unhandled: '${field.name}' has more than one declaration.");
         }
         field.initializer = initializer;
       }
     }
@@ skipping 20 matching lines @@
     }
   }
 
   @override
   void prepareInitializers() {
     scope = formalParameterScope;
     assert(fieldInitializers.isEmpty);
     final member = this.member;
     if (member is KernelConstructorBuilder) {
       Constructor constructor = member.constructor;
-      classBuilder.members.forEach((String name, Builder builder) {
+      classBuilder.forEach((String name, Builder builder) {
         if (builder is KernelFieldBuilder && builder.isInstanceMember) {
           // TODO(ahe): Compute initializers (as in `field = initializer`).
           fieldInitializers[name] = new FieldInitializer(builder.field, null)
             ..parent = constructor;
         }
       });
       if (member.formals != null) {
         for (KernelFormalParameterBuilder formal in member.formals) {
           if (formal.hasThis) {
             FieldInitializer initializer = fieldInitializers[formal.name];
@@ skipping 1415 matching lines @@
         return;
       }
 
       if (typeArguments != null) {
         assert(arguments.types.isEmpty);
         arguments.types.addAll(typeArguments);
       }
 
       String errorName;
       if (type is ClassBuilder) {
-        Builder b = type.findConstructorOrFactory(name);
+        Builder b = type.findConstructorOrFactory(name, token.charOffset, uri);
         Member target;
         if (b == null) {
           // Not found. Reported below.
         } else if (b.isConstructor) {
           if (type.isAbstract) {
             push(evaluateArgumentsBefore(
                 arguments,
                 buildAbstractClassInstantiationError(
                     type.name, nameToken.charOffset)));
             return;
@@ skipping 1078 matching lines @@
     for (VariableDeclaration parameter in required) {
       local[parameter.name] =
           new KernelVariableBuilder(parameter, builder, builder.fileUri);
     }
     if (optional != null) {
       for (VariableDeclaration parameter in optional.formals) {
         local[parameter.name] =
             new KernelVariableBuilder(parameter, builder, builder.fileUri);
       }
     }
-    return new Scope(local, parent, isModifiable: false);
+    return new Scope(local, null, parent, isModifiable: false);
   }
 }
 
 /// Returns a block like this:
 ///
 ///     {
 ///       statement;
 ///       body;
 ///     }
 ///
@@ skipping 23 matching lines @@
   } else if (node is PrefixBuilder) {
     return node.name;
   } else if (node is ThisAccessor) {
     return node.isSuper ? "super" : "this";
   } else if (node is FastaAccessor) {
     return node.plainNameForRead;
   } else {
     return internalError("Unhandled: ${node.runtimeType}");
   }
 }