Adding more function support to the Parser2 rewrite (#2375)

Also does `if` support, discussed refactorings, like PopState/PushState instead of edits.

With these changes, I'm to where I can start talking about what's still missing:

```
//toolchain/parser/testdata:basics/fail_invalid_designators.carbon.test  FAILED in 0.7s
//toolchain/parser/testdata:basics/fail_paren_match_regression.carbon.test FAILED in 0.6s
//toolchain/parser/testdata:basics/function_call.carbon.test             FAILED in 0.7s
//toolchain/parser/testdata:basics/package.carbon.test                   FAILED in 0.7s
//toolchain/parser/testdata:basics/structs.carbon.test                   FAILED in 0.7s
//toolchain/parser/testdata:basics/tuples.carbon.test                    FAILED in 0.6s
//toolchain/parser/testdata:basics/var.carbon.test                       FAILED in 0.7s
//toolchain/parser/testdata:for/fail_colon_instead_of_in.carbon.test     FAILED in 0.6s
//toolchain/parser/testdata:for/fail_missing_in.carbon.test              FAILED in 0.6s
//toolchain/parser/testdata:for/fail_missing_var.carbon.test             FAILED in 0.7s
//toolchain/parser/testdata:for/nested.carbon.test                       FAILED in 0.6s
//toolchain/parser/testdata:for/simple.carbon.test                       FAILED in 0.6s
//toolchain/parser/testdata:function/definition/with_params.carbon.test  FAILED in 0.7s
//toolchain/parser/testdata:operators/associative.carbon.test            FAILED in 0.6s
//toolchain/parser/testdata:operators/fail_missing_precedence_and_or.carbon.test FAILED in 0.6s
//toolchain/parser/testdata:operators/fail_missing_precedence_or_and.carbon.test FAILED in 0.6s
//toolchain/parser/testdata:operators/fail_variety.carbon.test           FAILED in 0.6s
//toolchain/parser/testdata:operators/fixity.carbon.test                 FAILED in 0.9s
//toolchain/parser/testdata:operators/missing_precedence_not.carbon.test FAILED in 0.6s
//toolchain/parser/testdata:operators/postfix_unary.carbon.test          FAILED in 0.7s
//toolchain/parser/testdata:operators/prefix_unary.carbon.test           FAILED in 0.7s
//toolchain/parser/testdata:while/basic.carbon.test                      FAILED in 0.6s
//toolchain/parser/testdata:while/fail_unbraced.carbon.test              FAILED in 0.6s
```

This does modify a couple `if` tests to not test so much expression syntax -- that just seems like unrelated syntax.
This commit is contained in:
Jon Ross-Perkins authored and GitHub committed 2022-11-08 08:47:09 -08:00
1 parent e557d4af3b
commit 7c102d3726
7 files changed
+747 -157

No files matched your search

+514 -83
View File
@@ -27,13 +27,23 @@ class Parser2::PrettyStackTraceParseState : public llvm::PrettyStackTraceEntry {
output << "Parser stack:\n";
for (int i = 0; i < static_cast<int>(parser_->state_stack_.size()); ++i) {
const auto& entry = parser_->state_stack_[i];
output << "\t" << i << ".\t" << entry.state << " @ " << entry.start_token
<< ":" << parser_->tokens_.GetKind(entry.start_token).Name()
<< "\n";
output << "\t" << i << ".\t" << entry.state;
Print(output, entry.token);
}
output << "\tabort\tposition_";
Print(output, *parser_->position_);
}
private:
auto Print(llvm::raw_ostream& output, TokenizedBuffer::Token token) const
-> void {
auto line = parser_->tokens_.GetLine(token);
output << " @ " << parser_->tokens_.GetLineNumber(line) << ":"
<< parser_->tokens_.GetColumnNumber(token) << ":"
<< " token " << token << " : "
<< parser_->tokens_.GetKind(token).Name() << "\n";
}
const Parser2* parser_;
};
@@ -70,6 +80,22 @@ auto Parser2::AddNode(ParseNodeKind kind, TokenizedBuffer::Token token,
}
}
auto Parser2::ConsumeAndAddCloseParen(TokenizedBuffer::Token open_paren,
ParseNodeKind close_kind) -> bool {
if (ConsumeAndAddLeafNodeIf(TokenKind::CloseParen(), close_kind)) {
return true;
}
// TODO: Include the location of the matching open_paren in the diagnostic.
CARBON_DIAGNOSTIC(ExpectedCloseParen, Error, "Unexpected tokens before `)`.");
emitter_.Emit(*position_, ExpectedCloseParen);
SkipTo(tokens_.GetMatchedClosingToken(open_paren));
AddLeafNode(close_kind, *position_);
++position_;
return false;
}
auto Parser2::ConsumeAndAddLeafNodeIf(TokenKind token_kind,
ParseNodeKind node_kind) -> bool {
auto token = ConsumeIf(token_kind);
@@ -91,10 +117,34 @@ auto Parser2::ConsumeIf(TokenKind kind)
return token;
}
auto Parser2::FindNextOf(std::initializer_list<TokenKind> desired_kinds)
-> llvm::Optional<TokenizedBuffer::Token> {
auto new_position = position_;
while (true) {
TokenizedBuffer::Token token = *new_position;
TokenKind kind = tokens_.GetKind(token);
if (kind.IsOneOf(desired_kinds)) {
return token;
}
// Step to the next token at the current bracketing level.
if (kind.IsClosingSymbol() || kind == TokenKind::EndOfFile()) {
// There are no more tokens at this level.
return llvm::None;
} else if (kind.IsOpeningSymbol()) {
new_position =
TokenizedBuffer::TokenIterator(tokens_.GetMatchedClosingToken(token));
// Advance past the closing token.
++new_position;
} else {
++new_position;
}
}
}
auto Parser2::Parse() -> void {
#ifndef NDEBUG
// Traces state_stack_. This runs even in opt because it's low overhead.
PrettyStackTraceParseState pretty_stack(this);
#endif
PushState(ParserState::Declaration());
while (!state_stack_.empty()) {
@@ -122,7 +172,9 @@ auto Parser2::SkipMatchingGroup() -> bool {
auto Parser2::SkipPastLikelyEnd(TokenizedBuffer::Token skip_root)
-> llvm::Optional<TokenizedBuffer::Token> {
CARBON_CHECK(position_ < end_);
if (position_ == end_) {
return llvm::None;
}
TokenizedBuffer::Line root_line = tokens_.GetLine(skip_root);
int root_line_indent = tokens_.GetIndentColumnNumber(root_line);
@@ -166,56 +218,160 @@ auto Parser2::SkipPastLikelyEnd(TokenizedBuffer::Token skip_root)
}
auto Parser2::SkipTo(TokenizedBuffer::Token t) -> void {
CARBON_CHECK(t > *position_) << "Tried to skip backwards.";
CARBON_CHECK(t >= *position_) << "Tried to skip backwards from " << position_
<< " to " << TokenizedBuffer::TokenIterator(t);
position_ = TokenizedBuffer::TokenIterator(t);
CARBON_CHECK(position_ != end_) << "Skipped past EOF.";
}
auto Parser2::HandleDeclarationState() -> void {
do {
switch (auto token_kind = PositionKind()) {
case TokenKind::EndOfFile(): {
state_stack_.pop_back();
return;
}
case TokenKind::Fn(): {
PushState(ParserState::FunctionIntroducer());
AddLeafNode(ParseNodeKind::FunctionIntroducer(), *position_);
++position_;
return;
}
case TokenKind::Semi(): {
AddLeafNode(ParseNodeKind::EmptyDeclaration(), *position_);
++position_;
break;
}
default: {
CARBON_DIAGNOSTIC(UnrecognizedDeclaration, Error,
"Unrecognized declaration introducer.");
emitter_.Emit(*position_, UnrecognizedDeclaration);
tree_.has_errors_ = true;
if (auto semi = SkipPastLikelyEnd(*position_)) {
AddLeafNode(ParseNodeKind::EmptyDeclaration(), *semi,
/*has_error=*/true);
}
break;
}
}
} while (position_ < end_);
auto Parser2::HandleCodeBlock() -> void {
PushState(ParserState::CodeBlockFinish());
if (ConsumeAndAddLeafNodeIf(TokenKind::OpenCurlyBrace(),
ParseNodeKind::CodeBlockStart())) {
PushState(ParserState::StatementScope());
} else {
AddLeafNode(ParseNodeKind::CodeBlockStart(), *position_,
/*has_error=*/true);
// Recover by parsing a single statement.
CARBON_DIAGNOSTIC(ExpectedCodeBlock, Error, "Expected braced code block.");
emitter_.Emit(*position_, ExpectedCodeBlock);
HandleStatement(PositionKind());
}
}
auto Parser2::HandleFunctionError(bool skip_past_likely_end) -> void {
auto token = state_stack_.back().start_token;
if (skip_past_likely_end && SkipPastLikelyEnd(token)) {
token = *position_;
auto Parser2::HandleCodeBlockFinishState() -> void {
auto state = PopState();
// If the block started with an open curly, this is a close curly.
if (tokens_.GetKind(state.token) == TokenKind::OpenCurlyBrace()) {
AddNode(ParseNodeKind::CodeBlock(), *position_, state.subtree_start,
state.has_error);
++position_;
} else {
AddNode(ParseNodeKind::CodeBlock(), state.token, state.subtree_start,
/*has_error=*/true);
}
AddNode(ParseNodeKind::FunctionDeclaration(), token,
state_stack_.back().subtree_start,
}
auto Parser2::HandleDeclarationState() -> void {
// This maintains the current state unless we're at the end of the file.
switch (PositionKind()) {
case TokenKind::EndOfFile(): {
PopAndDiscardState();
break;
}
case TokenKind::Fn(): {
PushState(ParserState::FunctionIntroducer());
AddLeafNode(ParseNodeKind::FunctionIntroducer(), *position_);
++position_;
break;
}
case TokenKind::Semi(): {
AddLeafNode(ParseNodeKind::EmptyDeclaration(), *position_);
++position_;
break;
}
default: {
CARBON_DIAGNOSTIC(UnrecognizedDeclaration, Error,
"Unrecognized declaration introducer.");
emitter_.Emit(*position_, UnrecognizedDeclaration);
tree_.has_errors_ = true;
if (auto semi = SkipPastLikelyEnd(*position_)) {
AddLeafNode(ParseNodeKind::EmptyDeclaration(), *semi,
/*has_error=*/true);
}
break;
}
}
}
auto Parser2::HandleExpressionFormPrimary() -> void {
// TODO: Handle OpenParen and OpenCurlyBrace.
switch (PositionKind()) {
case TokenKind::Identifier():
AddLeafNode(ParseNodeKind::NameReference(), *position_);
break;
case TokenKind::IntegerLiteral():
case TokenKind::RealLiteral():
case TokenKind::StringLiteral():
case TokenKind::IntegerTypeLiteral():
case TokenKind::UnsignedIntegerTypeLiteral():
case TokenKind::FloatingPointTypeLiteral():
AddLeafNode(ParseNodeKind::Literal(), *position_);
break;
default:
CARBON_DIAGNOSTIC(ExpectedExpression, Error, "Expected expression.");
emitter_.Emit(*position_, ExpectedExpression);
ReturnErrorOnState();
return;
}
++position_;
}
auto Parser2::HandleExpressionState() -> void {
// TODO: This is temporary, we should need this state. If not, maybe add an
// overload that uses pop_back instead of pop_back_val.
auto state = PopState();
(void)state;
HandleExpressionFormPrimary();
}
auto Parser2::HandleExpressionForTypeState() -> void {
// TODO: This is temporary, we should need this state. If not, maybe add an
// overload that uses pop_back instead of pop_back_val.
auto state = PopState();
(void)state;
HandleExpressionFormPrimary();
}
auto Parser2::HandleExpressionStatementFinishState() -> void {
auto state = PopState();
if (auto semi = ConsumeIf(TokenKind::Semi())) {
AddNode(ParseNodeKind::ExpressionStatement(), *semi, state.subtree_start,
state.has_error);
return;
}
if (!state.has_error) {
CARBON_DIAGNOSTIC(ExpectedSemiAfterExpression, Error,
"Expected `;` after expression.");
emitter_.Emit(*position_, ExpectedSemiAfterExpression);
}
if (auto semi_token = SkipPastLikelyEnd(state.token)) {
AddNode(ParseNodeKind::ExpressionStatement(), *semi_token,
state.subtree_start,
/*has_error=*/true);
return;
}
// Found junk not even followed by a `;`, no node to add.
ReturnErrorOnState();
}
auto Parser2::HandleFunctionError(StateStackEntry state,
bool skip_past_likely_end) -> void {
auto token = state.token;
if (skip_past_likely_end) {
if (auto semi = SkipPastLikelyEnd(token)) {
token = *semi;
}
}
AddNode(ParseNodeKind::FunctionDeclaration(), token, state.subtree_start,
/*has_error=*/true);
state_stack_.pop_back();
}
auto Parser2::HandleFunctionIntroducerState() -> void {
auto state = PopState();
if (!ConsumeAndAddLeafNodeIf(TokenKind::Identifier(),
ParseNodeKind::DeclaredName())) {
CARBON_DIAGNOSTIC(ExpectedFunctionName, Error,
@@ -224,7 +380,7 @@ auto Parser2::HandleFunctionIntroducerState() -> void {
// TODO: We could change the lexer to allow us to synthesize certain
// kinds of tokens and try to "recover" here, but unclear that this is
// really useful.
HandleFunctionError(true);
HandleFunctionError(state, true);
return;
}
@@ -232,57 +388,77 @@ auto Parser2::HandleFunctionIntroducerState() -> void {
CARBON_DIAGNOSTIC(ExpectedFunctionParams, Error,
"Expected `(` after function name.");
emitter_.Emit(*position_, ExpectedFunctionParams);
HandleFunctionError(true);
HandleFunctionError(state, true);
return;
}
// Parse the parameter list as its own subtree; once that pops, resume
// function parsing.
state_stack_.back().state = ParserState::FunctionParameterListDone();
PushState(ParserState::FunctionParameterList());
// Advance past the open parenthesis before continuing.
// TODO: When swapping () start/end, this should AddNode the open before
state.state = ParserState::FunctionAfterParameterList();
PushState(state);
// TODO: When swapping () start/end, this should AddLeafNode the open before
// continuing.
PushState(ParserState::FunctionParameterListFinish());
// Advance past the open paren.
++position_;
}
auto Parser2::HandleFunctionParameterListState() -> void {
// TODO: Handle non-empty lists.
if (!PositionIs(TokenKind::CloseParen())) {
CARBON_DIAGNOSTIC(ExpectedFunctionParams, Error,
"Expected `(` after function name.");
emitter_.Emit(*position_, ExpectedFunctionParams);
SkipTo(tokens_.GetMatchedClosingToken(state_stack_.back().start_token));
AddLeafNode(ParseNodeKind::ParameterListEnd(), *position_,
/*has_error=*/true);
AddNode(ParseNodeKind::ParameterList(), state_stack_.back().start_token,
state_stack_.back().subtree_start);
++position_;
return;
if (PositionKind() != TokenKind::CloseParen()) {
PushState(ParserState::PatternForFunctionParameter());
}
AddLeafNode(ParseNodeKind::ParameterListEnd(), *position_);
AddNode(ParseNodeKind::ParameterList(), state_stack_.back().start_token,
state_stack_.back().subtree_start);
++position_;
state_stack_.pop_back();
}
auto Parser2::HandleFunctionParameterListDoneState() -> void {
switch (auto token_kind = PositionKind()) {
auto Parser2::HandleFunctionParameterListFinishState() -> void {
auto state = PopState();
CARBON_CHECK(PositionKind() == TokenKind::CloseParen())
<< PositionKind().Name();
AddLeafNode(ParseNodeKind::ParameterListEnd(), *position_);
AddNode(ParseNodeKind::ParameterList(), state.token, state.subtree_start,
state.has_error);
++position_;
}
auto Parser2::HandleFunctionAfterParameterListState() -> void {
auto state = PopState();
// Regardless of whether there's a return type, we'll finish the signature.
state.state = ParserState::FunctionSignatureFinish();
PushState(state);
// If there is a return type, parse the expression before adding the return
// type nod.e
if (PositionIs(TokenKind::MinusGreater())) {
PushState(ParserState::FunctionReturnTypeFinish());
++position_;
PushState(ParserState::ExpressionForType());
}
}
auto Parser2::HandleFunctionReturnTypeFinishState() -> void {
auto state = PopState();
AddNode(ParseNodeKind::ReturnType(), state.token, state.subtree_start,
state.has_error);
}
auto Parser2::HandleFunctionSignatureFinishState() -> void {
auto state = PopState();
switch (PositionKind()) {
case TokenKind::Semi(): {
AddNode(ParseNodeKind::FunctionDeclaration(), *position_,
state_stack_.back().subtree_start);
state.subtree_start, state.has_error);
++position_;
state_stack_.pop_back();
break;
}
// TODO: OpenCurlyBrace is a definition.
case TokenKind::OpenCurlyBrace(): {
CARBON_DIAGNOSTIC(
ExpectedFunctionBodyOrSemi, Error,
"Expected function definition or `;` after function declaration.");
emitter_.Emit(*position_, ExpectedFunctionBodyOrSemi);
HandleFunctionError(true);
AddNode(ParseNodeKind::FunctionDefinitionStart(), *position_,
state.subtree_start, state.has_error);
++position_;
// Any error is recorded on the FunctionDefinitionStart.
state.has_error = false;
state.state = ParserState::FunctionDefinitionFinish();
PushState(state);
PushState(ParserState::StatementScope());
break;
}
default: {
@@ -291,11 +467,266 @@ auto Parser2::HandleFunctionParameterListDoneState() -> void {
"Expected function definition or `;` after function declaration.");
emitter_.Emit(*position_, ExpectedFunctionBodyOrSemi);
// Only need to skip if we've not already found a new line.
HandleFunctionError(tokens_.GetLine(*position_) ==
tokens_.GetLine(state_stack_.back().start_token));
bool skip_past_likely_end =
tokens_.GetLine(*position_) == tokens_.GetLine(state.token);
HandleFunctionError(state, skip_past_likely_end);
break;
}
}
}
auto Parser2::HandleFunctionDefinitionFinishState() -> void {
auto state = PopState();
AddNode(ParseNodeKind::FunctionDefinition(), *position_, state.subtree_start,
state.has_error);
++position_;
}
auto Parser2::HandlePatternStart(PatternKind pattern_kind) -> void {
auto state = PopState();
// Ensure the finish state always follows.
switch (pattern_kind) {
case PatternKind::Parameter: {
state.state = ParserState::PatternForFunctionParameterFinish();
break;
}
case PatternKind::Variable: {
CARBON_FATAL() << "TODO";
break;
}
}
// Handle an invalid pattern introducer.
if (!PositionIs(TokenKind::Identifier()) ||
tokens_.GetKind(*(position_ + 1)) != TokenKind::Colon()) {
switch (pattern_kind) {
case PatternKind::Parameter: {
CARBON_DIAGNOSTIC(ExpectedParameterName, Error,
"Expected parameter declaration.");
emitter_.Emit(*position_, ExpectedParameterName);
break;
}
case PatternKind::Variable: {
CARBON_DIAGNOSTIC(ExpectedVariableName, Error,
"Expected pattern in `var` declaration.");
emitter_.Emit(*position_, ExpectedVariableName);
break;
}
}
state.has_error = true;
PushState(state);
return;
}
// Switch the context token to the colon, so that it'll be used for the root
// node.
state.token = *(position_ + 1);
PushState(state);
PushState(ParserState::ExpressionForType());
AddLeafNode(ParseNodeKind::DeclaredName(), *position_);
position_ += 2;
}
auto Parser2::HandleKeywordStatementFinish(TokenKind token_kind,
ParseNodeKind node_kind) -> void {
auto state = PopState();
auto semi =
ConsumeAndAddLeafNodeIf(TokenKind::Semi(), ParseNodeKind::StatementEnd());
if (!semi) {
CARBON_DIAGNOSTIC(ExpectedSemiAfter, Error, "Expected `;` after `{0}`.",
TokenKind);
emitter_.Emit(*position_, ExpectedSemiAfter, token_kind);
if (auto semi_token = SkipPastLikelyEnd(state.token)) {
AddLeafNode(ParseNodeKind::StatementEnd(), *semi_token,
/*has_error=*/true);
}
}
AddNode(node_kind, state.token, state.subtree_start, state.has_error);
}
auto Parser2::HandleKeywordStatementFinishForReturnState() -> void {
HandleKeywordStatementFinish(TokenKind::Return(),
ParseNodeKind::ReturnStatement());
}
auto Parser2::HandleParenConditionState() -> void {
auto state = PopState();
auto open_paren = ConsumeIf(TokenKind::OpenParen());
if (open_paren) {
state.token = *open_paren;
} else {
CARBON_DIAGNOSTIC(ExpectedParenAfter, Error, "Expected `(` after `{0}`.",
TokenKind);
emitter_.Emit(*position_, ExpectedParenAfter, tokens_.GetKind(state.token));
}
// TODO: This should be adding a ConditionStart here instead of ConditionEnd
// later, so this does state modification instead of a simpler push.
state.state = ParserState::ParenConditionFinish();
PushState(state);
PushState(ParserState::Expression());
}
auto Parser2::HandleParenConditionFinishState() -> void {
auto state = PopState();
if (tokens_.GetKind(state.token) != TokenKind::OpenParen()) {
// Don't expect a matching closing paren if there wasn't an opening paren.
// TODO: Should probably push nodes on this state in order to have the
// condition wrapped, but it wasn't before, so not doing it for consistency.
ReturnErrorOnState();
return;
}
bool close_paren =
ConsumeAndAddCloseParen(state.token, ParseNodeKind::ConditionEnd());
return AddNode(ParseNodeKind::Condition(), state.token, state.subtree_start,
/*has_error=*/state.has_error || !close_paren);
}
auto Parser2::HandlePatternForFunctionParameterState() -> void {
HandlePatternStart(PatternKind::Parameter);
}
auto Parser2::HandlePatternForFunctionParameterFinishState() -> void {
auto state = PopState();
// If an error was encountered, propagate it without adding a node.
bool has_error = state.has_error;
if (has_error) {
ReturnErrorOnState();
} else {
// TODO: may need to mark has_error if !type.
AddNode(ParseNodeKind::PatternBinding(), state.token, state.subtree_start,
state.has_error);
}
// Handle tokens following a parameter.
switch (PositionKind()) {
case TokenKind::CloseParen(): {
// Done with the parameter list.
return;
}
case TokenKind::Comma(): {
// Comma handling is after the switch.
break;
}
default: {
// Don't error twice for the same issue.
if (!has_error) {
CARBON_DIAGNOSTIC(UnexpectedTokenAfterListElement, Error,
"Expected `,` or `)`.");
emitter_.Emit(*position_, UnexpectedTokenAfterListElement);
ReturnErrorOnState();
}
// Recover from the invalid token.
auto end_of_element =
FindNextOf({TokenKind::Comma(), TokenKind::CloseParen()});
// The lexer guarantees that parentheses are balanced.
CARBON_CHECK(end_of_element) << "missing matching `)` for `(`";
SkipTo(*end_of_element);
if (PositionKind() == TokenKind::CloseParen()) {
// Done with the parameter list.
return;
}
// Comma handling is after the switch.
break;
}
}
// We are guaranteed to now be at a comma.
AddLeafNode(ParseNodeKind::ParameterListComma(), *position_);
++position_;
if (PositionKind() != TokenKind::CloseParen()) {
PushState(ParserState::PatternForFunctionParameter());
}
}
auto Parser2::HandleStatementIf() -> void {
PushState(ParserState::StatementIfConditionFinish());
PushState(ParserState::ParenCondition());
++position_;
}
auto Parser2::HandleStatementIfConditionFinishState() -> void {
auto state = PopState();
state.state = ParserState::StatementIfThenBlockFinish();
PushState(state);
HandleCodeBlock();
}
auto Parser2::HandleStatementIfThenBlockFinishState() -> void {
auto state = PopState();
if (ConsumeAndAddLeafNodeIf(TokenKind::Else(),
ParseNodeKind::IfStatementElse())) {
state.state = ParserState::StatementIfElseBlockFinish();
PushState(state);
// `else if` is permitted as a special case.
if (PositionIs(TokenKind::If())) {
HandleStatementIf();
} else {
HandleCodeBlock();
}
} else {
AddNode(ParseNodeKind::IfStatement(), state.token, state.subtree_start,
state.has_error);
}
}
auto Parser2::HandleStatementIfElseBlockFinishState() -> void {
auto state = PopState();
AddNode(ParseNodeKind::IfStatement(), state.token, state.subtree_start,
state.has_error);
}
auto Parser2::HandleStatement(TokenKind token_kind) -> void {
switch (token_kind) {
case TokenKind::If(): {
HandleStatementIf();
break;
}
case TokenKind::Return(): {
auto return_token = *position_;
if (tokens_.GetKind(*(position_ + 1)) == TokenKind::Semi()) {
int subtree_start = tree_.size();
AddLeafNode(ParseNodeKind::StatementEnd(), *(position_ + 1));
AddNode(ParseNodeKind::ReturnStatement(), return_token, subtree_start,
/*has_error=*/false);
position_ += 2;
} else {
PushState(ParserState::KeywordStatementFinishForReturn());
++position_;
PushState(ParserState::Expression());
}
break;
}
default: {
PushState(ParserState::ExpressionStatementFinish());
PushState(ParserState::Expression());
break;
}
}
}
auto Parser2::HandleStatementScopeState() -> void {
// This maintains the current state until we're at the end of the scope.
auto token_kind = PositionKind();
if (token_kind == TokenKind::CloseCurlyBrace()) {
auto state = PopState();
if (state.has_error) {
ReturnErrorOnState();
}
} else {
HandleStatement(token_kind);
}
}
} // namespace Carbon