mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +01:00
In #3064, code was changed to look at a future token. This is an issue because the parser is set up to enforce that tokens aren't used without being consumed. That's part of #3118; related validation fails. Also, since it's not necessarily the open paren that was consumed, it could be a different opening symbol, which the closing symbol handling doesn't check. Under this approach, it's tracked whether an open paren was consumed, and the open paren is associated with the state. That's more aligned with how the parser expects to be fed information. In paren condition handling for if and while, I'm also adding some special casing for `if {` in particular to not assume the `{` is a struct. I just think that this will come up somewhat often and the resulting output is better this way (an error either way). I'm not doing similar with `for` because there's already some `var` handling there, and I'd need a little more time to think about structure -- whereas right now I'm just trying to fix the crashes (`if {}`, `if []`, etc). Fixes #3118
230 lines
7.4 KiB
C++
230 lines
7.4 KiB
C++
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
|
|
// Exceptions. See /LICENSE for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
|
|
#include "toolchain/parser/parser_context.h"
|
|
|
|
namespace Carbon {
|
|
|
|
auto ParserHandleStatement(ParserContext& context) -> void {
|
|
context.PopAndDiscardState();
|
|
|
|
switch (context.PositionKind()) {
|
|
case TokenKind::Break: {
|
|
context.PushState(ParserState::StatementBreakFinish);
|
|
context.AddLeafNode(ParseNodeKind::BreakStatementStart,
|
|
context.Consume());
|
|
break;
|
|
}
|
|
case TokenKind::Continue: {
|
|
context.PushState(ParserState::StatementContinueFinish);
|
|
context.AddLeafNode(ParseNodeKind::ContinueStatementStart,
|
|
context.Consume());
|
|
break;
|
|
}
|
|
case TokenKind::For: {
|
|
context.PushState(ParserState::StatementForFinish);
|
|
context.PushState(ParserState::StatementForHeader);
|
|
++context.position();
|
|
break;
|
|
}
|
|
case TokenKind::If: {
|
|
context.PushState(ParserState::StatementIf);
|
|
break;
|
|
}
|
|
case TokenKind::Return: {
|
|
context.PushState(ParserState::StatementReturn);
|
|
break;
|
|
}
|
|
case TokenKind::Var: {
|
|
context.PushState(ParserState::VarAsSemicolon);
|
|
break;
|
|
}
|
|
case TokenKind::While: {
|
|
context.PushState(ParserState::StatementWhile);
|
|
break;
|
|
}
|
|
default: {
|
|
context.PushState(ParserState::ExpressionStatementFinish);
|
|
context.PushStateForExpression(PrecedenceGroup::ForExpressionStatement());
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
// Handles the `;` after a keyword statement.
|
|
static auto ParserHandleStatementKeywordFinish(ParserContext& context,
|
|
ParseNodeKind node_kind)
|
|
-> void {
|
|
auto state = context.PopState();
|
|
|
|
auto semi = context.ConsumeIf(TokenKind::Semi);
|
|
if (!semi) {
|
|
CARBON_DIAGNOSTIC(ExpectedStatementSemi, Error,
|
|
"`{0}` statements must end with a `;`.", TokenKind);
|
|
context.emitter().Emit(*context.position(), ExpectedStatementSemi,
|
|
context.tokens().GetKind(state.token));
|
|
state.has_error = true;
|
|
// Recover to the next semicolon if possible, otherwise indicate the
|
|
// keyword for the error.
|
|
semi = context.SkipPastLikelyEnd(state.token);
|
|
if (!semi) {
|
|
semi = state.token;
|
|
}
|
|
}
|
|
context.AddNode(node_kind, *semi, state.subtree_start, state.has_error);
|
|
}
|
|
|
|
auto ParserHandleStatementBreakFinish(ParserContext& context) -> void {
|
|
ParserHandleStatementKeywordFinish(context, ParseNodeKind::BreakStatement);
|
|
}
|
|
|
|
auto ParserHandleStatementContinueFinish(ParserContext& context) -> void {
|
|
ParserHandleStatementKeywordFinish(context, ParseNodeKind::ContinueStatement);
|
|
}
|
|
|
|
auto ParserHandleStatementForHeader(ParserContext& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
std::optional<TokenizedBuffer::Token> open_paren =
|
|
context.ConsumeAndAddOpenParen(state.token,
|
|
ParseNodeKind::ForHeaderStart);
|
|
if (open_paren) {
|
|
state.token = *open_paren;
|
|
}
|
|
state.state = ParserState::StatementForHeaderIn;
|
|
|
|
if (context.PositionIs(TokenKind::Var)) {
|
|
context.PushState(state);
|
|
context.PushState(ParserState::VarAsFor);
|
|
} else {
|
|
CARBON_DIAGNOSTIC(ExpectedVariableDeclaration, Error,
|
|
"Expected `var` declaration.");
|
|
context.emitter().Emit(*context.position(), ExpectedVariableDeclaration);
|
|
|
|
if (auto next_in = context.FindNextOf({TokenKind::In})) {
|
|
context.SkipTo(*next_in);
|
|
++context.position();
|
|
}
|
|
state.has_error = true;
|
|
context.PushState(state);
|
|
}
|
|
}
|
|
|
|
auto ParserHandleStatementForHeaderIn(ParserContext& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
state.state = ParserState::StatementForHeaderFinish;
|
|
context.PushState(state);
|
|
context.PushState(ParserState::Expression);
|
|
}
|
|
|
|
auto ParserHandleStatementForHeaderFinish(ParserContext& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
context.ConsumeAndAddCloseSymbol(state.token, state,
|
|
ParseNodeKind::ForHeader);
|
|
|
|
context.PushState(ParserState::CodeBlock);
|
|
}
|
|
|
|
auto ParserHandleStatementForFinish(ParserContext& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
context.AddNode(ParseNodeKind::ForStatement, state.token, state.subtree_start,
|
|
state.has_error);
|
|
}
|
|
|
|
auto ParserHandleStatementIf(ParserContext& context) -> void {
|
|
context.PopAndDiscardState();
|
|
|
|
context.PushState(ParserState::StatementIfConditionFinish);
|
|
context.PushState(ParserState::ParenConditionAsIf);
|
|
++context.position();
|
|
}
|
|
|
|
auto ParserHandleStatementIfConditionFinish(ParserContext& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
state.state = ParserState::StatementIfThenBlockFinish;
|
|
context.PushState(state);
|
|
context.PushState(ParserState::CodeBlock);
|
|
}
|
|
|
|
auto ParserHandleStatementIfThenBlockFinish(ParserContext& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
if (context.ConsumeAndAddLeafNodeIf(TokenKind::Else,
|
|
ParseNodeKind::IfStatementElse)) {
|
|
state.state = ParserState::StatementIfElseBlockFinish;
|
|
context.PushState(state);
|
|
// `else if` is permitted as a special case.
|
|
context.PushState(context.PositionIs(TokenKind::If)
|
|
? ParserState::StatementIf
|
|
: ParserState::CodeBlock);
|
|
} else {
|
|
context.AddNode(ParseNodeKind::IfStatement, state.token,
|
|
state.subtree_start, state.has_error);
|
|
}
|
|
}
|
|
|
|
auto ParserHandleStatementIfElseBlockFinish(ParserContext& context) -> void {
|
|
auto state = context.PopState();
|
|
context.AddNode(ParseNodeKind::IfStatement, state.token, state.subtree_start,
|
|
state.has_error);
|
|
}
|
|
|
|
auto ParserHandleStatementReturn(ParserContext& context) -> void {
|
|
auto state = context.PopState();
|
|
state.state = ParserState::StatementReturnFinish;
|
|
context.PushState(state);
|
|
|
|
context.AddLeafNode(ParseNodeKind::ReturnStatementStart, context.Consume());
|
|
if (!context.PositionIs(TokenKind::Semi)) {
|
|
context.PushState(ParserState::Expression);
|
|
}
|
|
}
|
|
|
|
auto ParserHandleStatementReturnFinish(ParserContext& context) -> void {
|
|
ParserHandleStatementKeywordFinish(context, ParseNodeKind::ReturnStatement);
|
|
}
|
|
|
|
auto ParserHandleStatementScopeLoop(ParserContext& context) -> void {
|
|
// This maintains the current state until we're at the end of the scope.
|
|
|
|
auto token_kind = context.PositionKind();
|
|
if (token_kind == TokenKind::CloseCurlyBrace) {
|
|
auto state = context.PopState();
|
|
if (state.has_error) {
|
|
context.ReturnErrorOnState();
|
|
}
|
|
} else {
|
|
context.PushState(ParserState::Statement);
|
|
}
|
|
}
|
|
|
|
auto ParserHandleStatementWhile(ParserContext& context) -> void {
|
|
context.PopAndDiscardState();
|
|
|
|
context.PushState(ParserState::StatementWhileConditionFinish);
|
|
context.PushState(ParserState::ParenConditionAsWhile);
|
|
++context.position();
|
|
}
|
|
|
|
auto ParserHandleStatementWhileConditionFinish(ParserContext& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
state.state = ParserState::StatementWhileBlockFinish;
|
|
context.PushState(state);
|
|
context.PushState(ParserState::CodeBlock);
|
|
}
|
|
|
|
auto ParserHandleStatementWhileBlockFinish(ParserContext& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
context.AddNode(ParseNodeKind::WhileStatement, state.token,
|
|
state.subtree_start, state.has_error);
|
|
}
|
|
|
|
} // namespace Carbon
|