cleanup parser forwarding and test listeners
Change-Id: I593f8bf862179684a031c9538def62c8415c0d77
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/103483
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Dan Rubel <danrubel@google.com>
diff --git a/pkg/analyzer/test/generated/parser_fasta_listener.dart b/pkg/analyzer/test/generated/parser_fasta_listener.dart
index 20e6f2d..111bcff 100644
--- a/pkg/analyzer/test/generated/parser_fasta_listener.dart
+++ b/pkg/analyzer/test/generated/parser_fasta_listener.dart
@@ -108,12 +108,6 @@
}
@override
- void beginClassOrMixinBody(Token token) {
- super.beginClassOrMixinBody(token);
- begin('ClassOrMixinBody');
- }
-
- @override
void beginClassDeclaration(
Token beginToken, Token abstractToken, Token name) {
super.beginClassDeclaration(beginToken, abstractToken, name);
@@ -121,6 +115,12 @@
}
@override
+ void beginClassOrMixinBody(Token token) {
+ super.beginClassOrMixinBody(token);
+ begin('ClassOrMixinBody');
+ }
+
+ @override
void beginClassOrNamedMixinApplication(Token token) {
super.beginClassOrNamedMixinApplication(token);
begin('ClassOrNamedMixinApplication');
@@ -232,18 +232,6 @@
}
@override
- void beginForStatement(Token token) {
- super.beginForStatement(token);
- begin('ForStatement');
- }
-
- @override
- void beginForStatementBody(Token token) {
- super.beginForStatementBody(token);
- begin('ForStatementBody');
- }
-
- @override
void beginFormalParameter(Token token, MemberKind kind, Token requiredToken,
Token covariantToken, Token varFinalOrConst) {
super.beginFormalParameter(
@@ -258,15 +246,15 @@
}
@override
- void beginIfControlFlow(Token ifToken) {
- super.beginIfControlFlow(ifToken);
- begin('IfControlFlow');
+ void beginForStatement(Token token) {
+ super.beginForStatement(token);
+ begin('ForStatement');
}
@override
- void beginLocalFunctionDeclaration(Token token) {
- super.beginLocalFunctionDeclaration(token);
- begin('LocalFunctionDeclaration');
+ void beginForStatementBody(Token token) {
+ super.beginForStatementBody(token);
+ begin('ForStatementBody');
}
@override
@@ -306,6 +294,12 @@
}
@override
+ void beginIfControlFlow(Token ifToken) {
+ super.beginIfControlFlow(ifToken);
+ begin('IfControlFlow');
+ }
+
+ @override
void beginIfStatement(Token token) {
super.beginIfStatement(token);
begin('IfStatement');
@@ -360,6 +354,12 @@
}
@override
+ void beginLocalFunctionDeclaration(Token token) {
+ super.beginLocalFunctionDeclaration(token);
+ begin('LocalFunctionDeclaration');
+ }
+
+ @override
void beginMember() {
expectIn('ClassOrMixinBody');
super.beginMember();
@@ -602,12 +602,6 @@
}
@override
- void endClassOrMixinBody(int memberCount, Token beginToken, Token endToken) {
- end('ClassOrMixinBody');
- super.endClassOrMixinBody(memberCount, beginToken, endToken);
- }
-
- @override
void endClassDeclaration(Token beginToken, Token endToken) {
end('ClassDeclaration');
end('ClassOrNamedMixinApplication');
@@ -615,6 +609,12 @@
}
@override
+ void endClassOrMixinBody(int memberCount, Token beginToken, Token endToken) {
+ end('ClassOrMixinBody');
+ super.endClassOrMixinBody(memberCount, beginToken, endToken);
+ }
+
+ @override
void endCombinators(int count) {
end('Combinators');
super.endCombinators(count);
@@ -718,12 +718,6 @@
}
@override
- void endForInControlFlow(Token token) {
- end('ForControlFlow');
- super.endForInControlFlow(token);
- }
-
- @override
void endForIn(Token endToken) {
end('ForStatement');
super.endForIn(endToken);
@@ -736,24 +730,18 @@
}
@override
+ void endForInControlFlow(Token token) {
+ end('ForControlFlow');
+ super.endForInControlFlow(token);
+ }
+
+ @override
void endForInExpression(Token token) {
end('ForInExpression');
super.endForInExpression(token);
}
@override
- void endForStatement(Token endToken) {
- end('ForStatement');
- super.endForStatement(endToken);
- }
-
- @override
- void endForStatementBody(Token token) {
- end('ForStatementBody');
- super.endForStatementBody(token);
- }
-
- @override
void endFormalParameter(Token thisKeyword, Token periodAfterThis,
Token nameToken, FormalParameterKind kind, MemberKind memberKind) {
end('FormalParameter');
@@ -769,9 +757,15 @@
}
@override
- void endLocalFunctionDeclaration(Token endToken) {
- end('LocalFunctionDeclaration');
- super.endLocalFunctionDeclaration(endToken);
+ void endForStatement(Token endToken) {
+ end('ForStatement');
+ super.endForStatement(endToken);
+ }
+
+ @override
+ void endForStatementBody(Token token) {
+ end('ForStatementBody');
+ super.endForStatementBody(token);
}
@override
@@ -878,6 +872,12 @@
}
@override
+ void endLocalFunctionDeclaration(Token endToken) {
+ end('LocalFunctionDeclaration');
+ super.endLocalFunctionDeclaration(endToken);
+ }
+
+ @override
void endMember() {
end('Member');
super.endMember();
@@ -1116,33 +1116,23 @@
}
@override
- void handleIdentifierList(int count) {
- expectInOneOf(['Hide', 'Show']);
- super.handleIdentifierList(count);
- }
-
- @override
void handleDottedName(int count, Token firstIdentifier) {
expectIn('ConditionalUri');
super.handleDottedName(count, firstIdentifier);
}
@override
- void handleRecoverClassHeader() {
- expectIn('ClassDeclaration');
- listener.handleRecoverClassHeader();
+ void handleIdentifierList(int count) {
+ expectInOneOf(['Hide', 'Show']);
+ super.handleIdentifierList(count);
}
@override
- void handleRecoverImport(Token semicolon) {
- expectIn('CompilationUnit');
- listener.handleRecoverImport(semicolon);
- }
-
- @override
- void handleRecoverMixinHeader() {
- expectIn('MixinDeclaration');
- listener.handleRecoverMixinHeader();
+ void handleImportPrefix(Token deferredKeyword, Token asKeyword) {
+ // This event normally happens within "Import",
+ // but happens within "CompilationUnit" during recovery.
+ expectInOneOf(const ['Import', 'CompilationUnit']);
+ listener.handleImportPrefix(deferredKeyword, asKeyword);
}
@override
@@ -1182,11 +1172,21 @@
}
@override
- void handleImportPrefix(Token deferredKeyword, Token asKeyword) {
- // This event normally happens within "Import",
- // but happens within "CompilationUnit" during recovery.
- expectInOneOf(const ['Import', 'CompilationUnit']);
- listener.handleImportPrefix(deferredKeyword, asKeyword);
+ void handleRecoverClassHeader() {
+ expectIn('ClassDeclaration');
+ listener.handleRecoverClassHeader();
+ }
+
+ @override
+ void handleRecoverImport(Token semicolon) {
+ expectIn('CompilationUnit');
+ listener.handleRecoverImport(semicolon);
+ }
+
+ @override
+ void handleRecoverMixinHeader() {
+ expectIn('MixinDeclaration');
+ listener.handleRecoverMixinHeader();
}
@override
diff --git a/pkg/front_end/lib/src/fasta/parser/forwarding_listener.dart b/pkg/front_end/lib/src/fasta/parser/forwarding_listener.dart
index bb60229..97d93c8 100644
--- a/pkg/front_end/lib/src/fasta/parser/forwarding_listener.dart
+++ b/pkg/front_end/lib/src/fasta/parser/forwarding_listener.dart
@@ -13,6 +13,11 @@
ForwardingListener([this.listener]);
@override
+ set suppressParseErrors(bool value) {
+ listener?.suppressParseErrors = value;
+ }
+
+ @override
Uri get uri => listener?.uri;
@override
@@ -61,13 +66,13 @@
}
@override
- void beginClassOrMixinBody(Token token) {
- listener?.beginClassOrMixinBody(token);
+ void beginClassDeclaration(Token begin, Token abstractToken, Token name) {
+ listener?.beginClassDeclaration(begin, abstractToken, name);
}
@override
- void beginClassDeclaration(Token begin, Token abstractToken, Token name) {
- listener?.beginClassDeclaration(begin, abstractToken, name);
+ void beginClassOrMixinBody(Token token) {
+ listener?.beginClassOrMixinBody(token);
}
@override
@@ -86,6 +91,11 @@
}
@override
+ void beginConditionalExpression(Token question) {
+ listener?.beginConditionalExpression(question);
+ }
+
+ @override
void beginConditionalUri(Token ifKeyword) {
listener?.beginConditionalUri(ifKeyword);
}
@@ -162,16 +172,6 @@
}
@override
- void beginForStatement(Token token) {
- listener?.beginForStatement(token);
- }
-
- @override
- void beginForStatementBody(Token token) {
- listener?.beginForStatementBody(token);
- }
-
- @override
void beginFormalParameter(Token token, MemberKind kind, Token requiredToken,
Token covariantToken, Token varFinalOrConst) {
listener?.beginFormalParameter(
@@ -179,13 +179,23 @@
}
@override
+ void beginFormalParameterDefaultValueExpression() {
+ listener?.beginFormalParameterDefaultValueExpression();
+ }
+
+ @override
void beginFormalParameters(Token token, MemberKind kind) {
listener?.beginFormalParameters(token, kind);
}
@override
- void beginLocalFunctionDeclaration(Token token) {
- listener?.beginLocalFunctionDeclaration(token);
+ void beginForStatement(Token token) {
+ listener?.beginForStatement(token);
+ }
+
+ @override
+ void beginForStatementBody(Token token) {
+ listener?.beginForStatementBody(token);
}
@override
@@ -224,13 +234,13 @@
}
@override
- void beginThenControlFlow(Token token) {
- listener?.beginThenControlFlow(token);
+ void beginIfStatement(Token token) {
+ listener?.beginIfStatement(token);
}
@override
- void beginIfStatement(Token token) {
- listener?.beginIfStatement(token);
+ void beginImplicitCreationExpression(Token token) {
+ listener?.beginImplicitCreationExpression(token);
}
@override
@@ -274,6 +284,11 @@
}
@override
+ void beginLocalFunctionDeclaration(Token token) {
+ listener?.beginLocalFunctionDeclaration(token);
+ }
+
+ @override
void beginMember() {
listener?.beginMember();
}
@@ -367,6 +382,11 @@
}
@override
+ void beginThenControlFlow(Token token) {
+ listener?.beginThenControlFlow(token);
+ }
+
+ @override
void beginThenStatement(Token token) {
listener?.beginThenStatement(token);
}
@@ -485,13 +505,13 @@
}
@override
- void endClassOrMixinBody(int memberCount, Token beginToken, Token endToken) {
- listener?.endClassOrMixinBody(memberCount, beginToken, endToken);
+ void endClassDeclaration(Token beginToken, Token endToken) {
+ listener?.endClassDeclaration(beginToken, endToken);
}
@override
- void endClassDeclaration(Token beginToken, Token endToken) {
- listener?.endClassDeclaration(beginToken, endToken);
+ void endClassOrMixinBody(int memberCount, Token beginToken, Token endToken) {
+ listener?.endClassOrMixinBody(memberCount, beginToken, endToken);
}
@override
@@ -505,6 +525,11 @@
}
@override
+ void endConditionalExpression(Token question, Token colon) {
+ listener?.endConditionalExpression(question, colon);
+ }
+
+ @override
void endConditionalUri(Token ifKeyword, Token leftParen, Token equalSign) {
listener?.endConditionalUri(ifKeyword, leftParen, equalSign);
}
@@ -580,11 +605,6 @@
}
@override
- void endForInControlFlow(Token token) {
- listener?.endForInControlFlow(token);
- }
-
- @override
void endForIn(Token endToken) {
listener?.endForIn(endToken);
}
@@ -595,21 +615,16 @@
}
@override
+ void endForInControlFlow(Token token) {
+ listener?.endForInControlFlow(token);
+ }
+
+ @override
void endForInExpression(Token token) {
listener?.endForInExpression(token);
}
@override
- void endForStatement(Token endToken) {
- listener?.endForStatement(endToken);
- }
-
- @override
- void endForStatementBody(Token token) {
- listener?.endForStatementBody(token);
- }
-
- @override
void endFormalParameter(Token thisKeyword, Token periodAfterThis,
Token nameToken, FormalParameterKind kind, MemberKind memberKind) {
listener?.endFormalParameter(
@@ -617,14 +632,24 @@
}
@override
+ void endFormalParameterDefaultValueExpression() {
+ listener?.endFormalParameterDefaultValueExpression();
+ }
+
+ @override
void endFormalParameters(
int count, Token beginToken, Token endToken, MemberKind kind) {
listener?.endFormalParameters(count, beginToken, endToken, kind);
}
@override
- void endLocalFunctionDeclaration(Token endToken) {
- listener?.endLocalFunctionDeclaration(endToken);
+ void endForStatement(Token endToken) {
+ listener?.endForStatement(endToken);
+ }
+
+ @override
+ void endForStatementBody(Token token) {
+ listener?.endForStatementBody(token);
}
@override
@@ -674,6 +699,11 @@
}
@override
+ void endImplicitCreationExpression(Token token) {
+ listener?.endImplicitCreationExpression(token);
+ }
+
+ @override
void endImport(Token importKeyword, Token semicolon) {
listener?.endImport(importKeyword, semicolon);
}
@@ -704,25 +734,6 @@
}
@override
- void handleLiteralMapEntry(Token colon, Token endToken) {
- listener?.handleLiteralMapEntry(colon, endToken);
- }
-
- @override
- void handleLiteralSetOrMap(
- int count,
- Token leftBrace,
- Token constKeyword,
- Token rightBrace,
- // TODO(danrubel): hasSetEntry parameter exists for replicating existing
- // behavior and will be removed once unified collection has been enabled
- bool hasSetEntry,
- ) {
- listener?.handleLiteralSetOrMap(
- count, leftBrace, constKeyword, rightBrace, hasSetEntry);
- }
-
- @override
void endLiteralString(int interpolationCount, Token endToken) {
listener?.endLiteralString(interpolationCount, endToken);
}
@@ -733,6 +744,11 @@
}
@override
+ void endLocalFunctionDeclaration(Token endToken) {
+ listener?.endLocalFunctionDeclaration(endToken);
+ }
+
+ @override
void endMember() {
listener?.endMember();
}
@@ -983,21 +999,11 @@
}
@override
- void beginConditionalExpression(Token question) {
- listener?.beginConditionalExpression(question);
- }
-
- @override
void handleConditionalExpressionColon() {
listener?.handleConditionalExpressionColon();
}
@override
- void endConditionalExpression(Token question, Token colon) {
- listener?.endConditionalExpression(question, colon);
- }
-
- @override
void handleContinueStatement(
bool hasTarget, Token continueKeyword, Token endToken) {
listener?.handleContinueStatement(hasTarget, continueKeyword, endToken);
@@ -1014,28 +1020,18 @@
}
@override
- void beginImplicitCreationExpression(Token token) {
- listener?.beginImplicitCreationExpression(token);
- }
-
- @override
- void endImplicitCreationExpression(Token token) {
- listener?.endImplicitCreationExpression(token);
- }
-
- @override
void handleElseControlFlow(Token elseToken) {
listener?.handleElseControlFlow(elseToken);
}
@override
- void handleEmptyStatement(Token token) {
- listener?.handleEmptyStatement(token);
+ void handleEmptyFunctionBody(Token semicolon) {
+ listener?.handleEmptyFunctionBody(semicolon);
}
@override
- void handleEmptyFunctionBody(Token semicolon) {
- listener?.handleEmptyFunctionBody(semicolon);
+ void handleEmptyStatement(Token token) {
+ listener?.handleEmptyStatement(token);
}
@override
@@ -1064,6 +1060,35 @@
}
@override
+ void handleForInitializerEmptyStatement(Token token) {
+ listener?.handleForInitializerEmptyStatement(token);
+ }
+
+ @override
+ void handleForInitializerExpressionStatement(Token token) {
+ listener?.handleForInitializerExpressionStatement(token);
+ }
+
+ @override
+ void handleForInitializerLocalVariableDeclaration(Token token) {
+ listener?.handleForInitializerLocalVariableDeclaration(token);
+ }
+
+ @override
+ void handleForInLoopParts(Token awaitToken, Token forToken,
+ Token leftParenthesis, Token inKeyword) {
+ listener?.handleForInLoopParts(
+ awaitToken, forToken, leftParenthesis, inKeyword);
+ }
+
+ @override
+ void handleForLoopParts(Token forKeyword, Token leftParen,
+ Token leftSeparator, int updateExpressionCount) {
+ listener?.handleForLoopParts(
+ forKeyword, leftParen, leftSeparator, updateExpressionCount);
+ }
+
+ @override
void handleFormalParameterWithoutValue(Token token) {
listener?.handleFormalParameterWithoutValue(token);
}
@@ -1084,8 +1109,8 @@
}
@override
- void handleRecoverImport(Token semicolon) {
- listener?.handleRecoverImport(semicolon);
+ void handleImportPrefix(Token deferredKeyword, Token asKeyword) {
+ listener?.handleImportPrefix(deferredKeyword, asKeyword);
}
@override
@@ -1120,13 +1145,8 @@
}
@override
- void handleInvalidTypeArguments(Token token) {
- listener?.handleInvalidTypeArguments(token);
- }
-
- @override
- void handleInvalidTypeReference(Token token) {
- listener?.handleInvalidTypeReference(token);
+ void handleInvalidStatement(Token token, Message message) {
+ listener?.handleInvalidStatement(token, message);
}
void handleInvalidTopLevelBlock(Token token) {
@@ -1139,6 +1159,16 @@
}
@override
+ void handleInvalidTypeArguments(Token token) {
+ listener?.handleInvalidTypeArguments(token);
+ }
+
+ @override
+ void handleInvalidTypeReference(Token token) {
+ listener?.handleInvalidTypeReference(token);
+ }
+
+ @override
void handleIsOperator(Token isOperator, Token not) {
listener?.handleIsOperator(isOperator, not);
}
@@ -1170,11 +1200,30 @@
}
@override
+ void handleLiteralMapEntry(Token colon, Token endToken) {
+ listener?.handleLiteralMapEntry(colon, endToken);
+ }
+
+ @override
void handleLiteralNull(Token token) {
listener?.handleLiteralNull(token);
}
@override
+ void handleLiteralSetOrMap(
+ int count,
+ Token leftBrace,
+ Token constKeyword,
+ Token rightBrace,
+ // TODO(danrubel): hasSetEntry parameter exists for replicating existing
+ // behavior and will be removed once unified collection has been enabled
+ bool hasSetEntry,
+ ) {
+ listener?.handleLiteralSetOrMap(
+ count, leftBrace, constKeyword, rightBrace, hasSetEntry);
+ }
+
+ @override
void handleMixinHeader(Token mixinKeyword) {
listener?.handleMixinHeader(mixinKeyword);
}
@@ -1230,35 +1279,6 @@
}
@override
- void handleForInitializerEmptyStatement(Token token) {
- listener?.handleForInitializerEmptyStatement(token);
- }
-
- @override
- void handleForInitializerExpressionStatement(Token token) {
- listener?.handleForInitializerExpressionStatement(token);
- }
-
- @override
- void handleForInitializerLocalVariableDeclaration(Token token) {
- listener?.handleForInitializerLocalVariableDeclaration(token);
- }
-
- @override
- void handleForInLoopParts(Token awaitToken, Token forToken,
- Token leftParenthesis, Token inKeyword) {
- listener?.handleForInLoopParts(
- awaitToken, forToken, leftParenthesis, inKeyword);
- }
-
- @override
- void handleForLoopParts(Token forKeyword, Token leftParen,
- Token leftSeparator, int updateExpressionCount) {
- listener?.handleForLoopParts(
- forKeyword, leftParen, leftSeparator, updateExpressionCount);
- }
-
- @override
void handleNoFieldInitializer(Token token) {
listener?.handleNoFieldInitializer(token);
}
@@ -1279,13 +1299,13 @@
}
@override
- void handleNonNullAssertExpression(Token bang) {
- listener?.handleNonNullAssertExpression(bang);
+ void handleNoName(Token token) {
+ listener?.handleNoName(token);
}
@override
- void handleNoName(Token token) {
- listener?.handleNoName(token);
+ void handleNonNullAssertExpression(Token bang) {
+ listener?.handleNonNullAssertExpression(bang);
}
@override
@@ -1329,26 +1349,11 @@
}
@override
- void handleImportPrefix(Token deferredKeyword, Token asKeyword) {
- listener?.handleImportPrefix(deferredKeyword, asKeyword);
- }
-
- @override
void handleQualified(Token period) {
listener?.handleQualified(period);
}
@override
- void handleRecoverClassHeader() {
- listener?.handleRecoverClassHeader();
- }
-
- @override
- void handleRecoverMixinHeader() {
- listener?.handleRecoverMixinHeader();
- }
-
- @override
void handleRecoverableError(
Message message, Token startToken, Token endToken) {
if (forwardErrors) {
@@ -1357,8 +1362,18 @@
}
@override
- void handleInvalidStatement(Token token, Message message) {
- listener?.handleInvalidStatement(token, message);
+ void handleRecoverClassHeader() {
+ listener?.handleRecoverClassHeader();
+ }
+
+ @override
+ void handleRecoverImport(Token semicolon) {
+ listener?.handleRecoverImport(semicolon);
+ }
+
+ @override
+ void handleRecoverMixinHeader() {
+ listener?.handleRecoverMixinHeader();
}
@override
@@ -1382,12 +1397,6 @@
}
@override
- void handleUnescapeError(
- Message message, Token location, int offset, int length) {
- listener?.handleUnescapeError(message, location, offset, length);
- }
-
- @override
void handleStringPart(Token token) {
listener?.handleStringPart(token);
}
@@ -1438,13 +1447,9 @@
}
@override
- void beginFormalParameterDefaultValueExpression() {
- listener?.beginFormalParameterDefaultValueExpression();
- }
-
- @override
- void endFormalParameterDefaultValueExpression() {
- listener?.endFormalParameterDefaultValueExpression();
+ void handleUnescapeError(
+ Message message, Token location, int offset, int length) {
+ listener?.handleUnescapeError(message, location, offset, length);
}
@override
@@ -1468,17 +1473,12 @@
}
@override
- void reportNonNullAssertExpressionNotEnabled(Token bang) {
- listener?.reportNonNullAssertExpressionNotEnabled(bang);
- }
-
- @override
void reportNonNullableModifierError(Token modifierToken) {
listener?.reportNonNullableModifierError(modifierToken);
}
@override
- set suppressParseErrors(bool value) {
- listener?.suppressParseErrors = value;
+ void reportNonNullAssertExpressionNotEnabled(Token bang) {
+ listener?.reportNonNullAssertExpressionNotEnabled(bang);
}
}
