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>
84 lines
5.0 KiB
Plaintext
84 lines
5.0 KiB
Plaintext
parseUnit(f)
|
|
skipErrorTokens(f)
|
|
listener: beginCompilationUnit(f)
|
|
syntheticPreviousToken(f)
|
|
parseTopLevelDeclarationImpl(, DirectiveContext(DirectiveState.Unknown))
|
|
parseMetadataStar()
|
|
listener: beginMetadataStar(f)
|
|
listener: endMetadataStar(0)
|
|
parseTopLevelMemberImpl()
|
|
listener: beginTopLevelMember(f)
|
|
isReservedKeyword(()
|
|
parseTopLevelMethod(, null, null, , NoType(), null, f, false)
|
|
listener: beginTopLevelMethod(, null, null)
|
|
listener: handleNoType()
|
|
ensureIdentifierPotentiallyRecovered(, topLevelFunctionDeclaration, false)
|
|
listener: handleIdentifier(f, topLevelFunctionDeclaration)
|
|
parseMethodTypeVar(f)
|
|
listener: handleNoTypeVariables(()
|
|
parseGetterOrFormalParameters(f, f, false, MemberKind.TopLevelMethod)
|
|
parseFormalParameters(f, MemberKind.TopLevelMethod)
|
|
parseFormalParametersRest((, MemberKind.TopLevelMethod)
|
|
listener: beginFormalParameters((, MemberKind.TopLevelMethod)
|
|
listener: endFormalParameters(0, (, ), MemberKind.TopLevelMethod)
|
|
parseAsyncModifierOpt())
|
|
listener: handleAsyncModifier(null, null)
|
|
inPlainSync()
|
|
parseFunctionBody(), false, false)
|
|
parseExpressionFunctionBody(=>, false)
|
|
parseExpression(=>)
|
|
looksLikeOuterPatternEquals(=>)
|
|
skipOuterPattern(=>)
|
|
parsePrecedenceExpression(=>, 1, true, ConstantPatternContext.none)
|
|
parseUnaryExpression(=>, true, ConstantPatternContext.none)
|
|
parsePrimary(=>, expression, ConstantPatternContext.none)
|
|
inPlainSync()
|
|
parseSwitchExpression(=>)
|
|
listener: beginSwitchExpression(switch)
|
|
ensureParenthesizedCondition(switch, allowCase: false)
|
|
parseExpressionInParenthesisRest((, allowCase: false)
|
|
parseExpression(()
|
|
looksLikeOuterPatternEquals(()
|
|
skipOuterPattern(()
|
|
parsePrecedenceExpression((, 1, true, ConstantPatternContext.none)
|
|
parseUnaryExpression((, true, ConstantPatternContext.none)
|
|
parsePrimary((, expression, ConstantPatternContext.none)
|
|
parseParenthesizedExpressionFunctionLiteralOrRecordLiteral((, ConstantPatternContext.none)
|
|
listener: handleNoTypeVariables(()
|
|
parseFunctionExpression(()
|
|
listener: beginFunctionExpression(()
|
|
parseFormalParametersRequiredOpt((, MemberKind.Local)
|
|
parseFormalParametersRest((, MemberKind.Local)
|
|
listener: beginFormalParameters((, MemberKind.Local)
|
|
listener: endFormalParameters(0, (, ), MemberKind.Local)
|
|
parseAsyncOptBody(), true, false)
|
|
parseAsyncModifierOpt())
|
|
listener: handleAsyncModifier(null, null)
|
|
inPlainSync()
|
|
parseFunctionBody(), true, false)
|
|
parseExpressionFunctionBody(=>, true)
|
|
parseExpression(=>)
|
|
looksLikeOuterPatternEquals(=>)
|
|
skipOuterPattern(=>)
|
|
parsePrecedenceExpression(=>, 1, true, ConstantPatternContext.none)
|
|
parseUnaryExpression(=>, true, ConstantPatternContext.none)
|
|
parsePrimary(=>, expression, ConstantPatternContext.none)
|
|
parseLiteralInt(=>)
|
|
listener: handleLiteralInt(0)
|
|
listener: handleExpressionFunctionBody(=>, null)
|
|
inGenerator()
|
|
listener: endFunctionExpression((, 0)
|
|
ensureCloseParen(0, ()
|
|
listener: handleParenthesizedCondition((, null, null)
|
|
ensureBlock(), BlockKind(switch expression))
|
|
listener: beginSwitchExpressionBlock({)
|
|
listener: endSwitchExpressionBlock(0, {, })
|
|
listener: endSwitchExpression(switch, })
|
|
ensureSemicolon(})
|
|
listener: handleExpressionFunctionBody(=>, ;)
|
|
inGenerator()
|
|
listener: endTopLevelMethod(f, null, ;)
|
|
listener: endTopLevelDeclaration(;)
|
|
reportAllErrorTokens(f)
|
|
listener: endCompilationUnit(1, )
|