commit e16f5781fe796309cb11e626673171f9c29e82b2
author danrubel <danrubel@google.com> Mon Jul 02 20:03:18 2018 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Mon Jul 02 20:03:18 2018 +0000
tree 3e2ab300e25c1db6b0f5806542e4c90eb99f3695
parent b8a70f04713023aaa9ce40a06ab08c300bad5046

Replace and remove reportUnexpectedToken and reportUnrecoverableErrorWithToken

Change-Id: Ib0432f037b4207ad1a109c5bca8773c7bf2709ac
Reviewed-on: https://dart-review.googlesource.com/63460
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Dan Rubel <danrubel@google.com>

pkg/front_end/lib/src/fasta/parser/parser.dart

diff --git a/pkg/front_end/lib/src/fasta/parser/parser.dart b/pkg/front_end/lib/src/fasta/parser/parser.dart
index 5aa6c35..83d946f 100644
--- a/pkg/front_end/lib/src/fasta/parser/parser.dart
+++ b/pkg/front_end/lib/src/fasta/parser/parser.dart
@@ -3582,7 +3582,9 @@
             replacement.endToken = replacement.next;
             token = parseArgumentOrIndexStar(token, null);
           } else {
-            token = reportUnexpectedToken(token.next);
+            // Recovery
+            reportRecoverableErrorWithToken(
+                token.next, fasta.templateUnexpectedToken);
           }
         } else if (identical(type, TokenType.IS)) {
           token = parseIsOperatorRest(token);
@@ -5681,18 +5683,6 @@
     }
   }
 
-  Token reportUnrecoverableErrorWithToken(
-      Token token, Template<_MessageWithArgument<Token>> template) {
-    Token next;
-    if (token is ErrorToken) {
-      next = reportErrorToken(token, false);
-    } else {
-      next = listener.handleUnrecoverableError(
-          token, template.withArguments(token));
-    }
-    return next ?? skipToEof(token);
-  }
-
   void reportRecoverableErrorWithToken(
       Token token, Template<_MessageWithArgument<Token>> template) {
     if (token is ErrorToken) {
@@ -5744,11 +5734,6 @@
     return next;
   }
 
-  Token reportUnexpectedToken(Token token) {
-    return reportUnrecoverableErrorWithToken(
-        token, fasta.templateUnexpectedToken);
-  }
-
   Token reportAndSkipClassInClass(Token token) {
     assert(optional('class', token));
     reportRecoverableError(token, fasta.messageClassInClass);