Consolidate analyzer dependencies.

pkg/front_end/lib/src/fasta/source/diet_listener.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.diet_listener;
 
 import 'package:kernel/ast.dart' show AsyncMarker;
 
 import 'package:kernel/class_hierarchy.dart' show ClassHierarchy;
 
@@ skipping 11 matching lines @@
 import '../util/link.dart' show Link;
 
 import '../errors.dart' show Crash, InputError, inputError, internalError;
 
 import 'stack_listener.dart' show StackListener;
 
 import '../kernel/body_builder.dart' show BodyBuilder;
 
 import '../builder/builder.dart';
 
-import '../analyzer/analyzer.dart';
-
 import '../builder/scope.dart' show Scope;
 
-import '../ast_kind.dart' show AstKind;
-
 import 'source_library_builder.dart' show SourceLibraryBuilder;
 
 import '../kernel/kernel_library_builder.dart' show isConstructorName;
 
 class DietListener extends StackListener {
   final SourceLibraryBuilder library;
 
-  final ElementStore elementStore;
-
   final ClassHierarchy hierarchy;
 
   final CoreTypes coreTypes;
 
-  final AstKind astKind;
-
   final bool isDartLibrary;
 
   ClassBuilder currentClass;
 
   /// For top-level declarations, this is the library scope. For class members,
   /// this is the instance scope of [currentClass].
   Scope memberScope;
 
   @override
   Uri uri;
 
-  DietListener(SourceLibraryBuilder library, this.elementStore, this.hierarchy,
-      this.coreTypes, this.astKind)
+  DietListener(SourceLibraryBuilder library, this.hierarchy, this.coreTypes)
       : library = library,
         uri = library.fileUri,
         memberScope = library.scope,
         isDartLibrary = library.uri.scheme == "dart";
 
   void discard(int n) {
     for (int i = 0; i < n; i++) {
       pop();
     }
   }
@@ skipping 297 matching lines @@
     checkEmpty(beginToken.charOffset);
     if (bodyToken == null) {
       return;
     }
     buildFunctionBody(bodyToken, lookupBuilder(beginToken, getOrSet, name));
   }
 
   StackListener createListener(
       MemberBuilder builder, Scope memberScope, bool isInstanceMember,
       [Scope formalParameterScope]) {
-    switch (astKind) {
-      case AstKind.Kernel:
-        return new BodyBuilder(
-            library,
-            builder,
-            memberScope,
-            formalParameterScope,
-            hierarchy,
-            coreTypes,
-            currentClass,
-            isInstanceMember,
-            uri);
-
-      case AstKind.Analyzer:
-        return new AstBuilder(library, builder, elementStore, memberScope, uri);
-    }
-
-    return internalError("Unknown $astKind");
+    return new BodyBuilder(library, builder, memberScope, formalParameterScope,
+        hierarchy, coreTypes, currentClass, isInstanceMember, uri);
   }
 
   void buildFunctionBody(Token token, ProcedureBuilder builder) {
     Scope typeParameterScope = builder.computeTypeParameterScope(memberScope);
     Scope formalParameterScope =
         builder.computeFormalParameterScope(typeParameterScope);
     assert(typeParameterScope != null);
     assert(formalParameterScope != null);
     parseFunctionBody(
         createListener(builder, typeParameterScope, builder.isInstanceMember,
@@ skipping 69 matching lines @@
     }
     return super.handleUnrecoverableError(token, kind, arguments);
   }
 
   @override
   Link<Token> handleMemberName(Link<Token> identifiers) {
     if (!isDartLibrary || identifiers.isEmpty) return identifiers;
     return removeNativeClause(identifiers);
   }
 
+  AsyncMarker getAsyncMarker(StackListener listener) => listener.pop();
+
   void parseFunctionBody(StackListener listener, Token token) {
     try {
       Parser parser = new Parser(listener);
       token = parser.parseFormalParametersOpt(token);
       var formals = listener.pop();
       listener.checkEmpty(token.charOffset);
       listener.prepareInitializers();
       token = parser.parseInitializersOpt(token);
       token = parser.parseAsyncModifier(token);
-      AsyncMarker asyncModifier =
-          astKind == AstKind.Analyzer ? null : listener.pop();
+      AsyncMarker asyncModifier = getAsyncMarker(listener);
       bool isExpression = false;
       bool allowAbstract = true;
       parser.parseFunctionBody(token, isExpression, allowAbstract);
       var body = listener.pop();
       listener.checkEmpty(token.charOffset);
       listener.finishFunction(formals, asyncModifier, body);
     } on InputError {
       rethrow;
     } catch (e, s) {
       throw new Crash(uri, token.charOffset, e, s);
@@ skipping 49 matching lines @@
   bool get isTargetingDartVm {
     // TODO(ahe): Find a more reliable way to check if this is the Dart VM.
     return !coreTypes.containsLibrary("dart:_js_helper");
   }
 
   @override
   void debugEvent(String name) {
     // printEvent(name);
   }
 }