languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-16 03:47:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

finish cleanup ErrorToken parsing

Browse source 
Change-Id: I876c4805561d29b289184ce696fe4db2038bc362
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/106005
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Dan Rubel <danrubel@google.com>
This commit is contained in:
danrubel 2019-06-14 13:40:17 +00:00 committed by commit-bot@chromium.org
parent 6bd64ff8b2
commit a2f32ebe87
1 changed files with 5 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
pkg/front_end/lib/src/fasta/parser/parser.dart
View file

@ -4292,20 +4292,7 @@ class Parser {
//
// Recovery code.
//
if (token.next is ErrorToken) {
token = token.next;
Token previous;
do {
// Report the error in the error token, skip the error token, and try
// again.
previous = token;
reportErrorToken(token);
token = token.next;
} while (token is ErrorToken);
return parsePrimary(previous, context);
} else {
return parseSend(token, context);
}
return parseSend(token, context);
}
Token parseParenthesizedExpressionOrFunctionLiteral(Token token) {
@ -6361,32 +6348,20 @@ class Parser {
void reportRecoverableError(Token token, Message message) {
// Find a non-synthetic token on which to report the error.
token = findNonZeroLengthToken(token);
if (token is ErrorToken) {
reportErrorToken(token);
} else {
listener.handleRecoverableError(message, token, token);
}
listener.handleRecoverableError(message, token, token);
}
void reportRecoverableErrorWithToken(
Token token, Template<_MessageWithArgument<Token>> template) {
// Find a non-synthetic token on which to report the error.
token = findNonZeroLengthToken(token);
if (token is ErrorToken) {
reportErrorToken(token);
} else {
listener.handleRecoverableError(
template.withArguments(token), token, token);
}
}
void reportErrorToken(ErrorToken token) {
listener.handleErrorToken(token);
listener.handleRecoverableError(
template.withArguments(token), token, token);
}
Token reportAllErrorTokens(Token token) {
while (token is ErrorToken) {
reportErrorToken(token);
listener.handleErrorToken(token);
token = token.next;
}
return token;