Jens Johansen
fc67d31862
When the parser sends events to the listener some events has a pair of parameters, `beginToken` and `endToken`. Most of these are constructed in such a way that the `beginToken` is the first token and the `endToken` is the last token in that construct. This is for instance the case with `endClassDeclaration`. It was, however, not the case for `endMetadata` where `endToken` instead was the next token *not* in the metadata. In this CL I've found a changed the following to point to the last token in the construct instead of the next token not in the construct and renamed the parameter where it made sense: * `endAssert` --- and renamed `semicolonToken` (which only pointed to a semicolon for statements) to `endToken`. * `endAwaitExpression` * `endConstLiteral` --- and renamed `token` to `endToken` * `endConstructorReference` * `endFieldInitializer` --- and renamed `token` to `endToken` * `endForIn` * `endForInBody` --- and renamed `token` to `endToken` * `endForStatement` * `endForStatementBody` --- and renamed `token` to `endToken` * `endFunctionExpression` --- and renamed `token` to `endToken` * `endInitializer` --- and renamed `token` to `endToken` * `endInitializers` * `endInvalidAwaitExpression` * `endMetadata` * `endSwitchCase` * `endTopLevelDeclaration` --- and renamed `nextToken` to `endToken` * `endWhileStatement` * `endWhileStatementBody` --- and renamed `token` to `endToken` * `handleNoConstructorReferenceContinuationAfterTypeArguments` In the few places in listeners where these values were used I've mostly updated to do e.g. `endToken.text!` to retain the current behavior. Change-Id: I25495e160d1eec5c75bcf1313b512cd04bcb1533 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/364322 Reviewed-by: Johnni Winther <johnniwinther@google.com> Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Commit-Queue: Jens Johansen <jensj@google.com>
32 lines
1.1 KiB
Plaintext
32 lines
1.1 KiB
Plaintext
beginCompilationUnit(main)
|
|
beginMetadataStar(main)
|
|
endMetadataStar(0)
|
|
beginTopLevelMember(main)
|
|
beginTopLevelMethod(, null, null)
|
|
handleNoType()
|
|
handleIdentifier(main, topLevelFunctionDeclaration)
|
|
handleNoTypeVariables(()
|
|
beginFormalParameters((, MemberKind.TopLevelMethod)
|
|
endFormalParameters(0, (, ), MemberKind.TopLevelMethod)
|
|
handleAsyncModifier(null, null)
|
|
beginBlockFunctionBody({)
|
|
beginMetadataStar(local)
|
|
endMetadataStar(0)
|
|
handleNoTypeVariables(()
|
|
beginLocalFunctionDeclaration(local)
|
|
handleNoType({)
|
|
beginFunctionName(local)
|
|
handleIdentifier(local, localFunctionDeclaration)
|
|
endFunctionName(local, ()
|
|
beginFormalParameters((, MemberKind.Local)
|
|
endFormalParameters(0, (, ), MemberKind.Local)
|
|
handleNoInitializers()
|
|
handleAsyncModifier(null, null)
|
|
beginBlockFunctionBody({)
|
|
endBlockFunctionBody(0, {, })
|
|
endLocalFunctionDeclaration(})
|
|
endBlockFunctionBody(1, {, })
|
|
endTopLevelMethod(main, null, })
|
|
endTopLevelDeclaration(})
|
|
endCompilationUnit(1, )
|