Remove unused event parameter
Change-Id: I097886cae93204d671a3aca4caaafea8d117989d
Reviewed-on: https://dart-review.googlesource.com/70180
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/analyzer/lib/src/fasta/ast_builder.dart b/pkg/analyzer/lib/src/fasta/ast_builder.dart
index 4cae0df..764c982 100644
--- a/pkg/analyzer/lib/src/fasta/ast_builder.dart
+++ b/pkg/analyzer/lib/src/fasta/ast_builder.dart
@@ -885,7 +885,7 @@
}
@override
- void handleType(Token beginToken, Token endToken) {
+ void handleType(Token beginToken) {
debugEvent("Type");
TypeArgumentList arguments = pop();
@@ -2412,7 +2412,7 @@
// keyword up to an element?
handleIdentifier(voidKeyword, IdentifierContext.typeReference);
handleNoTypeArguments(voidKeyword);
- handleType(voidKeyword, voidKeyword);
+ handleType(voidKeyword);
}
@override
diff --git a/pkg/analyzer/tool/summary/mini_ast.dart b/pkg/analyzer/tool/summary/mini_ast.dart
index be06135..4dd6d1a 100644
--- a/pkg/analyzer/tool/summary/mini_ast.dart
+++ b/pkg/analyzer/tool/summary/mini_ast.dart
@@ -456,7 +456,7 @@
}
@override
- void handleType(Token beginToken, Token endToken) {
+ void handleType(Token beginToken) {
debugEvent("Type");
List<TypeName> typeArguments = popTypedList();
String name = pop();
diff --git a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
index 5837189..8fb5c36 100644
--- a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
@@ -2251,7 +2251,7 @@
}
@override
- void handleType(Token beginToken, Token endToken) {
+ void handleType(Token beginToken) {
// TODO(ahe): The scope is wrong for return types of generic functions.
debugEvent("Type");
List<DartType> arguments = pop();
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 806ce6b..a7553fb 100644
--- a/pkg/front_end/lib/src/fasta/parser/forwarding_listener.dart
+++ b/pkg/front_end/lib/src/fasta/parser/forwarding_listener.dart
@@ -1296,8 +1296,8 @@
}
@override
- void handleType(Token beginToken, Token endToken) {
- listener?.handleType(beginToken, endToken);
+ void handleType(Token beginToken) {
+ listener?.handleType(beginToken);
}
@override
diff --git a/pkg/front_end/lib/src/fasta/parser/listener.dart b/pkg/front_end/lib/src/fasta/parser/listener.dart
index 9012e8a..936b78e 100644
--- a/pkg/front_end/lib/src/fasta/parser/listener.dart
+++ b/pkg/front_end/lib/src/fasta/parser/listener.dart
@@ -865,7 +865,7 @@
logEvent("TryStatement");
}
- void handleType(Token beginToken, Token endToken) {
+ void handleType(Token beginToken) {
logEvent("Type");
}
diff --git a/pkg/front_end/lib/src/fasta/parser/type_info_impl.dart b/pkg/front_end/lib/src/fasta/parser/type_info_impl.dart
index 2324a81..518db08 100644
--- a/pkg/front_end/lib/src/fasta/parser/type_info_impl.dart
+++ b/pkg/front_end/lib/src/fasta/parser/type_info_impl.dart
@@ -140,7 +140,7 @@
listener.handleQualified(period);
listener.handleNoTypeArguments(token.next);
- listener.handleType(start, token.next);
+ listener.handleType(start);
return token;
}
@@ -178,7 +178,7 @@
Listener listener = parser.listener;
listener.handleIdentifier(token, IdentifierContext.typeReference);
token = typeArg.parseArguments(token, parser);
- listener.handleType(start, token.next);
+ listener.handleType(start);
return token;
}
@@ -216,7 +216,7 @@
Listener listener = parser.listener;
listener.handleIdentifier(token, IdentifierContext.typeReference);
token = noTypeParamOrArg.parseArguments(token, parser);
- listener.handleType(token, token.next);
+ listener.handleType(token);
return token;
}
@@ -364,7 +364,7 @@
}
}
token = typeArguments.parseArguments(token, parser);
- parser.listener.handleType(typeRefOrPrefix, token.next);
+ parser.listener.handleType(typeRefOrPrefix);
}
}
diff --git a/pkg/front_end/lib/src/fasta/source/diet_listener.dart b/pkg/front_end/lib/src/fasta/source/diet_listener.dart
index a53a098..54ac074 100644
--- a/pkg/front_end/lib/src/fasta/source/diet_listener.dart
+++ b/pkg/front_end/lib/src/fasta/source/diet_listener.dart
@@ -151,7 +151,7 @@
}
@override
- void handleType(Token beginToken, Token endToken) {
+ void handleType(Token beginToken) {
debugEvent("Type");
discard(1);
}
diff --git a/pkg/front_end/lib/src/fasta/source/outline_builder.dart b/pkg/front_end/lib/src/fasta/source/outline_builder.dart
index 251d77c..cca9dae 100644
--- a/pkg/front_end/lib/src/fasta/source/outline_builder.dart
+++ b/pkg/front_end/lib/src/fasta/source/outline_builder.dart
@@ -855,7 +855,7 @@
}
@override
- void handleType(Token beginToken, Token endToken) {
+ void handleType(Token beginToken) {
debugEvent("Type");
List<TypeBuilder> arguments = pop();
int charOffset = pop();
diff --git a/pkg/front_end/test/fasta/parser/type_info_test.dart b/pkg/front_end/test/fasta/parser/type_info_test.dart
index 1c8618a..d5a800a 100644
--- a/pkg/front_end/test/fasta/parser/type_info_test.dart
+++ b/pkg/front_end/test/fasta/parser/type_info_test.dart
@@ -108,7 +108,7 @@
expect(listener.calls, [
'handleIdentifier typeReference',
'handleNoTypeArguments ;',
- 'handleType ;',
+ 'handleType ',
]);
expect(listener.errors, [new ExpectedError(codeExpectedType, 7, 1)]);
}
@@ -122,7 +122,7 @@
expect(listener.calls, [
'handleIdentifier typeReference',
'handleNoTypeArguments ;',
- 'handleType ;',
+ 'handleType ',
]);
expect(listener.errors, [new ExpectedError(codeExpectedType, 7, 1)]);
}
@@ -186,7 +186,7 @@
expect(listener.calls, [
'handleIdentifier void typeReference',
'handleNoTypeArguments ;',
- 'handleType void ;',
+ 'handleType void',
]);
expect(listener.errors, [new ExpectedError(codeInvalidVoid, 7, 4)]);
}
@@ -217,7 +217,7 @@
expect(listener.calls, [
'handleIdentifier void typeReference',
'handleNoTypeArguments ;',
- 'handleType void ;',
+ 'handleType void',
]);
expect(listener.errors, [new ExpectedError(codeInvalidVoid, 7, 4)]);
}
@@ -256,7 +256,7 @@
'handleIdentifier a typeReferenceContinuation',
'handleQualified .',
'handleNoTypeArguments ;',
- 'handleType C ;',
+ 'handleType C',
]);
expect(listener.errors, isNull);
}
@@ -316,7 +316,7 @@
expect(listener.calls, [
'handleIdentifier C typeReference',
'handleNoTypeArguments ;',
- 'handleType C ;',
+ 'handleType C',
]);
expect(listener.errors, isNull);
}
@@ -392,9 +392,9 @@
'beginTypeArguments <',
'handleIdentifier T typeReference',
'handleNoTypeArguments >',
- 'handleType T >',
+ 'handleType T',
'endTypeArguments 1 < >',
- 'handleType C ;',
+ 'handleType C',
]);
expect(listener.errors, isNull);
}
@@ -438,9 +438,9 @@
'beginTypeArguments <',
'handleIdentifier T typeReference',
'handleNoTypeArguments >',
- 'handleType T >',
+ 'handleType T',
'endTypeArguments 1 < >',
- 'handleType C =',
+ 'handleType C',
]);
expect(listener.errors, isNull);
}
@@ -483,9 +483,9 @@
'beginTypeArguments <',
'handleIdentifier T typeReference',
'handleNoTypeArguments >',
- 'handleType T >',
+ 'handleType T',
'endTypeArguments 1 < >',
- 'handleType C >',
+ 'handleType C',
]);
expect(listener.errors, isNull);
}
@@ -576,7 +576,7 @@
'beginFormalParameter int MemberKind.GeneralizedFunctionType',
'handleIdentifier int typeReference',
'handleNoTypeArguments )',
- 'handleType int )',
+ 'handleType int',
'handleNoName )',
'handleFormalParameterWithoutValue )',
'endFormalParameter null null ) FormalParameterKind.mandatory '
@@ -602,7 +602,7 @@
'beginFormalParameter int MemberKind.GeneralizedFunctionType',
'handleIdentifier int typeReference',
'handleNoTypeArguments )',
- 'handleType int )',
+ 'handleType int',
'handleNoName )',
'handleFormalParameterWithoutValue )',
'endFormalParameter null null ) FormalParameterKind.mandatory'
@@ -641,7 +641,7 @@
'beginFunctionType C',
'handleIdentifier C typeReference',
'handleNoTypeArguments Function',
- 'handleType C Function',
+ 'handleType C',
'beginFormalParameters ( MemberKind.GeneralizedFunctionType',
'endFormalParameters 0 ( ) MemberKind.GeneralizedFunctionType',
'endFunctionType Function',
@@ -654,7 +654,7 @@
'beginTypeArguments <',
'handleVoidKeyword void',
'endTypeArguments 1 < >',
- 'handleType C ',
+ 'handleType C',
]);
}
@@ -664,12 +664,12 @@
'beginTypeArguments <',
'handleIdentifier S typeReference',
'handleNoTypeArguments ,',
- 'handleType S ,',
+ 'handleType S',
'handleIdentifier T typeReference',
'handleNoTypeArguments >',
- 'handleType T >',
+ 'handleType T',
'endTypeArguments 2 < >',
- 'handleType C ',
+ 'handleType C',
]);
expectComplexInfo('C<S<T>>', required: true, expectedCalls: [
'handleIdentifier C typeReference',
@@ -678,23 +678,23 @@
'beginTypeArguments <',
'handleIdentifier T typeReference',
'handleNoTypeArguments >',
- 'handleType T >',
+ 'handleType T',
'endTypeArguments 1 < >',
- 'handleType S >',
+ 'handleType S',
'endTypeArguments 1 < >',
- 'handleType C ',
+ 'handleType C',
]);
expectComplexInfo('C<S,T> f', expectedAfter: 'f', expectedCalls: [
'handleIdentifier C typeReference',
'beginTypeArguments <',
'handleIdentifier S typeReference',
'handleNoTypeArguments ,',
- 'handleType S ,',
+ 'handleType S',
'handleIdentifier T typeReference',
'handleNoTypeArguments >',
- 'handleType T >',
+ 'handleType T',
'endTypeArguments 2 < >',
- 'handleType C f',
+ 'handleType C',
]);
expectComplexInfo('C<S<T>> f', expectedAfter: 'f', expectedCalls: [
'handleIdentifier C typeReference',
@@ -703,11 +703,11 @@
'beginTypeArguments <',
'handleIdentifier T typeReference',
'handleNoTypeArguments >',
- 'handleType T >',
+ 'handleType T',
'endTypeArguments 1 < >',
- 'handleType S >',
+ 'handleType S',
'endTypeArguments 1 < >',
- 'handleType C f',
+ 'handleType C',
]);
}
@@ -721,9 +721,9 @@
'beginTypeArguments <',
'handleIdentifier T typeReference',
'handleNoTypeArguments >',
- 'handleType T >',
+ 'handleType T',
'endTypeArguments 1 < >',
- 'handleType C Function',
+ 'handleType C',
'beginFormalParameters ( MemberKind.GeneralizedFunctionType',
'endFormalParameters 0 ( ) MemberKind.GeneralizedFunctionType',
'endFunctionType Function',
@@ -747,12 +747,12 @@
'beginTypeArguments <',
'handleIdentifier int typeReference',
'handleNoTypeArguments double' /* was , */,
- 'handleType int double' /* was , */,
+ 'handleType int' /* was , */,
'handleIdentifier double typeReference',
'handleNoTypeArguments >',
- 'handleType double >',
+ 'handleType double',
'endTypeArguments 2 < >',
- 'handleType G g',
+ 'handleType G',
],
expectedErrors: [
error(codeExpectedButGot, 6, 6)
@@ -764,9 +764,9 @@
'beginTypeArguments <',
'handleIdentifier typeReference',
'handleNoTypeArguments >',
- 'handleType >',
+ 'handleType ',
'endTypeArguments 1 < >',
- 'handleType C ',
+ 'handleType C',
], expectedErrors: [
error(codeExpectedType, 2, 1)
]);
@@ -778,9 +778,9 @@
'beginTypeArguments <',
'handleIdentifier typeReference',
'handleNoTypeArguments >',
- 'handleType >',
+ 'handleType ',
'endTypeArguments 1 < >',
- 'handleType C f',
+ 'handleType C',
],
expectedErrors: [
error(codeExpectedType, 2, 1)
@@ -832,7 +832,7 @@
'handleIdentifier a typeReferenceContinuation',
'handleQualified .',
'handleNoTypeArguments Function',
- 'handleType C Function',
+ 'handleType C',
'beginFormalParameters ( MemberKind.GeneralizedFunctionType',
'endFormalParameters 0 ( ) MemberKind.GeneralizedFunctionType',
'endFunctionType Function',
@@ -851,9 +851,9 @@
'beginTypeArguments <',
'handleIdentifier T typeReference',
'handleNoTypeArguments >',
- 'handleType T >',
+ 'handleType T',
'endTypeArguments 1 < >',
- 'handleType C ',
+ 'handleType C',
]);
expectComplexInfo('C.a<T> f', expectedAfter: 'f', expectedCalls: [
@@ -863,9 +863,9 @@
'beginTypeArguments <',
'handleIdentifier T typeReference',
'handleNoTypeArguments >',
- 'handleType T >',
+ 'handleType T',
'endTypeArguments 1 < >',
- 'handleType C f',
+ 'handleType C',
]);
}
@@ -899,16 +899,16 @@
'beginTypeArguments <',
'handleIdentifier T typeReference',
'handleNoTypeArguments >',
- 'handleType T >',
+ 'handleType T',
'endTypeArguments 1 < >',
- 'handleType C Function',
+ 'handleType C',
'beginFormalParameters ( MemberKind.GeneralizedFunctionType',
'beginMetadataStar int',
'endMetadataStar 0',
'beginFormalParameter int MemberKind.GeneralizedFunctionType',
'handleIdentifier int typeReference',
'handleNoTypeArguments x',
- 'handleType int x',
+ 'handleType int',
'handleIdentifier x formalParameterDeclaration',
'handleFormalParameterWithoutValue )',
'endFormalParameter null null x FormalParameterKind.mandatory '
@@ -921,7 +921,7 @@
'beginFormalParameter int MemberKind.GeneralizedFunctionType',
'handleIdentifier int typeReference',
'handleNoTypeArguments x',
- 'handleType int x',
+ 'handleType int',
'handleIdentifier x formalParameterDeclaration',
'handleFormalParameterWithoutValue )',
'endFormalParameter null null x FormalParameterKind.mandatory '
@@ -1095,7 +1095,7 @@
'beginTypeArguments <',
'handleIdentifier T typeReference',
'handleNoTypeArguments >',
- 'handleType T >',
+ 'handleType T',
'endTypeArguments 1 < >'
]);
expect(listener.errors, isNull);
@@ -1163,10 +1163,10 @@
'beginTypeArguments <',
'handleIdentifier S typeReference',
'handleNoTypeArguments ,',
- 'handleType S ,',
+ 'handleType S',
'handleIdentifier T typeReference',
'handleNoTypeArguments >',
- 'handleType T >',
+ 'handleType T',
'endTypeArguments 2 < >'
]);
expectComplexTypeArg('<S Function()>', expectedCalls: [
@@ -1175,7 +1175,7 @@
'beginFunctionType S',
'handleIdentifier S typeReference',
'handleNoTypeArguments Function',
- 'handleType S Function',
+ 'handleType S',
'beginFormalParameters ( MemberKind.GeneralizedFunctionType',
'endFormalParameters 0 ( ) MemberKind.GeneralizedFunctionType',
'endFunctionType Function',
@@ -1197,9 +1197,9 @@
'beginTypeArguments <',
'handleIdentifier T typeReference',
'handleNoTypeArguments >',
- 'handleType T >',
+ 'handleType T',
'endTypeArguments 1 < >',
- 'handleType S >',
+ 'handleType S',
'endTypeArguments 1 < >'
]);
expectComplexTypeArg('<S<Function()>>', expectedCalls: [
@@ -1213,7 +1213,7 @@
'endFormalParameters 0 ( ) MemberKind.GeneralizedFunctionType',
'endFunctionType Function',
'endTypeArguments 1 < >',
- 'handleType S >',
+ 'handleType S',
'endTypeArguments 1 < >'
]);
expectComplexTypeArg('<S<void Function()>>', expectedCalls: [
@@ -1227,7 +1227,7 @@
'endFormalParameters 0 ( ) MemberKind.GeneralizedFunctionType',
'endFunctionType Function',
'endTypeArguments 1 < >',
- 'handleType S >',
+ 'handleType S',
'endTypeArguments 1 < >'
]);
}
@@ -1239,7 +1239,7 @@
'beginTypeArguments <',
'handleIdentifier S typeReference',
'handleNoTypeArguments extends',
- 'handleType S extends',
+ 'handleType S',
'endTypeArguments 1 < >',
]);
expectComplexTypeArg('<S extends List<T>>', expectedErrors: [
@@ -1248,7 +1248,7 @@
'beginTypeArguments <',
'handleIdentifier S typeReference',
'handleNoTypeArguments extends',
- 'handleType S extends',
+ 'handleType S',
'endTypeArguments 1 < >',
]);
expectComplexTypeArg('<@A S,T>', expectedErrors: [
@@ -1257,10 +1257,10 @@
'beginTypeArguments <',
'handleIdentifier S typeReference',
'handleNoTypeArguments ,',
- 'handleType S ,',
+ 'handleType S',
'handleIdentifier T typeReference',
'handleNoTypeArguments >',
- 'handleType T >',
+ 'handleType T',
'endTypeArguments 2 < >'
]);
expectComplexTypeArg('<@A() S,T>', expectedErrors: [
@@ -1269,10 +1269,10 @@
'beginTypeArguments <',
'handleIdentifier S typeReference',
'handleNoTypeArguments ,',
- 'handleType S ,',
+ 'handleType S',
'handleIdentifier T typeReference',
'handleNoTypeArguments >',
- 'handleType T >',
+ 'handleType T',
'endTypeArguments 2 < >'
]);
expectComplexTypeArg('<@A() @B S,T>', expectedErrors: [
@@ -1282,10 +1282,10 @@
'beginTypeArguments <',
'handleIdentifier S typeReference',
'handleNoTypeArguments ,',
- 'handleType S ,',
+ 'handleType S',
'handleIdentifier T typeReference',
'handleNoTypeArguments >',
- 'handleType T >',
+ 'handleType T',
'endTypeArguments 2 < >'
]);
expectComplexTypeArg('<S T>',
@@ -1305,9 +1305,9 @@
'beginTypeArguments <',
'handleIdentifier T typeReference',
'handleNoTypeArguments ',
- 'handleType T ',
+ 'handleType T',
'endTypeArguments 1 < >',
- 'handleType S ',
+ 'handleType S',
'endTypeArguments 1 < >'
]);
}
@@ -1339,7 +1339,7 @@
'handleTypeVariablesDefined T 1',
'handleIdentifier T typeReference',
'handleNoTypeArguments >',
- 'handleType T >',
+ 'handleType T',
'endTypeVariable > 0 extends',
'endTypeVariables < >',
]);
@@ -1352,7 +1352,7 @@
'handleTypeVariablesDefined T 1',
'handleIdentifier T typeReference',
'handleNoTypeArguments >',
- 'handleType T >',
+ 'handleType T',
'endTypeVariable > 0 super',
'endTypeVariables < >',
]);
@@ -1367,9 +1367,9 @@
'beginTypeArguments <',
'handleIdentifier T typeReference',
'handleNoTypeArguments >',
- 'handleType T >',
+ 'handleType T',
'endTypeArguments 1 < >',
- 'handleType List >',
+ 'handleType List',
'endTypeVariable > 0 extends',
'endTypeVariables < >',
]);
@@ -1539,9 +1539,9 @@
'beginTypeArguments <',
'handleIdentifier T typeReference',
'handleNoTypeArguments fieldName',
- 'handleType T fieldName',
+ 'handleType T',
'endTypeArguments 1 < >',
- 'handleType List fieldName',
+ 'handleType List',
'endTypeVariable fieldName 0 extends',
'endTypeVariables < >',
]);
@@ -1559,9 +1559,9 @@
'beginTypeArguments <',
'handleIdentifier T typeReference',
'handleNoTypeArguments >',
- 'handleType T >',
+ 'handleType T',
'endTypeArguments 1 < >',
- 'handleType Comparable >',
+ 'handleType Comparable',
'endTypeVariable > 0 extends',
'endTypeVariables < >',
]);
@@ -1582,9 +1582,9 @@
'beginTypeArguments <',
'handleIdentifier S typeReference',
'handleNoTypeArguments >',
- 'handleType S >',
+ 'handleType S',
'endTypeArguments 1 < >',
- 'handleType Comparable ,',
+ 'handleType Comparable',
'endTypeVariable , 0 extends',
'endTypeVariables < >'
]);
@@ -1604,7 +1604,7 @@
'beginFormalParameter T MemberKind.GeneralizedFunctionType',
'handleIdentifier T typeReference',
'handleNoTypeArguments )',
- 'handleType T )',
+ 'handleType T',
'handleNoName )',
'handleFormalParameterWithoutValue )',
'endFormalParameter null null ) FormalParameterKind.mandatory MemberKind.GeneralizedFunctionType',
@@ -1626,11 +1626,11 @@
'beginTypeArguments <',
'handleIdentifier T typeReference',
'handleNoTypeArguments >',
- 'handleType T >',
+ 'handleType T',
'endTypeArguments 1 < >',
- 'handleType List >',
+ 'handleType List',
'endTypeArguments 1 < >',
- 'handleType List >',
+ 'handleType List',
'endTypeVariable > 0 extends',
'endTypeVariables < >'
]);
@@ -2013,8 +2013,8 @@
}
@override
- void handleType(Token beginToken, Token endToken) {
- calls.add('handleType $beginToken $endToken');
+ void handleType(Token beginToken) {
+ calls.add('handleType $beginToken');
}
@override
