Index: pkg/front_end/lib/src/fasta/source/outline_builder.dart |
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 8fa539d7197e2e6b1b268a5108182e1a74b88e63..85f8d88dedda9db726aab2b080aa74d59e6225f5 100644 |
--- a/pkg/front_end/lib/src/fasta/source/outline_builder.dart |
+++ b/pkg/front_end/lib/src/fasta/source/outline_builder.dart |
@@ -8,7 +8,7 @@ import 'package:kernel/ast.dart' show AsyncMarker, ProcedureKind; |
import '../fasta_codes.dart' show FastaMessage, codeExpectedBlockToSkip; |
-import '../parser/parser.dart' show FormalParameterType, optional; |
+import '../parser/parser.dart' show FormalParameterType, MemberKind, optional; |
import '../parser/identifier_context.dart' show IdentifierContext; |
@@ -482,8 +482,8 @@ class OutlineBuilder extends UnhandledListener { |
} |
@override |
- void endFormalParameter(Token covariantKeyword, Token thisKeyword, |
- Token nameToken, FormalParameterType kind) { |
+ void endFormalParameter(Token thisKeyword, Token nameToken, |
+ FormalParameterType kind, MemberKind memberKind) { |
debugEvent("FormalParameter"); |
int charOffset = pop(); |
String name = pop(); |
@@ -508,7 +508,7 @@ class OutlineBuilder extends UnhandledListener { |
@override |
void endFunctionTypedFormalParameter( |
- Token covariantKeyword, Token thisKeyword, FormalParameterType kind) { |
+ Token thisKeyword, FormalParameterType kind) { |
debugEvent("FunctionTypedFormalParameter"); |
List<FormalParameterBuilder> formals = pop(); |
int formalsOffset = pop(); |
@@ -541,7 +541,8 @@ class OutlineBuilder extends UnhandledListener { |
} |
@override |
- void endFormalParameters(int count, Token beginToken, Token endToken) { |
+ void endFormalParameters( |
+ int count, Token beginToken, Token endToken, MemberKind kind) { |
debugEvent("FormalParameters"); |
List formals = popList(count); |
if (formals != null && formals.isNotEmpty) { |
@@ -573,9 +574,9 @@ class OutlineBuilder extends UnhandledListener { |
} |
@override |
- void handleNoFormalParameters(Token token) { |
+ void handleNoFormalParameters(Token token, MemberKind kind) { |
push(token.charOffset); |
- super.handleNoFormalParameters(token); |
+ super.handleNoFormalParameters(token, kind); |
} |
@override |
@@ -658,8 +659,7 @@ class OutlineBuilder extends UnhandledListener { |
} |
@override |
- void endFields( |
- int count, Token covariantToken, Token beginToken, Token endToken) { |
+ void endFields(int count, Token beginToken, Token endToken) { |
debugEvent("Fields"); |
List namesOffsetsAndInitializers = popList(count * 4); |
TypeBuilder type = pop(); |