Files
carbon-lang/toolchain/parse/handle_function.cpp
T
David BlaikieandNicholas Bishop 059ee7b9ed Parse -> ref T as a primitive return form (#7911)
Previously `-> ref T` was parsed as a type expression whose outermost
node is a `ref` prefix operator (the same one used for `F(ref x)`
arguments), and `ReturnExprAsForm` recognized the resulting `RefTagExpr`
and turned it into a `RefForm`.

Per p5434, a return form that begins with `val`, `ref`, or `var` is not
a type expression. Parse a leading `ref` after `->` as a
`RefPrimitiveForm` node wrapping the type expression, reusing the node
produced by `form(ref T)`, and check it as a form. This prepares for
supporting `-> val T` and `-> var T` in the same way.

The only SemIR change is that the `ref_tag` instruction is no longer
emitted, and the return slot pattern refers to a `type_component_of` the
form, matching `->? form(ref T)`.

---------

Co-authored-by: Nicholas Bishop <nbishop@nbishop.net>
2026-10-07 23:05:55 +00:00

137 lines
5.0 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/parse/context.h"
#include "toolchain/parse/handle.h"
namespace Carbon::Parse {
auto HandleFunctionIntroducer(Context& context) -> void {
auto state = context.PopState();
context.PushState(state, StateKind::FunctionAfterParams);
context.PushState(StateKind::DeclNameAndParams, state.token);
}
auto HandleFunctionAfterParams(Context& context) -> void {
auto state = context.PopState();
// Regardless of whether there's a return type, we'll finish the signature.
context.PushState(state, StateKind::FunctionSignatureFinish);
// If there is a return type, parse the expression before adding the return
// type node.
if (context.PositionIs(Lex::TokenKind::MinusGreater)) {
context.PushState(StateKind::FunctionReturnTypeFinish);
context.ConsumeAndDiscard();
context.PushState(StateKind::ReturnTypeOrFormExpr);
} else if (context.PositionIs(Lex::TokenKind::MinusGreaterQuestion)) {
context.PushState(StateKind::FunctionReturnFormFinish);
context.ConsumeAndDiscard();
context.PushStateForExpr(PrecedenceGroup::ForType());
}
}
auto HandleReturnTypeOrFormExpr(Context& context) -> void {
context.PopAndDiscardState();
// `-> ref T` specifies a primitive return form.
if (context.PositionIs(Lex::TokenKind::Ref)) {
context.PushState(StateKind::PrimitiveFormFinish, context.Consume());
}
context.PushStateForExpr(PrecedenceGroup::ForType());
}
auto HandleFunctionReturnTypeFinish(Context& context) -> void {
auto state = context.PopState();
context.AddNode(NodeKind::ReturnType, state.token, state.has_error);
}
auto HandleFunctionReturnFormFinish(Context& context) -> void {
auto state = context.PopState();
context.AddNode(NodeKind::ReturnForm, state.token, state.has_error);
}
auto HandleFunctionSignatureFinish(Context& context) -> void {
auto state = context.PopState();
switch (context.PositionKind()) {
case Lex::TokenKind::Semi: {
context.AddNode(NodeKind::FunctionDecl, context.Consume(),
state.has_error);
break;
}
case Lex::TokenKind::OpenCurlyBrace: {
context.AddFunctionDefinitionStart(context.Consume(), state.has_error);
// Any error is recorded on the FunctionDefinitionStart.
state.has_error = false;
context.PushState(state, StateKind::FunctionDefinitionFinish);
context.PushState(StateKind::StatementScopeLoop);
break;
}
case Lex::TokenKind::EqualGreater: {
context.AddFunctionDefinitionStart(context.Consume(), state.has_error);
context.PushState(state, StateKind::FunctionTerseBodyFinish);
context.PushStateForExpr(PrecedenceGroup::ForTopLevelExpr());
break;
}
case Lex::TokenKind::Equal: {
context.AddNode(NodeKind::BuiltinFunctionDefinitionStart,
context.Consume(), state.has_error);
if (!context.ConsumeAndAddLeafNodeIf(Lex::TokenKind::StringLiteral,
NodeKind::BuiltinName)) {
CARBON_DIAGNOSTIC(ExpectedBuiltinName, Error,
"expected builtin function name after `=`");
context.emitter().Emit(*context.position(), ExpectedBuiltinName);
state.has_error = true;
}
auto semi = context.ConsumeIf(Lex::TokenKind::Semi);
if (!semi && !state.has_error) {
context.DiagnoseExpectedDeclSemi(context.tokens().GetKind(state.token));
state.has_error = true;
}
if (state.has_error) {
context.RecoverFromDeclError(state, NodeKind::BuiltinFunctionDefinition,
/*skip_past_likely_end=*/true);
} else {
context.AddNode(NodeKind::BuiltinFunctionDefinition, *semi,
state.has_error);
}
break;
}
default: {
if (!state.has_error) {
context.DiagnoseExpectedDeclSemiOrDefinition(Lex::TokenKind::Fn);
}
// Only need to skip if we've not already found a new line.
bool skip_past_likely_end =
context.tokens().GetLine(*context.position()) ==
context.tokens().GetLine(state.token);
context.RecoverFromDeclError(state, NodeKind::FunctionDecl,
skip_past_likely_end);
break;
}
}
}
auto HandleFunctionDefinitionFinish(Context& context) -> void {
auto state = context.PopState();
context.AddFunctionDefinition(context.Consume(), state.has_error);
}
auto HandleFunctionTerseBodyFinish(Context& context) -> void {
auto state = context.PopState();
auto semi = context.ConsumeIf(Lex::TokenKind::Semi);
if (!semi && !state.has_error) {
context.DiagnoseExpectedDeclSemi(Lex::TokenKind::Fn);
state.has_error = true;
}
context.AddFunctionTerseDefinition(semi ? *semi : *(context.position() - 1),
state.has_error);
}
} // namespace Carbon::Parse