Fix scanning of unterminated strings

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;
 
@@ skipping 1016 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,
+        unterminatedString(quoteChar, start,
             asciiOnly: asciiOnly, isMultiLine: false, isRaw: false);
+        return next;
       }
       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 46 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 unterminatedString(quoteChar, start,
+        unterminatedString(quoteChar, start,
             asciiOnly: asciiOnly, isMultiLine: false, isRaw: true);
+        return next;
       } else if (next > 127) {
         asciiOnly = false;
       }
       next = advance();
     }
     if (!asciiOnly) handleUnicode(start);
-    return unterminatedString(quoteChar, start,
+    unterminatedString(quoteChar, start,
         asciiOnly: asciiOnly, isMultiLine: false, isRaw: true);
+    return next;
   }
 
   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 unterminatedString(quoteChar, start,
+    unterminatedString(quoteChar, start,
         asciiOnly: asciiOnlyLine, isMultiLine: true, isRaw: true);
+    return next;
   }
 
   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 unterminatedString(quoteChar, start,
+    unterminatedString(quoteChar, start,
         asciiOnly: asciiOnlyString, isMultiLine: true, isRaw: false);
+    return next;
   }
 
   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);
   }
 
-  int unterminatedString(int quoteChar, int start,
+  void unterminatedString(int quoteChar, int start,
       {bool asciiOnly, bool isMultiLine, bool isRaw}) {
     String suffix = new String.fromCharCodes(
         isMultiLine ? [quoteChar, quoteChar, quoteChar] : [quoteChar]);
     String prefix = isRaw ? 'r$suffix' : suffix;
 
     appendSyntheticSubstringToken(TokenType.STRING, start, asciiOnly, suffix);
-    beginToken();
-    return unterminated(prefix);
+    unterminated(prefix, shouldAdvance: false);
   }
 
   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;
   }
 }