Reapply "Tweak public APIs and use them in patch_sdk, dart2js, and kernel-service.""

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:front_end/src/fasta/type_inference/type_inference_engine.dart'
     show TypeInferenceEngine;
 
 import 'package:front_end/src/fasta/type_inference/type_inference_listener.dart'
     show TypeInferenceListener;
 
 import 'package:front_end/src/fasta/type_inference/type_inferrer.dart'
     show TypeInferrerDisabled;
 
 import 'package:kernel/ast.dart' show AsyncMarker, Class, InterfaceType;
 
 import 'package:kernel/class_hierarchy.dart' show ClassHierarchy;
 
 import 'package:kernel/core_types.dart' show CoreTypes;
 
 import '../fasta_codes.dart' show FastaMessage, codeExpectedBlockToSkip;
 
 import '../parser/parser.dart' show MemberKind, Parser, optional;
 
 import '../../scanner/token.dart' show BeginToken, Token;
 
-import '../parser/dart_vm_native.dart' show removeNativeClause;
+import '../parser/native_support.dart'
+    show removeNativeClause, skipNativeClause;
 
 import '../util/link.dart' show Link;
 
 import '../errors.dart' show Crash, InputError, inputError, internalError;
 
 import 'stack_listener.dart' show NullValue, StackListener;
 
 import '../kernel/body_builder.dart' show BodyBuilder;
 
 import '../builder/builder.dart';
 
 import 'source_library_builder.dart' show SourceLibraryBuilder;
 
 class DietListener extends StackListener {
   final SourceLibraryBuilder library;
 
   final ClassHierarchy hierarchy;
 
   final CoreTypes coreTypes;
 
   final bool enableNative;
 
+  final bool stringExpectedAfterNative;
+
   final TypeInferenceEngine typeInferenceEngine;
 
   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.hierarchy, this.coreTypes,
       this.typeInferenceEngine)
       : library = library,
         uri = library.fileUri,
         memberScope = library.scope,
-        enableNative = library.loader.target.enableNative(library);
+        enableNative =
+            library.loader.target.backendTarget.enableNative(library.uri),
+        stringExpectedAfterNative =
+            library.loader.target.backendTarget.nativeExtensionExpectsString;
 
   void discard(int n) {
     for (int i = 0; i < n; i++) {
       pop();
     }
   }
 
   @override
   void endMetadataStar(int count, bool forParameter) {
     debugEvent("MetadataStar");
@@ skipping 430 matching lines @@
   void endNamedMixinApplication(Token beginToken, Token classKeyword,
       Token equals, Token implementsKeyword, Token endToken) {
     debugEvent("NamedMixinApplication");
     discard(2); // Name and metadata.
     checkEmpty(beginToken.charOffset);
   }
 
   @override
   Token handleUnrecoverableError(Token token, FastaMessage message) {
     if (enableNative && message.code == codeExpectedBlockToSkip) {
-      Token recover = library.loader.target.skipNativeClause(token);
+      Token recover = skipNativeClause(token, stringExpectedAfterNative);
       if (recover != null) return recover;
     }
     return super.handleUnrecoverableError(token, message);
   }
 
   @override
   Link<Token> handleMemberName(Link<Token> identifiers) {
     if (!enableNative || identifiers.isEmpty) return identifiers;
-    return removeNativeClause(identifiers);
+    return removeNativeClause(identifiers, stringExpectedAfterNative);
   }
 
   AsyncMarker getAsyncMarker(StackListener listener) => listener.pop();
 
   void parseFunctionBody(
       StackListener listener, Token token, Token metadata, MemberKind kind) {
     try {
       Parser parser = new Parser(listener);
       List metadataConstants;
       if (metadata != null) {
@@ skipping 71 matching lines @@
         fileUri: message.uri,
         // We assume this error has already been reported by OutlineBuilder.
         silent: true);
   }
 
   @override
   void debugEvent(String name) {
     // printEvent(name);
   }
 }