prepend unterminated comment error token and others

Dan Rubel · commit-bot@chromium.org · commit c62bd8f3f424 · 2019-07-24T18:38:43.000Z
Change-Id: I18fd270e9b74e1fd94403ef90f275001983aa86d Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/110180 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/front_end/lib/src/fasta/scanner/abstract_scanner.dart b/pkg/front_end/lib/src/fasta/scanner/abstract_scanner.dart
@@ -1172,7 +1172,7 @@ abstract class AbstractScanner implements Scanner {
           } else {
             if (!hasExponentDigits) {
               appendSyntheticSubstringToken(TokenType.DOUBLE, start, true, '0');
-              appendErrorToken(new UnterminatedToken(
+              prependErrorToken(new UnterminatedToken(
                   messageMissingExponent, tokenStart, stringOffset));
               return next;
             }
@@ -1353,7 +1353,9 @@ abstract class AbstractScanner implements Scanner {
     while (true) {
       if (identical($EOF, next)) {
         if (!asciiOnlyLines) handleUnicode(unicodeStart);
-        unterminated(messageUnterminatedComment);
+        prependErrorToken(UnterminatedToken(
+            messageUnterminatedComment, tokenStart, stringOffset));
+        advanceAfterError(true);
         break;
       } else if (identical($STAR, next)) {
         next = advance();
@@ -1623,7 +1625,8 @@ abstract class AbstractScanner implements Scanner {
     } else {
       beginToken(); // The synthetic identifier starts here.
       appendSyntheticSubstringToken(TokenType.IDENTIFIER, scanOffset, true, '');
-      unterminated(messageUnexpectedDollarInString, shouldAdvance: false);
+      prependErrorToken(UnterminatedToken(
+          messageUnexpectedDollarInString, tokenStart, stringOffset));
     }
     beginToken(); // The string interpolation suffix starts here.
     return next;
@@ -1752,11 +1755,6 @@ abstract class AbstractScanner implements Scanner {
     return advanceAfterError(true);
   }
 
-  int unterminated(Message message, {bool shouldAdvance: true}) {
-    appendErrorToken(new UnterminatedToken(message, tokenStart, stringOffset));
-    return advanceAfterError(shouldAdvance);
-  }
-
   void unterminatedString(int quoteChar, int quoteStart, int start,
       {bool asciiOnly, bool isMultiLine, bool isRaw}) {
     String suffix = new String.fromCharCodes(
diff --git a/pkg/front_end/lib/src/fasta/scanner/recover.dart b/pkg/front_end/lib/src/fasta/scanner/recover.dart
@@ -126,7 +126,7 @@ Token scannerRecovery(List<int> bytes, Token tokens, List<int> lineStarts) {
   }
 
   recoverExponent() {
-    return errorTail.next;
+    throw "Internal error: Exponent error token should have been prepended";
   }
 
   recoverString() {
@@ -138,12 +138,11 @@ Token scannerRecovery(List<int> bytes, Token tokens, List<int> lineStarts) {
   }
 
   recoverStringInterpolation() {
-    return errorTail.next;
+    throw "Internal error: Interpolation error token should have been prepended";
   }
 
   recoverComment() {
-    // TODO(ahe): Improve this.
-    return skipToEof(errorTail);
+    throw "Internal error: Comment error token should have been prepended";
   }
 
   recoverUnmatched() {
@@ -156,7 +155,10 @@ Token scannerRecovery(List<int> bytes, Token tokens, List<int> lineStarts) {
   Token current = tokens;
   while (current is ErrorToken &&
       (current.errorCode == codeExpectedHexDigit ||
+          current.errorCode == codeUnexpectedDollarInString ||
+          current.errorCode == codeMissingExponent ||
           current.errorCode == codeUnmatchedToken ||
+          current.errorCode == codeUnterminatedComment ||
           current.errorCode == codeUnterminatedString)) {
     if (errorTail == null) {
       error = current;
diff --git a/pkg/front_end/lib/src/scanner/errors.dart b/pkg/front_end/lib/src/scanner/errors.dart
@@ -118,17 +118,16 @@ void translateErrorToken(ErrorToken token, ReportError reportError) {
     case "UNTERMINATED_STRING_LITERAL":
       // TODO(paulberry,ahe): Fasta reports the error location as the entire
       // string; analyzer expects the end of the string.
-      // TODO(danrubel): Remove this once all analyzer clients
-      // can process errors via the scanner's errors list.
       reportError(
           ScannerErrorCode.UNTERMINATED_STRING_LITERAL, endOffset - 1, null);
       return;
 
     case "UNTERMINATED_MULTI_LINE_COMMENT":
       // TODO(paulberry,ahe): Fasta reports the error location as the entire
       // comment; analyzer expects the end of the comment.
-      charOffset = endOffset;
-      return _makeError(ScannerErrorCode.UNTERMINATED_MULTI_LINE_COMMENT, null);
+      reportError(ScannerErrorCode.UNTERMINATED_MULTI_LINE_COMMENT,
+          endOffset - 1, null);
+      return;
 
     case "MISSING_DIGIT":
       // TODO(paulberry,ahe): Fasta reports the error location as the entire
diff --git a/pkg/front_end/test/scanner_fasta_test.dart b/pkg/front_end/test/scanner_fasta_test.dart
@@ -501,13 +501,13 @@ abstract class ScannerTest_Fasta_Base {
 
   void test_string_simple_missing_interpolation_identifier() {
     Token token = scan(r'"foo $');
-    expect((token as fasta.ErrorToken).errorCode, same(codeUnterminatedString));
-    expect((token as fasta.UnterminatedString).start, '"');
-
-    token = token.next;
     expect((token as fasta.ErrorToken).errorCode,
         same(codeUnexpectedDollarInString));
 
+    token = token.next;
+    expect((token as fasta.ErrorToken).errorCode, same(codeUnterminatedString));
+    expect((token as fasta.UnterminatedString).start, '"');
+
     token = token.next;
     expectToken(token, TokenType.STRING, 0, 5, lexeme: '"foo ');
 

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ Token scannerRecovery(List<int> bytes, Token tokens, List<int> lineStarts) {`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`recoverExponent() {`
`129`		`- return errorTail.next;`
	`129`	`+ throw "Internal error: Exponent error token should have been prepended";`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`recoverString() {`
`@@ -138,12 +138,11 @@ Token scannerRecovery(List<int> bytes, Token tokens, List<int> lineStarts) {`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`recoverStringInterpolation() {`
`141`		`- return errorTail.next;`
	`141`	`+ throw "Internal error: Interpolation error token should have been prepended";`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`recoverComment() {`
`145`		`- // TODO(ahe): Improve this.`
`146`		`- return skipToEof(errorTail);`
	`145`	`+ throw "Internal error: Comment error token should have been prepended";`
`147`	`146`	`}`
`148`	`147`
`149`	`148`	`recoverUnmatched() {`
`@@ -156,7 +155,10 @@ Token scannerRecovery(List<int> bytes, Token tokens, List<int> lineStarts) {`
`156`	`155`	`Token current = tokens;`
`157`	`156`	`while (current is ErrorToken &&`
`158`	`157`	`(current.errorCode == codeExpectedHexDigit \|\|`
	`158`	`+ current.errorCode == codeUnexpectedDollarInString \|\|`
	`159`	`+ current.errorCode == codeMissingExponent \|\|`
`159`	`160`	`current.errorCode == codeUnmatchedToken \|\|`
	`161`	`+ current.errorCode == codeUnterminatedComment \|\|`
`160`	`162`	`current.errorCode == codeUnterminatedString)) {`
`161`	`163`	`if (errorTail == null) {`
`162`	`164`	`error = current;`