Skip to content

Commit e30f607

Browse files
jensjohaCommit Queue
jensjoha
authored and
Commit Queue
committed
[parser] Don't use the next token as the end on handleSend
Change-Id: Ic4bacffab3fdd9d23bea9b1ecd0f2cfdecb82e2e Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/399060 Reviewed-by: Johnni Winther <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Jens Johansen <[email protected]>
1 parent 67ead16 commit e30f607

File tree

1,376 files changed

+5555
-5555
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,376 files changed

+5555
-5555
lines changed

‎pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6929,7 +6929,7 @@ class Parser {
69296929
// Constructor forwarding.
69306930
listener.handleNoTypeArguments(next);
69316931
token = parseArguments(token);
6932-
listener.handleSend(thisToken, token.next!);
6932+
listener.handleSend(thisToken, token);
69336933
}
69346934
return token;
69356935
}
@@ -6943,7 +6943,7 @@ class Parser {
69436943
// Super constructor.
69446944
listener.handleNoTypeArguments(next);
69456945
token = parseArguments(token);
6946-
listener.handleSend(superToken, token.next!);
6946+
listener.handleSend(superToken, token);
69476947
} else if (next.isA(TokenType.QUESTION_PERIOD)) {
69486948
reportRecoverableError(next, codes.messageSuperNullAware);
69496949
}
@@ -6960,7 +6960,7 @@ class Parser {
69606960
if (next.isA(TokenType.OPEN_PAREN)) {
69616961
listener.handleNoTypeArguments(next);
69626962
token = parseArguments(token);
6963-
listener.handleSend(augmentToken, token.next!);
6963+
listener.handleSend(augmentToken, token);
69646964
}
69656965
return token;
69666966
}
@@ -7796,7 +7796,7 @@ class Parser {
77967796
constantPatternContext = ConstantPatternContext.none;
77977797
}
77987798
token = parseArgumentsOpt(token);
7799-
listener.handleSend(beginToken, token.next!);
7799+
listener.handleSend(beginToken, token);
78007800
return token;
78017801
}
78027802

‎pkg/front_end/parser_testcases/augmentation/augment_super.dart.expect‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ beginCompilationUnit(augment)
3232
handleNoTypeArguments(()
3333
beginArguments(()
3434
endArguments(0, (, ))
35-
handleSend(augment, ;)
35+
handleSend(augment, ))
3636
handleExpressionStatement(augment, ;)
3737
endBlockFunctionBody(1, {, })
3838
endTopLevelMethod(augment, null, })
@@ -63,7 +63,7 @@ beginCompilationUnit(augment)
6363
handleIdentifier(augment, expression)
6464
handleNoTypeArguments(;)
6565
handleNoArguments(;)
66-
handleSend(augment, ;)
66+
handleSend(augment, augment)
6767
handleExpressionStatement(augment, ;)
6868
endBlockFunctionBody(2, {, })
6969
endTopLevelMethod(augment, null, })
@@ -126,7 +126,7 @@ beginCompilationUnit(augment)
126126
handleIdentifier(value, expression)
127127
handleNoTypeArguments([)
128128
handleNoArguments([)
129-
handleSend(value, [)
129+
handleSend(value, value)
130130
handleLiteralInt(1)
131131
handleIndexedExpression(null, [, ])
132132
handleAssignmentExpression(=, ])
@@ -135,7 +135,7 @@ beginCompilationUnit(augment)
135135
handleIdentifier(value, expression)
136136
handleNoTypeArguments(;)
137137
handleNoArguments(;)
138-
handleSend(value, ;)
138+
handleSend(value, value)
139139
handleAssignmentExpression(=, value)
140140
handleExpressionStatement(augment, ;)
141141
endBlockFunctionBody(2, {, })
@@ -156,7 +156,7 @@ beginCompilationUnit(augment)
156156
handleNoTypeArguments(()
157157
beginArguments(()
158158
endArguments(0, (, ))
159-
handleSend(augment, ;)
159+
handleSend(augment, ))
160160
handleExpressionStatement(augment, ;)
161161
handleAugmentSuperExpression(augment, super, expression)
162162
handleExpressionStatement(augment, ;)
@@ -175,7 +175,7 @@ beginCompilationUnit(augment)
175175
handleIdentifier(augment, expression)
176176
handleNoTypeArguments(;)
177177
handleNoArguments(;)
178-
handleSend(augment, ;)
178+
handleSend(augment, augment)
179179
handleExpressionStatement(augment, ;)
180180
endBlockFunctionBody(4, {, })
181181
endTopLevelMethod(void, null, })
@@ -208,7 +208,7 @@ beginCompilationUnit(augment)
208208
handleNoTypeArguments(()
209209
beginArguments(()
210210
endArguments(0, (, ))
211-
handleSend(augment, ;)
211+
handleSend(augment, ))
212212
handleExpressionStatement(augment, ;)
213213
endBlockFunctionBody(1, {, })
214214
endClassMethod(null, augment, (, null, })
@@ -240,7 +240,7 @@ beginCompilationUnit(augment)
240240
handleIdentifier(augment, expression)
241241
handleNoTypeArguments(;)
242242
handleNoArguments(;)
243-
handleSend(augment, ;)
243+
handleSend(augment, augment)
244244
handleExpressionStatement(augment, ;)
245245
endBlockFunctionBody(2, {, })
246246
endClassMethod(null, augment, (, null, })
@@ -296,7 +296,7 @@ beginCompilationUnit(augment)
296296
handleIdentifier(value, expression)
297297
handleNoTypeArguments(;)
298298
handleNoArguments(;)
299-
handleSend(value, ;)
299+
handleSend(value, value)
300300
handleAssignmentExpression(=, value)
301301
handleExpressionStatement(augment, ;)
302302
endBlockFunctionBody(1, {, })
@@ -318,7 +318,7 @@ beginCompilationUnit(augment)
318318
handleNoTypeArguments(()
319319
beginArguments(()
320320
endArguments(0, (, ))
321-
handleSend(augment, ;)
321+
handleSend(augment, ))
322322
handleExpressionStatement(augment, ;)
323323
handleAugmentSuperExpression(augment, super, expression)
324324
handleExpressionStatement(augment, ;)
@@ -337,7 +337,7 @@ beginCompilationUnit(augment)
337337
handleIdentifier(augment, expression)
338338
handleNoTypeArguments(;)
339339
handleNoArguments(;)
340-
handleSend(augment, ;)
340+
handleSend(augment, augment)
341341
handleExpressionStatement(augment, ;)
342342
endBlockFunctionBody(4, {, })
343343
endClassMethod(null, void, (, null, })

‎pkg/front_end/parser_testcases/augmentation/augment_super.dart.intertwined.expect‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ parseUnit(augment)
4141
parseArgumentsRest(()
4242
listener: beginArguments(()
4343
listener: endArguments(0, (, ))
44-
listener: handleSend(augment, ;)
44+
listener: handleSend(augment, ))
4545
ensureSemicolon())
4646
listener: handleExpressionStatement(augment, ;)
4747
notEofOrValue(}, })
@@ -116,7 +116,7 @@ parseUnit(augment)
116116
listener: handleNoTypeArguments(;)
117117
parseArgumentsOpt(augment)
118118
listener: handleNoArguments(;)
119-
listener: handleSend(augment, ;)
119+
listener: handleSend(augment, augment)
120120
ensureSemicolon(augment)
121121
listener: handleExpressionStatement(augment, ;)
122122
notEofOrValue(}, })
@@ -258,7 +258,7 @@ parseUnit(augment)
258258
listener: handleNoTypeArguments([)
259259
parseArgumentsOpt(value)
260260
listener: handleNoArguments([)
261-
listener: handleSend(value, [)
261+
listener: handleSend(value, value)
262262
parseArgumentOrIndexStar(value, NoTypeParamOrArg(), false)
263263
parseExpression([)
264264
parsePrecedenceExpression([, 1, true, ConstantPatternContext.none)
@@ -292,7 +292,7 @@ parseUnit(augment)
292292
listener: handleNoTypeArguments(;)
293293
parseArgumentsOpt(value)
294294
listener: handleNoArguments(;)
295-
listener: handleSend(value, ;)
295+
listener: handleSend(value, value)
296296
listener: handleAssignmentExpression(=, value)
297297
ensureSemicolon(value)
298298
listener: handleExpressionStatement(augment, ;)
@@ -339,7 +339,7 @@ parseUnit(augment)
339339
parseArgumentsRest(()
340340
listener: beginArguments(()
341341
listener: endArguments(0, (, ))
342-
listener: handleSend(augment, ;)
342+
listener: handleSend(augment, ))
343343
ensureSemicolon())
344344
listener: handleExpressionStatement(augment, ;)
345345
notEofOrValue(}, augment)
@@ -400,7 +400,7 @@ parseUnit(augment)
400400
listener: handleNoTypeArguments(;)
401401
parseArgumentsOpt(augment)
402402
listener: handleNoArguments(;)
403-
listener: handleSend(augment, ;)
403+
listener: handleSend(augment, augment)
404404
ensureSemicolon(augment)
405405
listener: handleExpressionStatement(augment, ;)
406406
notEofOrValue(}, })
@@ -473,7 +473,7 @@ parseUnit(augment)
473473
parseArgumentsRest(()
474474
listener: beginArguments(()
475475
listener: endArguments(0, (, ))
476-
listener: handleSend(augment, ;)
476+
listener: handleSend(augment, ))
477477
ensureSemicolon())
478478
listener: handleExpressionStatement(augment, ;)
479479
notEofOrValue(}, })
@@ -552,7 +552,7 @@ parseUnit(augment)
552552
listener: handleNoTypeArguments(;)
553553
parseArgumentsOpt(augment)
554554
listener: handleNoArguments(;)
555-
listener: handleSend(augment, ;)
555+
listener: handleSend(augment, augment)
556556
ensureSemicolon(augment)
557557
listener: handleExpressionStatement(augment, ;)
558558
notEofOrValue(}, })
@@ -699,7 +699,7 @@ parseUnit(augment)
699699
listener: handleNoTypeArguments(;)
700700
parseArgumentsOpt(value)
701701
listener: handleNoArguments(;)
702-
listener: handleSend(value, ;)
702+
listener: handleSend(value, value)
703703
listener: handleAssignmentExpression(=, value)
704704
ensureSemicolon(value)
705705
listener: handleExpressionStatement(augment, ;)
@@ -750,7 +750,7 @@ parseUnit(augment)
750750
parseArgumentsRest(()
751751
listener: beginArguments(()
752752
listener: endArguments(0, (, ))
753-
listener: handleSend(augment, ;)
753+
listener: handleSend(augment, ))
754754
ensureSemicolon())
755755
listener: handleExpressionStatement(augment, ;)
756756
notEofOrValue(}, augment)
@@ -811,7 +811,7 @@ parseUnit(augment)
811811
listener: handleNoTypeArguments(;)
812812
parseArgumentsOpt(augment)
813813
listener: handleNoArguments(;)
814-
listener: handleSend(augment, ;)
814+
listener: handleSend(augment, augment)
815815
ensureSemicolon(augment)
816816
listener: handleExpressionStatement(augment, ;)
817817
notEofOrValue(}, })

‎pkg/front_end/parser_testcases/error_recovery/await_not_in_async.dart.expect‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ beginCompilationUnit(Future)
2222
handleIdentifier(Future, expression)
2323
handleNoTypeArguments(.)
2424
handleNoArguments(.)
25-
handleSend(Future, .)
25+
handleSend(Future, Future)
2626
handleIdentifier(value, expressionContinuation)
2727
handleNoTypeArguments(()
2828
beginArguments(()
2929
endArguments(0, (, ))
30-
handleSend(value, ;)
30+
handleSend(value, ))
3131
handleEndingBinaryExpression(., ))
3232
handleExpressionFunctionBody(=>, ;)
3333
endTopLevelMethod(Future, null, ;)
@@ -48,7 +48,7 @@ beginCompilationUnit(Future)
4848
handleNoTypeArguments(()
4949
beginArguments(()
5050
endArguments(0, (, ))
51-
handleSend(f, ;)
51+
handleSend(f, ))
5252
handleRecoverableError(AwaitNotAsync, await, await)
5353
endInvalidAwaitExpression(await, ), AwaitNotAsync)
5454
handleExpressionStatement(await, ;)

‎pkg/front_end/parser_testcases/error_recovery/await_not_in_async.dart.intertwined.expect‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ parseUnit(Future)
4242
listener: handleNoTypeArguments(.)
4343
parseArgumentsOpt(Future)
4444
listener: handleNoArguments(.)
45-
listener: handleSend(Future, .)
45+
listener: handleSend(Future, Future)
4646
parsePrimary(., expressionContinuation, ConstantPatternContext.none)
4747
parseSendOrFunctionLiteral(., expressionContinuation, ConstantPatternContext.none)
4848
parseSend(., expressionContinuation, ConstantPatternContext.none)
@@ -55,7 +55,7 @@ parseUnit(Future)
5555
parseArgumentsRest(()
5656
listener: beginArguments(()
5757
listener: endArguments(0, (, ))
58-
listener: handleSend(value, ;)
58+
listener: handleSend(value, ))
5959
listener: handleEndingBinaryExpression(., ))
6060
ensureSemicolon())
6161
listener: handleExpressionFunctionBody(=>, ;)
@@ -115,7 +115,7 @@ parseUnit(Future)
115115
parseArgumentsRest(()
116116
listener: beginArguments(()
117117
listener: endArguments(0, (, ))
118-
listener: handleSend(f, ;)
118+
listener: handleSend(f, ))
119119
inAsync()
120120
reportRecoverableError(await, AwaitNotAsync)
121121
listener: handleRecoverableError(AwaitNotAsync, await, await)

‎pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_00.dart.expect‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ beginCompilationUnit(void)
4747
handleIdentifier(, expression)
4848
handleNoTypeArguments(])
4949
handleNoArguments(])
50-
handleSend(, ])
50+
handleSend(, )
5151
handleRecoverableError(Message[ExpectedButGot, Expected ')' before this., null, {string: )}], ], ])
5252
endParenthesizedExpression(()
5353
handleLiteralList(1, [, null, ])

‎pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_00.dart.intertwined.expect‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ parseUnit(void)
118118
listener: handleNoTypeArguments(])
119119
parseArgumentsOpt()
120120
listener: handleNoArguments(])
121-
listener: handleSend(, ])
121+
listener: handleSend(, )
122122
ensureCloseParen(, ()
123123
reportRecoverableError(], Message[ExpectedButGot, Expected ')' before this., null, {string: )}])
124124
listener: handleRecoverableError(Message[ExpectedButGot, Expected ')' before this., null, {string: )}], ], ])

‎pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_01.dart.expect‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -73,35 +73,35 @@ beginCompilationUnit(class)
7373
handleNoTypeArguments(()
7474
beginArguments(()
7575
endArguments(0, (, ))
76-
handleSend(C, ,)
76+
handleSend(C, ))
7777
handleIdentifier(C, expression)
7878
handleNoTypeArguments(()
7979
beginArguments(()
8080
endArguments(0, (, ))
81-
handleSend(C, ,)
81+
handleSend(C, ))
8282
handleIdentifier(C, expression)
8383
handleNoTypeArguments(()
8484
beginArguments(()
8585
endArguments(0, (, ))
86-
handleSend(C, ,)
86+
handleSend(C, ))
8787
handleLiteralList(3, [, null, ])
8888
handleNamedArgument(:)
8989
endArguments(1, (, ))
90-
handleSend(C, ,)
90+
handleSend(C, ))
9191
handleIdentifier(C, expression)
9292
handleNoTypeArguments(()
9393
beginArguments(()
9494
endArguments(0, (, ))
95-
handleSend(C, ,)
95+
handleSend(C, ))
9696
handleIdentifier(C, expression)
9797
handleNoTypeArguments(()
9898
beginArguments(()
9999
endArguments(0, (, ))
100-
handleSend(C, ,)
100+
handleSend(C, ))
101101
handleLiteralList(3, [, null, ])
102102
handleNamedArgument(:)
103103
endArguments(1, (, ))
104-
handleSend(C, ;)
104+
handleSend(C, ))
105105
endReturnStatement(true, return, ;)
106106
endBlockFunctionBody(1, {, })
107107
endClassMethod(null, C, (, null, })
@@ -172,40 +172,40 @@ beginCompilationUnit(class)
172172
handleNoTypeArguments(()
173173
beginArguments(()
174174
endArguments(0, (, ))
175-
handleSend(D, ,)
175+
handleSend(D, ))
176176
handleNamedArgument(:)
177177
handleIdentifier(D, expression)
178178
handleNoTypeArguments(()
179179
beginArguments(()
180180
endArguments(0, (, ))
181-
handleSend(D, ,)
181+
handleSend(D, ))
182182
handleIdentifier(D, expression)
183183
handleNoTypeArguments(()
184184
beginArguments(()
185185
endArguments(0, (, ))
186-
handleSend(D, ,)
186+
handleSend(D, ))
187187
handleRecoverableError(Message[ExpectedIdentifier, Expected an identifier, but got ']'., Try inserting an identifier before ']'., {lexeme: ]}], ], ])
188188
handleIdentifier(, expression)
189189
handleNoTypeArguments(])
190190
handleNoArguments(])
191-
handleSend(, ])
191+
handleSend(, )
192192
handleRecoverableError(Message[ExpectedButGot, Expected ')' before this., null, {string: )}], ], ])
193193
endArguments(4, (, ))
194-
handleSend(D, ,)
194+
handleSend(D, ))
195195
handleIdentifier(D, expression)
196196
handleNoTypeArguments(()
197197
beginArguments(()
198198
endArguments(0, (, ))
199-
handleSend(D, ,)
199+
handleSend(D, ))
200200
handleIdentifier(D, expression)
201201
handleNoTypeArguments(()
202202
beginArguments(()
203203
endArguments(0, (, ))
204-
handleSend(D, ,)
204+
handleSend(D, ))
205205
handleLiteralList(3, [, null, ])
206206
handleNamedArgument(:)
207207
endArguments(1, (, ))
208-
handleSend(D, ;)
208+
handleSend(D, ))
209209
endReturnStatement(true, return, ;)
210210
endBlockFunctionBody(1, {, })
211211
endClassMethod(null, D, (, null, })

0 commit comments

Comments
 (0)