carbon-language/carbon-lang
1
0 Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-11-15 04:58:33 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Support for terse => function bodies (#7895)

Browse Source 
Treat the function as having a `-> auto` return type. Reject calls to
functions that still have a non-deduced `-> auto` return type, and
rewrite the function to have the actual return type once it is known.

Assisted-by: Gemini via Antigravity
This commit is contained in:
Richard Smith authored and GitHub committed 2026-10-16 21:48:48 +00:00
1 parent d08805f1a6
commit b766aa4d16
30 files changed
+1323 -322
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

toolchain/parse/handle_lambda.cpp
+10 -8
View File
@@ -45,10 +45,10 @@ static auto ParseLambdaBody(Context& context, Context::State state,
bool has_return_type) -> void {
if (context.PositionIs(Lex::TokenKind::EqualGreater)) {
// Terse body `=> expr`
context.AddNode(NodeKind::LambdaDefinitionStart, context.Consume(),
context.AddNode(NodeKind::LambdaTerseDefinitionStart, context.Consume(),
state.has_error);
state.has_error = false;
context.PushState(state, StateKind::LambdaBodyFinish);
context.PushState(state, StateKind::LambdaTerseBodyFinish);
context.PushStateForExpr(PrecedenceGroup::ForTopLevelExpr());
} else if (context.PositionIs(Lex::TokenKind::OpenCurlyBrace)) {
// Block body `{ ... }`
@@ -59,7 +59,7 @@ static auto ParseLambdaBody(Context& context, Context::State state,
} else {
if (has_return_type) {
CARBON_DIAGNOSTIC(ExpectedLambdaBodyAfterReturnType, Error,
"expected `=>` or `{{` after return type");
"expected `{{` after return type");
context.emitter().Emit(*context.position(),
ExpectedLambdaBodyAfterReturnType);
} else {
@@ -104,11 +104,13 @@ auto HandleLambdaBody(Context& context) -> void {
auto HandleLambdaBodyFinish(Context& context) -> void {
auto state = context.PopState();
if (context.tokens().GetKind(state.token) == Lex::TokenKind::OpenCurlyBrace) {
context.AddNode(NodeKind::Lambda, context.Consume(), state.has_error);
} else {
context.AddNode(NodeKind::Lambda, state.token, state.has_error);
}
context.AddNode(NodeKind::Lambda, context.Consume(), state.has_error);
}
auto HandleLambdaTerseBodyFinish(Context& context) -> void {
auto state = context.PopState();
context.AddNode(NodeKind::LambdaTerseDefinition, state.token,
state.has_error);
}
} // namespace Carbon::Parse