mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +01:00
I think there's more we can do here, but this seemed like a good checkpoint to make sure the path I'm going down is roughly what you expected. There's one actual edit in if expression structure to match the increased enforcement.
84 lines
3.2 KiB
C++
84 lines
3.2 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/semantics/semantics_context.h"
|
|
#include "toolchain/semantics/semantics_node.h"
|
|
|
|
namespace Carbon {
|
|
|
|
auto SemanticsHandleExpressionStatement(SemanticsContext& context,
|
|
ParseTree::Node /*parse_node*/)
|
|
-> bool {
|
|
// Pop the expression without investigating its contents.
|
|
// TODO: This will probably eventually need to do some "do not discard"
|
|
// analysis.
|
|
context.node_stack().PopAndDiscardId();
|
|
return true;
|
|
}
|
|
|
|
auto SemanticsHandleReturnStatement(SemanticsContext& context,
|
|
ParseTree::Node parse_node) -> bool {
|
|
CARBON_CHECK(!context.return_scope_stack().empty());
|
|
const auto& fn_node =
|
|
context.semantics_ir().GetNode(context.return_scope_stack().back());
|
|
const auto& callable =
|
|
context.semantics_ir().GetFunction(fn_node.GetAsFunctionDeclaration());
|
|
|
|
if (context.parse_tree().node_kind(context.node_stack().PeekParseNode()) ==
|
|
ParseNodeKind::ReturnStatementStart) {
|
|
context.node_stack()
|
|
.PopAndDiscardSoloParseNode<ParseNodeKind::ReturnStatementStart>();
|
|
|
|
if (callable.return_type_id.is_valid()) {
|
|
// TODO: Add a note pointing at the return type's parse node.
|
|
CARBON_DIAGNOSTIC(ReturnStatementMissingExpression, Error,
|
|
"Must return a {0}.", std::string);
|
|
context.emitter()
|
|
.Build(parse_node, ReturnStatementMissingExpression,
|
|
context.semantics_ir().StringifyType(callable.return_type_id))
|
|
.Emit();
|
|
}
|
|
|
|
context.AddNode(SemanticsNode::Return::Make(parse_node));
|
|
} else {
|
|
auto arg = context.node_stack().Pop<SemanticsNodeId>();
|
|
context.node_stack()
|
|
.PopAndDiscardSoloParseNode<ParseNodeKind::ReturnStatementStart>();
|
|
|
|
if (!callable.return_type_id.is_valid()) {
|
|
CARBON_DIAGNOSTIC(
|
|
ReturnStatementDisallowExpression, Error,
|
|
"No return expression should be provided in this context.");
|
|
CARBON_DIAGNOSTIC(ReturnStatementImplicitNote, Note,
|
|
"There was no return type provided.");
|
|
context.emitter()
|
|
.Build(parse_node, ReturnStatementDisallowExpression)
|
|
.Note(fn_node.parse_node(), ReturnStatementImplicitNote)
|
|
.Emit();
|
|
} else {
|
|
arg =
|
|
context.ImplicitAsRequired(parse_node, arg, callable.return_type_id);
|
|
}
|
|
|
|
context.AddNode(SemanticsNode::ReturnExpression::Make(
|
|
parse_node, context.semantics_ir().GetNode(arg).type_id(), arg));
|
|
}
|
|
|
|
// Switch to a new, unreachable, empty node block. This typically won't
|
|
// contain any semantics IR, but it can do if there are statements following
|
|
// the `return` statement.
|
|
context.node_block_stack().Pop();
|
|
context.node_block_stack().PushUnreachable();
|
|
return true;
|
|
}
|
|
|
|
auto SemanticsHandleReturnStatementStart(SemanticsContext& context,
|
|
ParseTree::Node parse_node) -> bool {
|
|
// No action, just a bracketing node.
|
|
context.node_stack().Push(parse_node);
|
|
return true;
|
|
}
|
|
|
|
} // namespace Carbon
|