Revert "improve fasta unterminated string recovery"

pkg/front_end/lib/src/fasta/scanner/abstract_scanner.dart

 // Copyright (c) 2012, 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.scanner.abstract_scanner;
 
 import 'dart:collection' show ListMixin;
 
 import 'dart:typed_data' show Uint16List, Uint32List;
 
-import '../../scanner/token.dart'
-    show BeginToken, SyntheticStringToken, Token, TokenType;
+import '../../scanner/token.dart' show BeginToken, Token, TokenType;
 
 import '../scanner.dart'
     show ErrorToken, Keyword, Scanner, buildUnexpectedCharacterToken;
 
 import 'error_token.dart' show UnterminatedToken;
 
 import 'keyword_state.dart' show KeywordState;
 
 import 'token.dart' show CommentToken, DartDocToken;
 
@@ skipping 995 matching lines @@
         next = tokenizeStringInterpolation(start, asciiOnly);
         start = scanOffset;
         asciiOnly = true;
         continue;
       }
       if (next <= $CR &&
           (identical(next, $LF) ||
               identical(next, $CR) ||
               identical(next, $EOF))) {
         if (!asciiOnly) handleUnicode(start);
-        return unterminatedString(quoteChar, start, asciiOnly);
+        return unterminatedString(quoteChar);
       }
       if (next > 127) asciiOnly = false;
       next = advance();
     }
     if (!asciiOnly) handleUnicode(start);
     // Advance past the quote character.
     next = advance();
     appendSubstringToken(TokenType.STRING, start, asciiOnly);
     return next;
   }
@@ skipping 44 matching lines @@
   int tokenizeSingleLineRawString(int next, int quoteChar, int start) {
     bool asciiOnly = true;
     while (next != $EOF) {
       if (identical(next, quoteChar)) {
         if (!asciiOnly) handleUnicode(start);
         next = advance();
         appendSubstringToken(TokenType.STRING, start, asciiOnly);
         return next;
       } else if (identical(next, $LF) || identical(next, $CR)) {
         if (!asciiOnly) handleUnicode(start);
-        return unterminatedRawString(quoteChar, start, asciiOnly);
+        return unterminatedRawString(quoteChar);
       } else if (next > 127) {
         asciiOnly = false;
       }
       next = advance();
     }
     if (!asciiOnly) handleUnicode(start);
-    return unterminatedRawString(quoteChar, start, asciiOnly);
+    return unterminatedRawString(quoteChar);
   }
 
   int tokenizeMultiLineRawString(int quoteChar, int start) {
     bool asciiOnlyString = true;
     bool asciiOnlyLine = true;
     int unicodeStart = start;
     int next = advance(); // Advance past the (last) quote (of three).
     outer:
     while (!identical(next, $EOF)) {
       while (!identical(next, quoteChar)) {
@@ skipping 17 matching lines @@
         next = advance();
         if (identical(next, quoteChar)) {
           if (!asciiOnlyLine) handleUnicode(unicodeStart);
           next = advance();
           appendSubstringToken(TokenType.STRING, start, asciiOnlyString);
           return next;
         }
       }
     }
     if (!asciiOnlyLine) handleUnicode(unicodeStart);
-    return unterminatedRawMultiLineString(quoteChar, start, asciiOnlyLine);
+    return unterminatedRawMultiLineString(quoteChar);
   }
 
   int tokenizeMultiLineString(int quoteChar, int start, bool raw) {
     if (raw) return tokenizeMultiLineRawString(quoteChar, start);
     bool asciiOnlyString = true;
     bool asciiOnlyLine = true;
     int unicodeStart = start;
     int next = advance(); // Advance past the (last) quote (of three).
     while (!identical(next, $EOF)) {
       if (identical(next, $$)) {
@@ skipping 30 matching lines @@
           unicodeStart = scanOffset;
         }
         lineFeedInMultiline();
       } else if (next > 127) {
         asciiOnlyString = false;
         asciiOnlyLine = false;
       }
       next = advance();
     }
     if (!asciiOnlyLine) handleUnicode(unicodeStart);
-    return unterminatedMultiLineString(quoteChar, start, asciiOnlyString);
+    return unterminatedMultiLineString(quoteChar);
   }
 
   int unexpected(int character) {
     appendErrorToken(buildUnexpectedCharacterToken(character, tokenStart));
     return advanceAfterError(true);
   }
 
   int unterminated(String prefix, {bool shouldAdvance: true}) {
     appendErrorToken(new UnterminatedToken(prefix, tokenStart, stringOffset));
     return advanceAfterError(shouldAdvance);
   }
 
-  void terminateUnterminatedString(
-      int start, bool asciiOnlyString, String suffix) {
-    if (start < scanOffset) {
-      appendSubstringToken(TokenType.STRING, start, asciiOnlyString);
-    }
-    beginToken();
-    appendToken(
-        new SyntheticStringToken(TokenType.STRING, suffix, tokenStart, 0));
+  int unterminatedString(int quoteChar) {
+    return unterminated(new String.fromCharCodes([quoteChar]));
   }
 
-  int unterminatedString(int quoteChar, int start, bool asciiOnlyString) {
-    String suffix = new String.fromCharCodes([quoteChar]);
-    terminateUnterminatedString(start, asciiOnlyString, suffix);
-    return unterminated(suffix);
+  int unterminatedRawString(int quoteChar) {
+    return unterminated('r${new String.fromCharCodes([quoteChar])}');
   }
 
-  int unterminatedRawString(int quoteChar, int start, bool asciiOnlyString) {
-    String suffix = new String.fromCharCodes([quoteChar]);
-    terminateUnterminatedString(start, asciiOnlyString, suffix);
-    return unterminated('r$suffix');
+  int unterminatedMultiLineString(int quoteChar) {
+    return unterminated(
+        new String.fromCharCodes([quoteChar, quoteChar, quoteChar]));
   }
 
-  int unterminatedMultiLineString(
-      int quoteChar, int start, bool asciiOnlyString) {
-    String suffix = new String.fromCharCodes([quoteChar, quoteChar, quoteChar]);
-    terminateUnterminatedString(start, asciiOnlyString, suffix);
-    return unterminated(suffix);
-  }
-
-  int unterminatedRawMultiLineString(
-      int quoteChar, int start, bool asciiOnlyString) {
-    String suffix = new String.fromCharCodes([quoteChar, quoteChar, quoteChar]);
-    terminateUnterminatedString(start, asciiOnlyString, suffix);
-    return unterminated('r$suffix');
+  int unterminatedRawMultiLineString(int quoteChar) {
+    return unterminated(
+        'r${new String.fromCharCodes([quoteChar, quoteChar, quoteChar])}');
   }
 
   int advanceAfterError(bool shouldAdvance) {
     if (atEndOfFile()) return $EOF;
     if (shouldAdvance) {
       return advance(); // Ensure progress.
     } else {
       return -1;
     }
   }
@@ skipping 78 matching lines @@
       switchToUint32(newLength);
     }
   }
 
   void switchToUint32(int newLength) {
     final newArray = new Uint32List(newLength);
     newArray.setRange(0, arrayLength, array);
     array = newArray;
   }
 }