Pay some naming debt.

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 29 matching lines @@
     ProcedureBuilder,
     TypeBuilder,
     TypeDeclarationBuilder,
     TypeVariableBuilder,
     Unhandled;
 
 abstract class SourceLibraryBuilder<T extends TypeBuilder, R>
     extends LibraryBuilder<T, R> {
   final SourceLoader loader;
 
-  final BuilderScope<T> libraryScope = new BuilderScope<T>(<String, Builder>{});
+  final DeclarationBuilder<T> libraryDeclaration =
+      new DeclarationBuilder<T>(<String, Builder>{}, null);
 
   final List<ConstructorReferenceBuilder> constructorReferences =
       <ConstructorReferenceBuilder>[];
 
   final List<LibraryBuilder> parts = <LibraryBuilder>[];
 
   final List<Import> imports = <Import>[];
 
   final Map<String, Builder> exports = <String, Builder>{};
 
   final Scope scope = new Scope(<String, Builder>{}, null, isModifiable: false);
 
   final Uri fileUri;
 
   String name;
 
   String partOf;
 
   List<MetadataBuilder> metadata;
 
   /// The current declaration that is being built. When we start parsing a
   /// declaration (class, method, and so on), we don't have enough information
   /// to create a builder and this object records its members and types until,
   /// for example, [addClass] is called.
-  BuilderScope<T> innerScope;
+  DeclarationBuilder<T> currentDeclaration;
 
-  SourceLibraryBuilder(this.loader, this.fileUri);
+  SourceLibraryBuilder(this.loader, this.fileUri) {
+    currentDeclaration = libraryDeclaration;
+  }
 
   Uri get uri;
 
   bool get isPart => partOf != null;
 
-  Map<String, Builder> get members => libraryScope.members;
+  Map<String, Builder> get members => libraryDeclaration.members;
 
-  List<T> get types => libraryScope.types;
-
-  BuilderScope<T> get builderScope => innerScope ?? libraryScope;
+  List<T> get types => libraryDeclaration.types;
 
   /// When parsing a class, this returns a map of its members (that have been
   /// parsed so far).
   Map<String, MemberBuilder> get classMembers {
-    assert(innerScope == builderScope);
-    assert(innerScope.parent == libraryScope);
-    return builderScope.members;
+    assert(currentDeclaration.parent == libraryDeclaration);
+    return currentDeclaration.members;
   }
 
   List<T> get declarationTypes {
-    assert(innerScope == builderScope);
-    assert(innerScope.parent == libraryScope);
-    return builderScope.types;
+    assert(currentDeclaration.parent == libraryDeclaration);
+    return currentDeclaration.types;
   }
 
-  T addInterfaceType(String name, List<T> arguments);
+  T addNamedType(String name, List<T> arguments);
 
   T addMixinApplication(T supertype, List<T> mixins);
 
   T addType(T type) {
-    builderScope.addType(type);
+    currentDeclaration.addType(type);
     return type;
   }
 
   T addVoidType();
 
   ConstructorReferenceBuilder addConstructorReference(
       String name, List<T> typeArguments, String suffix) {
     ConstructorReferenceBuilder ref =
         new ConstructorReferenceBuilder(name, typeArguments, suffix);
     constructorReferences.add(ref);
     return ref;
   }
 
-  void beginNestedScope({bool hasMembers}) {
-    innerScope = new BuilderScope(<String, MemberBuilder>{}, builderScope);
+  void beginNestedDeclaration({bool hasMembers}) {
+    currentDeclaration =
+        new DeclarationBuilder(<String, MemberBuilder>{}, currentDeclaration);
   }
 
-  BuilderScope<T> endNestedScope() {
-    BuilderScope<T> previous = innerScope;
-    innerScope = innerScope.parent;
+  DeclarationBuilder<T> endNestedDeclaration() {
+    DeclarationBuilder<T> previous = currentDeclaration;
+    currentDeclaration = currentDeclaration.parent;
     return previous;
   }
 
   Uri resolve(String path) => uri.resolve(path);
 
   void addExport(List<MetadataBuilder> metadata, String uri,
       Unhandled conditionalUris, List<Combinator> combinators) {
     loader.read(resolve(uri)).addExporter(this, combinators);
   }
 
@@ skipping 61 matching lines @@
   FormalParameterBuilder addFormalParameter(
       List<MetadataBuilder> metadata, int modifiers,
       T type, String name, bool hasThis);
 
   TypeVariableBuilder addTypeVariable(String name, T bound);
 
   Builder addBuilder(String name, Builder builder) {
     // TODO(ahe): Set the parent correctly here. Could then change the
     // implementation of MemberBuilder.isTopLevel to test explicitly for a
     // LibraryBuilder.
-    if (builderScope == libraryScope) {
+    if (currentDeclaration == libraryDeclaration) {
       if (builder is MemberBuilder) {
         builder.parent = this;
       } else if (builder is TypeDeclarationBuilder) {
         builder.parent = this;
       } else if (builder is PrefixBuilder) {
         assert(builder.parent == this);
       } else {
         return internalError("Unhandled: ${builder.runtimeType}");
       }
     } else {
-      assert(builderScope.parent == libraryScope);
+      assert(currentDeclaration.parent == libraryDeclaration);
     }
-    Map<String, Builder> members = builderScope.members;
+    Map<String, Builder> members = currentDeclaration.members;
     Builder existing = members[name];
     builder.next = existing;
     if (builder is PrefixBuilder && existing is PrefixBuilder) {
       assert(existing.next == null);
       builder.exports.forEach((String name, Builder builder) {
         Builder other = existing.exports.putIfAbsent(name, () => builder);
         if (other != builder) {
           existing.exports[name] =
               other.combineAmbiguousImport(name, builder, this);
         }
@@ skipping 123 matching lines @@
     int count = 0;
     members.forEach((String name, Builder member) {
       count += member.resolveConstructors(this);
     });
     return count;
   }
 }
 
 /// 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 BuilderScope<T extends TypeBuilder> {
-  final BuilderScope<T> parent;
+class DeclarationBuilder<T extends TypeBuilder> {
+  final DeclarationBuilder<T> parent;
 
   final Map<String, Builder> members;
 
   final List<T> types = <T>[];
 
-  BuilderScope(this.members, [this.parent]);
+  DeclarationBuilder(this.members, [this.parent]);
 
   void addMember(String name, MemberBuilder builder) {
     if (members == null) {
       parent.addMember(name, builder);
     } else {
       members[name] = builder;
     }
   }
 
   MemberBuilder lookupMember(String name) {
     return members == null ? parent.lookupMember(name) : members[name];
   }
 
   void addType(T type) {
     types.add(type);
   }
 
   /// Resolves type variables in [types] and propagate other types to [parent].
   void resolveTypes(List<TypeVariableBuilder> typeVariables) {
     // TODO(ahe): The input to this method, [typeVariables], shouldn't be just
     // type variables. It should be everything that's in scope, for example,
     // members (of a class) or formal parameters (of a method).
     if (typeVariables == null) {
       // If there are no type variables in the scope, propagate our types to be
-      // resolved in the parent scope.
+      // resolved in the parent declaration.
       parent.types.addAll(types);
     } else {
       Map<String, TypeVariableBuilder> map = <String, TypeVariableBuilder>{};
       for (TypeVariableBuilder builder in typeVariables) {
         map[builder.name] = builder;
       }
       for (T type in types) {
         String name = type.name;
         TypeVariableBuilder builder;
         if (name != null) {
           builder = map[name];
         }
         if (builder == null) {
           // Since name didn't resolve in this scope, propagate it to the
-          // parent scope.
+          // parent declaration.
           parent.addType(type);
         } else {
           type.bind(builder);
         }
       }
     }
     types.clear();
   }
 }