Skip to content
This repository has been archived by the owner on Feb 25, 2025. It is now read-only.

Commit

Permalink
Remove unused fasta parser methods and event parameter
Browse files Browse the repository at this point in the history 
Change-Id: I0bf050a475ad3548342307027d14aba4badf468e
Reviewed-on: https://dart-review.googlesource.com/69620
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Dan Rubel <danrubel@google.com>
  • Loading branch information
Dan Rubel authored and commit-bot@chromium.org committed Aug 13, 2018
1 parent 9faae80 commit 9619e2c
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 74 deletions.
2 changes: 1 addition & 1 deletion pkg/analyzer/lib/src/fasta/ast_builder.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1062,7 +1062,7 @@ class AstBuilder extends StackListener {
}

@override
void endFunctionType(Token functionToken, Token semicolon) {
void endFunctionType(Token functionToken) {
assert(optional('Function', functionToken));
debugEvent("FunctionType");

Expand Down
4 changes: 2 additions & 2 deletions pkg/analyzer/test/generated/parser_fasta_listener.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -782,9 +782,9 @@ class ForwardingTestListener extends ForwardingListener {
}

@override
void endFunctionType(Token functionToken, Token endToken) {
void endFunctionType(Token functionToken) {
end('FunctionType');
super.endFunctionType(functionToken, endToken);
super.endFunctionType(functionToken);
}

@override
Expand Down
2 changes: 1 addition & 1 deletion pkg/front_end/lib/src/fasta/kernel/body_builder.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2305,7 +2305,7 @@ abstract class BodyBuilder extends ScopeListener<JumpTarget>
}

@override
void endFunctionType(Token functionToken, Token endToken) {
void endFunctionType(Token functionToken) {
debugEvent("FunctionType");
FormalParameters<Expression, Statement, Arguments> formals = pop();
DartType returnType = pop();
Expand Down
4 changes: 2 additions & 2 deletions pkg/front_end/lib/src/fasta/parser/forwarding_listener.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -630,8 +630,8 @@ class ForwardingListener implements Listener {
}

@override
void endFunctionType(Token functionToken, Token endToken) {
listener?.endFunctionType(functionToken, endToken);
void endFunctionType(Token functionToken) {
listener?.endFunctionType(functionToken);
}

@override
Expand Down
2 changes: 1 addition & 1 deletion pkg/front_end/lib/src/fasta/parser/listener.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -881,7 +881,7 @@ class Listener implements UnescapeErrorListener {
/// - Type variables
/// - Return type
/// - Formal parameters
void endFunctionType(Token functionToken, Token endToken) {
void endFunctionType(Token functionToken) {
logEvent("FunctionType");
}

Expand Down
45 changes: 0 additions & 45 deletions pkg/front_end/lib/src/fasta/parser/parser.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2431,21 +2431,6 @@ class Parser {
return rewriteAndRecover(token, message, newToken).next;
}

/// If the token after [token] is a '>', return it.
/// If the next token is a composite greater-than token such as '>>',
/// then replace that token with separate tokens, and return the first '>'.
/// Otherwise, report an error, insert a synthetic '>',
/// and return that newly inserted synthetic '>'.
Token ensureGt(Token token) {
Token next = token.next;
String value = next.stringValue;
if (value == '>') {
return next;
}
rewriteGtCompositeOrRecover(token, next, value);
return token.next;
}

/// If the token after [token] is a not literal string,
/// then insert a synthetic literal string.
/// Call `parseLiteralString` and return the result.
Expand Down Expand Up @@ -2500,36 +2485,6 @@ class Parser {
return token;
}

void rewriteGtCompositeOrRecover(Token token, Token next, String value) {
assert(value != '>');
Token replacement = new Token(TokenType.GT, next.charOffset);
if (identical(value, '>>')) {
replacement.setNext(new Token(TokenType.GT, next.charOffset + 1));
} else if (identical(value, '>=')) {
replacement.setNext(new Token(TokenType.EQ, next.charOffset + 1));
} else if (identical(value, '>>=')) {
replacement.setNext(new Token(TokenType.GT, next.charOffset + 1));
replacement.next.setNext(new Token(TokenType.EQ, next.charOffset + 2));
} else {
// Recovery
rewriteAndRecover(token, fasta.templateExpectedToken.withArguments('>'),
new SyntheticToken(TokenType.GT, next.offset));
return;
}
rewriter.replaceTokenFollowing(token, replacement);
}

void rewriteLtEndGroupOpt(BeginToken beginToken) {
assert(optional('<', beginToken));
Token end = beginToken.endGroup;
String value = end?.stringValue;
if (value != null && value.length > 1) {
Token beforeEnd = previousToken(beginToken, end);
rewriteGtCompositeOrRecover(beforeEnd, end, value);
beginToken.endGroup = null;
}
}

/// Report the given token as unexpected and return the next token if the next
/// token is one of the [expectedNext], otherwise just return the given token.
Token skipUnexpectedTokenOpt(Token token, List<String> expectedNext) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/front_end/lib/src/fasta/parser/type_info_impl.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ class ComplexTypeInfo implements TypeInfo {
}
token = parser.parseFormalParametersRequiredOpt(
token, MemberKind.GeneralizedFunctionType);
parser.listener.endFunctionType(functionToken, token.next);
parser.listener.endFunctionType(functionToken);
}

// There are two situations in which the [token] != [end]:
Expand Down
2 changes: 1 addition & 1 deletion pkg/front_end/lib/src/fasta/source/diet_listener.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ class DietListener extends StackListener {
}

@override
void endFunctionType(Token functionToken, Token endToken) {
void endFunctionType(Token functionToken) {
debugEvent("FunctionType");
discard(1);
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/front_end/lib/src/fasta/source/outline_builder.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1062,7 +1062,7 @@ class OutlineBuilder extends StackListener {
}

@override
void endFunctionType(Token functionToken, Token endToken) {
void endFunctionType(Token functionToken) {
debugEvent("FunctionType");
List<FormalParameterBuilder> formals = pop();
pop(); // formals offset
Expand Down
38 changes: 19 additions & 19 deletions pkg/front_end/test/fasta/parser/type_info_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ class TypeInfoTest {
'handleNoType ',
'beginFormalParameters ( MemberKind.GeneralizedFunctionType',
'endFormalParameters 0 ( ) MemberKind.GeneralizedFunctionType',
'endFunctionType Function m',
'endFunctionType Function',
]);
expectComplexInfo('Function<T>() m', expectedAfter: 'm', expectedCalls: [
'beginTypeVariables <',
Expand All @@ -402,7 +402,7 @@ class TypeInfoTest {
'handleNoType ',
'beginFormalParameters ( MemberKind.GeneralizedFunctionType',
'endFormalParameters 0 ( ) MemberKind.GeneralizedFunctionType',
'endFunctionType Function m',
'endFunctionType Function',
]);
expectComplexInfo('Function(int) m', expectedAfter: 'm', expectedCalls: [
'handleNoTypeVariables (',
Expand All @@ -420,7 +420,7 @@ class TypeInfoTest {
'endFormalParameter null null ) FormalParameterKind.mandatory '
'MemberKind.GeneralizedFunctionType',
'endFormalParameters 1 ( ) MemberKind.GeneralizedFunctionType',
'endFunctionType Function m',
'endFunctionType Function',
]);
expectComplexInfo('Function<T>(int) m', expectedAfter: 'm', expectedCalls: [
'beginTypeVariables <',
Expand All @@ -446,7 +446,7 @@ class TypeInfoTest {
'endFormalParameter null null ) FormalParameterKind.mandatory'
' MemberKind.GeneralizedFunctionType',
'endFormalParameters 1 ( ) MemberKind.GeneralizedFunctionType',
'endFunctionType Function m',
'endFunctionType Function',
]);

expectInfo(noType, 'Function(int x)', required: false);
Expand Down Expand Up @@ -520,7 +520,7 @@ class TypeInfoTest {
'handleType C Function',
'beginFormalParameters ( MemberKind.GeneralizedFunctionType',
'endFormalParameters 0 ( ) MemberKind.GeneralizedFunctionType',
'endFunctionType Function ',
'endFunctionType Function',
]);
}

Expand Down Expand Up @@ -622,7 +622,7 @@ class TypeInfoTest {
'handleType C Function',
'beginFormalParameters ( MemberKind.GeneralizedFunctionType',
'endFormalParameters 0 ( ) MemberKind.GeneralizedFunctionType',
'endFunctionType Function ',
'endFunctionType Function',
]);
expectComplexInfo('C<T> Function<T>(int x) Function<T>(int x)',
required: false, expectedAfter: 'Function');
Expand Down Expand Up @@ -755,7 +755,7 @@ class TypeInfoTest {
'handleType C Function',
'beginFormalParameters ( MemberKind.GeneralizedFunctionType',
'endFormalParameters 0 ( ) MemberKind.GeneralizedFunctionType',
'endFunctionType Function ',
'endFunctionType Function',
]);
expectComplexInfo('C.a Function<T>(int x) Function<T>(int x)',
required: false, expectedAfter: 'Function');
Expand Down Expand Up @@ -834,7 +834,7 @@ class TypeInfoTest {
'endFormalParameter null null x FormalParameterKind.mandatory '
'MemberKind.GeneralizedFunctionType',
'endFormalParameters 1 ( ) MemberKind.GeneralizedFunctionType',
'endFunctionType Function Function',
'endFunctionType Function',
'beginFormalParameters ( MemberKind.GeneralizedFunctionType',
'beginMetadataStar int',
'endMetadataStar 0',
Expand All @@ -847,7 +847,7 @@ class TypeInfoTest {
'endFormalParameter null null x FormalParameterKind.mandatory '
'MemberKind.GeneralizedFunctionType',
'endFormalParameters 1 ( ) MemberKind.GeneralizedFunctionType',
'endFunctionType Function ',
'endFunctionType Function',
]);
}

Expand All @@ -873,7 +873,7 @@ class TypeInfoTest {
'handleVoidKeyword void',
'beginFormalParameters ( MemberKind.GeneralizedFunctionType',
'endFormalParameters 0 ( ) MemberKind.GeneralizedFunctionType',
'endFunctionType Function ',
'endFunctionType Function',
]);
}

Expand All @@ -885,7 +885,7 @@ class TypeInfoTest {
'handleVoidKeyword void',
'beginFormalParameters ( MemberKind.GeneralizedFunctionType',
'endFormalParameters 0 ( ) MemberKind.GeneralizedFunctionType',
'endFunctionType Function ',
'endFunctionType Function',
]);

expectInfo(voidType, 'void Function<T>()', required: false);
Expand Down Expand Up @@ -1046,7 +1046,7 @@ class TypeParamOrArgInfoTest {
'handleType S Function',
'beginFormalParameters ( MemberKind.GeneralizedFunctionType',
'endFormalParameters 0 ( ) MemberKind.GeneralizedFunctionType',
'endFunctionType Function >',
'endFunctionType Function',
'endTypeArguments 1 < >'
]);
expectComplexTypeArg('<void Function()>', expectedCalls: [
Expand All @@ -1056,7 +1056,7 @@ class TypeParamOrArgInfoTest {
'handleVoidKeyword void',
'beginFormalParameters ( MemberKind.GeneralizedFunctionType',
'endFormalParameters 0 ( ) MemberKind.GeneralizedFunctionType',
'endFunctionType Function >',
'endFunctionType Function',
'endTypeArguments 1 < >'
]);
expectComplexTypeArg('<S<T>>', expectedCalls: [
Expand All @@ -1079,7 +1079,7 @@ class TypeParamOrArgInfoTest {
'handleNoType <',
'beginFormalParameters ( MemberKind.GeneralizedFunctionType',
'endFormalParameters 0 ( ) MemberKind.GeneralizedFunctionType',
'endFunctionType Function >',
'endFunctionType Function',
'endTypeArguments 1 < >',
'handleType S >',
'endTypeArguments 1 < >'
Expand All @@ -1093,7 +1093,7 @@ class TypeParamOrArgInfoTest {
'handleVoidKeyword void', // was 'handleNoType <'
'beginFormalParameters ( MemberKind.GeneralizedFunctionType',
'endFormalParameters 0 ( ) MemberKind.GeneralizedFunctionType',
'endFunctionType Function >',
'endFunctionType Function',
'endTypeArguments 1 < >',
'handleType S >',
'endTypeArguments 1 < >'
Expand Down Expand Up @@ -1243,7 +1243,7 @@ class TypeParamOrArgInfoTest {
'handleVoidKeyword void',
'beginFormalParameters ( MemberKind.GeneralizedFunctionType',
'endFormalParameters 0 ( ) MemberKind.GeneralizedFunctionType',
'endFunctionType Function >',
'endFunctionType Function',
'endTypeVariable > 1 extends',
'handleNoType R',
'endTypeVariable , 0 null',
Expand Down Expand Up @@ -1437,7 +1437,7 @@ class TypeParamOrArgInfoTest {
'handleFormalParameterWithoutValue )',
'endFormalParameter null null ) FormalParameterKind.mandatory MemberKind.GeneralizedFunctionType',
'endFormalParameters 1 ( ) MemberKind.GeneralizedFunctionType',
'endFunctionType Function >',
'endFunctionType Function',
'endTypeVariable > 0 extends',
'endTypeVariables < >'
]);
Expand Down Expand Up @@ -1740,8 +1740,8 @@ class TypeInfoListener implements Listener {
}

@override
void endFunctionType(Token functionToken, Token endToken) {
calls.add('endFunctionType $functionToken $endToken');
void endFunctionType(Token functionToken) {
calls.add('endFunctionType $functionToken');
}

@override
Expand Down

0 comments on commit 9619e2c

Please sign in to comment.