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>
55 lines
3.1 KiB
Plaintext
55 lines
3.1 KiB
Plaintext
parseUnit(var)
|
|
skipErrorTokens(var)
|
|
listener: beginCompilationUnit(var)
|
|
syntheticPreviousToken(var)
|
|
parseTopLevelDeclarationImpl(, DirectiveContext(DirectiveState.Unknown))
|
|
parseMetadataStar()
|
|
listener: beginMetadataStar(var)
|
|
listener: endMetadataStar(0)
|
|
parseTopLevelMemberImpl()
|
|
listener: beginTopLevelMember(var)
|
|
skipOuterPattern(var)
|
|
reportRecoverableErrorWithEnd((, ), PatternVariableDeclarationOutsideFunctionOrMethod)
|
|
listener: handleRecoverableError(PatternVariableDeclarationOutsideFunctionOrMethod, (, ))
|
|
rewriter()
|
|
rewriter()
|
|
parseFields(, null, null, null, null, null, null, var, var, NoType(), , DeclarationKind.TopLevel, null, true)
|
|
listener: beginFields(DeclarationKind.TopLevel, null, null, null, null, null, null, var, )
|
|
listener: handleNoType(var)
|
|
ensureIdentifierPotentiallyRecovered(var, topLevelVariableDeclaration, true)
|
|
listener: handleIdentifier(, topLevelVariableDeclaration)
|
|
parseFieldInitializerOpt(, , null, null, null, null, var, DeclarationKind.TopLevel, null)
|
|
listener: beginFieldInitializer(=)
|
|
parseExpression(=)
|
|
looksLikeOuterPatternEquals(=)
|
|
skipOuterPattern(=)
|
|
parsePrecedenceExpression(=, 1, true, ConstantPatternContext.none)
|
|
parseUnaryExpression(=, true, ConstantPatternContext.none)
|
|
parsePrimary(=, expression, ConstantPatternContext.none)
|
|
parseParenthesizedExpressionFunctionLiteralOrRecordLiteral(=, ConstantPatternContext.none)
|
|
parseParenthesizedExpressionOrRecordLiteral(=, null, ConstantPatternContext.none)
|
|
listener: beginParenthesizedExpressionOrRecordLiteral(()
|
|
parseExpression(()
|
|
looksLikeOuterPatternEquals(()
|
|
skipOuterPattern(()
|
|
parsePrecedenceExpression((, 1, true, ConstantPatternContext.none)
|
|
parseUnaryExpression((, true, ConstantPatternContext.none)
|
|
parsePrimary((, expression, ConstantPatternContext.none)
|
|
parseLiteralInt(()
|
|
listener: handleLiteralInt(0)
|
|
parseExpression(,)
|
|
looksLikeOuterPatternEquals(,)
|
|
skipOuterPattern(,)
|
|
parsePrecedenceExpression(,, 1, true, ConstantPatternContext.none)
|
|
parseUnaryExpression(,, true, ConstantPatternContext.none)
|
|
parsePrimary(,, expression, ConstantPatternContext.none)
|
|
parseLiteralInt(,)
|
|
listener: handleLiteralInt(1)
|
|
ensureCloseParen(1, ()
|
|
listener: endRecordLiteral((, 2, null)
|
|
listener: endFieldInitializer(=, ))
|
|
listener: endTopLevelFields(null, null, null, null, null, var, 1, var, ;)
|
|
listener: endTopLevelDeclaration(;)
|
|
reportAllErrorTokens(var)
|
|
listener: endCompilationUnit(1, )
|