Extract IdentifierContext.typeVariableContext into new subclass
Change-Id: Iae637b02ee517e06d4d04f1e0f0289d760750195
Reviewed-on: https://dart-review.googlesource.com/55600
Reviewed-by: Peter von der Ahé <ahe@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Dan Rubel <danrubel@google.com>
diff --git a/pkg/front_end/lib/src/fasta/parser/identifier_context.dart b/pkg/front_end/lib/src/fasta/parser/identifier_context.dart
index b9bbf76..f87e475 100644
--- a/pkg/front_end/lib/src/fasta/parser/identifier_context.dart
+++ b/pkg/front_end/lib/src/fasta/parser/identifier_context.dart
@@ -102,10 +102,8 @@
/// Identifier is the name of a type variable being declared (e.g. `Foo` in
/// `class C<Foo extends num> {}`).
- static const typeVariableDeclaration = const IdentifierContext(
- 'typeVariableDeclaration',
- inDeclaration: true,
- isBuiltInIdentifierAllowed: false);
+ static const typeVariableDeclaration =
+ const TypeVariableDeclarationIdentifierContext();
/// Identifier is the start of a reference to a type that starts with prefix.
static const prefixedTypeReference =
diff --git a/pkg/front_end/lib/src/fasta/parser/identifier_context_impl.dart b/pkg/front_end/lib/src/fasta/parser/identifier_context_impl.dart
index 299d8c7..a07d7bb 100644
--- a/pkg/front_end/lib/src/fasta/parser/identifier_context_impl.dart
+++ b/pkg/front_end/lib/src/fasta/parser/identifier_context_impl.dart
@@ -546,6 +546,38 @@
}
}
+// See [IdentifierContext.typeVariableDeclaration].
+class TypeVariableDeclarationIdentifierContext extends IdentifierContext {
+ const TypeVariableDeclarationIdentifierContext()
+ : super('typeVariableDeclaration',
+ inDeclaration: true, isBuiltInIdentifierAllowed: false);
+
+ @override
+ Token ensureIdentifier(Token token, Parser parser) {
+ Token identifier = token.next;
+ assert(identifier.kind != IDENTIFIER_TOKEN);
+ if (identifier.type.isPseudo) {
+ return identifier;
+ }
+
+ // Recovery
+ parser.reportRecoverableErrorWithToken(
+ identifier, fasta.templateExpectedIdentifier);
+ const followingValues = const ['<', '>', ';', '}', 'extends', 'super'];
+ if (looksLikeStartOfNextTopLevelDeclaration(identifier) ||
+ looksLikeStartOfNextClassMember(identifier) ||
+ looksLikeStartOfNextStatement(identifier) ||
+ isOneOfOrEof(identifier, followingValues)) {
+ identifier = insertSyntheticIdentifierAfter(token, parser);
+ } else {
+ // When in doubt, consume the token to ensure we make progress
+ // but insert a synthetic identifier to satisfy listeners.
+ identifier = insertSyntheticIdentifierAfter(identifier, parser);
+ }
+ return identifier;
+ }
+}
+
void checkAsyncAwaitYieldAsIdentifier(Token identifier, Parser parser) {
if (!parser.inPlainSync && identifier.type.isPseudo) {
if (optional('await', identifier)) {
diff --git a/pkg/front_end/lib/src/fasta/parser/parser.dart b/pkg/front_end/lib/src/fasta/parser/parser.dart
index cd41203..2e9973d 100644
--- a/pkg/front_end/lib/src/fasta/parser/parser.dart
+++ b/pkg/front_end/lib/src/fasta/parser/parser.dart
@@ -2020,8 +2020,6 @@
followingValues = ['.', '(', '{', '=>'];
} else if (context == IdentifierContext.topLevelFunctionDeclaration) {
followingValues = ['(', '{', '=>'];
- } else if (context == IdentifierContext.typeVariableDeclaration) {
- followingValues = ['<', '>', ';', '}'];
} else {
return false;
}
@@ -2090,10 +2088,6 @@
initialKeywords = statementKeywords();
} else if (context == IdentifierContext.topLevelFunctionDeclaration) {
initialKeywords = topLevelKeywords();
- } else if (context == IdentifierContext.typeVariableDeclaration) {
- initialKeywords = topLevelKeywords()
- ..addAll(classMemberKeywords())
- ..addAll(statementKeywords());
} else {
return false;
}
