Track names in DeclarationBuilder.

pkg/front_end/lib/src/fasta/source/outline_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.outline_builder;
 
 import 'package:kernel/ast.dart' show
     AsyncMarker,
     ProcedureKind;
 
@@ skipping 176 matching lines @@
   void endLibraryName(Token libraryKeyword, Token semicolon) {
     debugEvent("endLibraryName");
     String name = pop();
     List<MetadataBuilder> metadata = pop();
     library.name = name;
     library.metadata = metadata;
   }
 
   @override
   void beginClassDeclaration(Token begin, Token name) {
-    library.beginNestedDeclaration();
+    library.beginNestedDeclaration(name.value);
   }
 
   @override
   void endClassDeclaration(int interfacesCount, Token beginToken,
       Token extendsKeyword, Token implementsKeyword, Token endToken) {
     debugEvent("endClassDeclaration");
     List<TypeBuilder> interfaces = popList(interfacesCount);
     TypeBuilder supertype = pop();
     List<TypeVariableBuilder> typeVariables = pop();
     String name = pop();
     int modifiers = Modifier.validate(pop());
     List<MetadataBuilder> metadata = pop();
     library.addClass(metadata, modifiers, name, typeVariables, supertype,
         interfaces, beginToken.charOffset);
     checkEmpty();
   }
 
   ProcedureKind computeProcedureKind(Token token) {
     if (token == null) return ProcedureKind.Method;
     if (optional("get", token)) return ProcedureKind.Getter;
     if (optional("set", token)) return ProcedureKind.Setter;
     return internalError("Unhandled: ${token.value}");
   }
 
   @override
   void beginTopLevelMethod(Token token, Token name) {
-    library.beginNestedDeclaration(hasMembers: false);
+    library.beginNestedDeclaration(name.value, hasMembers: false);
   }
 
   @override
   void endTopLevelMethod(
       Token beginToken, Token getOrSet, Token endToken) {
     debugEvent("endTopLevelMethod");
     MethodBody kind = pop();
     AsyncMarker asyncModifier = pop();
     List<FormalParameterBuilder> formals = pop();
     List<TypeVariableBuilder> typeVariables = pop();
     String name = pop();
     TypeBuilder returnType = pop();
     int modifiers = Modifier.validate(pop(),
         isAbstract: kind == MethodBody.Abstract);
     List<MetadataBuilder> metadata = pop();
     checkEmpty();
     library.addProcedure(metadata, modifiers, returnType, name,
         typeVariables, formals, asyncModifier, computeProcedureKind(getOrSet),
-        beginToken.charOffset);
+        beginToken.charOffset, isTopLevel: true);
   }
 
   @override
   void handleNoFunctionBody(Token token) {
     debugEvent("NoFunctionBody");
     push(MethodBody.Abstract);
   }
 
   @override
   void handleFunctionBodySkipped(Token token) {
     debugEvent("handleFunctionBodySkipped");
     push(MethodBody.Regular);
   }
 
   @override
   void beginMethod(Token token, Token name) {
-    library.beginNestedDeclaration(hasMembers: false);
+    library.beginNestedDeclaration(name.value, hasMembers: false);
   }
 
   @override
   void endMethod(Token getOrSet, Token beginToken, Token endToken) {
     debugEvent("Method");
     MethodBody bodyKind = pop();
     if (bodyKind == MethodBody.RedirectingFactoryBody) {
       // This will cause an error later.
       pop();
     }
@@ skipping 11 matching lines @@
       kind = ProcedureKind.Operator;
     } else {
       name = nameOrOperator;
       kind = computeProcedureKind(getOrSet);
     }
     TypeBuilder returnType = pop();
     int modifiers = Modifier.validate(pop(),
         isAbstract: bodyKind == MethodBody.Abstract);
     List<MetadataBuilder> metadata = pop();
     library.addProcedure(metadata, modifiers, returnType, name, typeVariables,
-        formals, asyncModifier, kind, beginToken.charOffset);
+        formals, asyncModifier, kind, beginToken.charOffset, isTopLevel: false);
   }
 
   @override
   void endMixinApplication() {
     debugEvent("MixinApplication");
     List<TypeBuilder> mixins = pop();
     TypeBuilder supertype = pop();
     push(library.addMixinApplication(supertype, mixins, -1));
   }
 
   @override
   void beginNamedMixinApplication(Token begin, Token name) {
-    library.beginNestedDeclaration(hasMembers: false);
+    library.beginNestedDeclaration(name.value, hasMembers: false);
   }
 
   @override
   void endNamedMixinApplication(
       Token classKeyword, Token implementsKeyword, Token endToken) {
     debugEvent("endNamedMixinApplication");
     List<TypeBuilder> interfaces = popIfNotNull(implementsKeyword);
     TypeBuilder mixinApplication = pop();
     List<TypeVariableBuilder> typeVariables = pop();
     String name = pop();
@@ skipping 111 matching lines @@
   void endEnum(Token enumKeyword, Token endBrace, int count) {
     List<String> constants = popList(count);
     String name = pop();
     List<MetadataBuilder> metadata = pop();
     library.addEnum(metadata, name, constants, enumKeyword.charOffset);
     checkEmpty();
   }
 
   @override
   void beginFunctionTypeAlias(Token token) {
-    library.beginNestedDeclaration(hasMembers: false);
+    library.beginNestedDeclaration(null, hasMembers: false);
   }
 
   @override
   void endFunctionTypeAlias(Token typedefKeyword, Token endToken) {
     debugEvent("endFunctionTypeAlias");
     List<FormalParameterBuilder> formals = pop();
     List<TypeVariableBuilder> typeVariables = pop();
     String name = pop();
     TypeBuilder returnType = pop();
     List<MetadataBuilder> metadata = pop();
@@ skipping 137 matching lines @@
   Link<Token> handleMemberName(Link<Token> identifiers) {
     if (!isDartLibrary || identifiers.isEmpty) return identifiers;
     return removeNativeClause(identifiers);
   }
 
   @override
   void debugEvent(String name) {
     // printEvent(name);
   }
 }