Track names in DeclarationBuilder.

pkg/front_end/lib/src/fasta/source/source_library_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.source_library_builder;
 
 import 'package:kernel/ast.dart' show
     AsyncMarker,
     ProcedureKind;
 
@@ skipping 94 matching lines @@
   T addVoidType(int charOffset);
 
   ConstructorReferenceBuilder addConstructorReference(
       String name, List<T> typeArguments, String suffix, int charOffset) {
     ConstructorReferenceBuilder ref = new ConstructorReferenceBuilder(name,
         typeArguments, suffix, this, charOffset);
     constructorReferences.add(ref);
     return ref;
   }
 
-  void beginNestedDeclaration({bool hasMembers}) {
+  void beginNestedDeclaration(String name, {bool hasMembers}) {
     currentDeclaration =
-        new DeclarationBuilder(<String, MemberBuilder>{}, currentDeclaration);
+        new DeclarationBuilder(<String, MemberBuilder>{}, name, currentDeclaration);
   }
 
   DeclarationBuilder<T> endNestedDeclaration() {
     DeclarationBuilder<T> previous = currentDeclaration;
     currentDeclaration = currentDeclaration.parent;
     return previous;
   }
 
   Uri resolve(String path) => uri.resolve(path);
 
@@ skipping 44 matching lines @@
     for (String name in names) {
       // TODO(ahe): Get charOffset of name.
       addField(metadata, modifiers, type, name, -1);
     }
   }
 
   void addProcedure(List<MetadataBuilder> metadata,
       int modifiers, T returnType, String name,
       List<TypeVariableBuilder> typeVariables,
       List<FormalParameterBuilder> formals, AsyncMarker asyncModifier,
-      ProcedureKind kind, int charOffset);
+      ProcedureKind kind, int charOffset, {bool isTopLevel});
 
   void addEnum(List<MetadataBuilder> metadata, String name,
       List<String> constants, int charOffset);
 
   void addFunctionTypeAlias(List<MetadataBuilder> metadata,
       T returnType, String name,
       List<TypeVariableBuilder> typeVariables,
       List<FormalParameterBuilder> formals, int charOffset);
 
   void addFactoryMethod(List<MetadataBuilder> metadata,
@@ skipping 170 matching lines @@
 
 /// Unlike [Scope], this scope is used during construction of builders to
 /// ensure types and members are added to and resolved in the correct location.
 class DeclarationBuilder<T extends TypeBuilder> {
   final DeclarationBuilder<T> parent;
 
   final Map<String, Builder> members;
 
   final List<T> types = <T>[];
 
-  DeclarationBuilder(this.members, [this.parent]);
+  final String name;
+
+  DeclarationBuilder(this.members, this.name, [this.parent]);
 
   void addMember(String name, MemberBuilder builder) {
     if (members == null) {
       parent.addMember(name, builder);
     } else {
       members[name] = builder;
     }
   }
 
   MemberBuilder lookupMember(String name) {
@@ skipping 29 matching lines @@
           // parent declaration.
           parent.addType(type);
         } else {
           type.bind(builder);
         }
       }
     }
     types.clear();
   }
 }