mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-25 21:10:11 +01:00
Jon Ross-Perkins
39f7aae98d
This shifts logic so that bindings are added to name lookup only after the scope is complete, removing logic around adding/removing/re-adding names in certain scopes. This does mean that things like a function's forward declaration will need to go through an extra hoop for name conflict checks, because under this approach a function definition does conflict checking when it adds names for the body's use. But, that seems easy to address, and better than the current hoops.
89 lines
3.4 KiB
C++
89 lines
3.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/semantics/semantics_context.h"
|
|
|
|
namespace Carbon {
|
|
|
|
auto SemanticsHandleFunctionDeclaration(SemanticsContext& context,
|
|
ParseTree::Node parse_node) -> bool {
|
|
return context.TODO(parse_node, "HandleFunctionDeclaration");
|
|
}
|
|
|
|
auto SemanticsHandleFunctionDefinition(SemanticsContext& context,
|
|
ParseTree::Node /*parse_node*/) -> bool {
|
|
// Merges code block children up under the FunctionDefinitionStart.
|
|
while (context.parse_tree().node_kind(context.node_stack().PeekParseNode()) !=
|
|
ParseNodeKind::FunctionDefinitionStart) {
|
|
context.node_stack().PopAndIgnore();
|
|
}
|
|
auto function_id = context.node_stack().Pop<SemanticsFunctionId>(
|
|
ParseNodeKind::FunctionDefinitionStart);
|
|
|
|
context.return_scope_stack().pop_back();
|
|
context.PopScope();
|
|
auto body_id = context.node_block_stack().Pop();
|
|
auto& function = context.semantics_ir().GetFunction(function_id);
|
|
CARBON_CHECK(!function.body_id.is_valid())
|
|
<< "Already have function body: " << function.body_id;
|
|
function.body_id = body_id;
|
|
|
|
return true;
|
|
}
|
|
|
|
auto SemanticsHandleFunctionDefinitionStart(SemanticsContext& context,
|
|
ParseTree::Node parse_node)
|
|
-> bool {
|
|
SemanticsTypeId return_type_id = SemanticsTypeId::Invalid;
|
|
if (context.parse_tree().node_kind(context.node_stack().PeekParseNode()) ==
|
|
ParseNodeKind::ReturnType) {
|
|
return_type_id =
|
|
context.node_stack().Pop<SemanticsTypeId>(ParseNodeKind::ReturnType);
|
|
} else {
|
|
// Canonicalize the empty tuple for the implicit return.
|
|
context.CanonicalizeType(SemanticsNodeId::BuiltinEmptyTupleType);
|
|
}
|
|
auto param_refs_id = context.node_stack().Pop<SemanticsNodeBlockId>(
|
|
ParseNodeKind::ParameterList);
|
|
auto name_node =
|
|
context.node_stack().PopForSoloParseNode(ParseNodeKind::DeclaredName);
|
|
auto fn_node = context.node_stack().PopForSoloParseNode(
|
|
ParseNodeKind::FunctionIntroducer);
|
|
|
|
auto name_str = context.parse_tree().GetNodeText(name_node);
|
|
auto name_id = context.semantics_ir().AddString(name_str);
|
|
|
|
// Add the callable, but with an invalid body for now. The body ID is only
|
|
// finalized on function completion.
|
|
auto function_id = context.semantics_ir().AddFunction(
|
|
{.name_id = name_id,
|
|
.param_refs_id = param_refs_id,
|
|
.return_type_id = return_type_id,
|
|
.body_id = SemanticsNodeBlockId::Invalid});
|
|
auto decl_id = context.AddNode(
|
|
SemanticsNode::FunctionDeclaration::Make(fn_node, function_id));
|
|
context.AddNameToLookup(name_node, name_id, decl_id);
|
|
|
|
context.node_block_stack().Push();
|
|
context.PushScope();
|
|
for (auto ref_id : context.semantics_ir().GetNodeBlock(param_refs_id)) {
|
|
auto ref = context.semantics_ir().GetNode(ref_id);
|
|
auto [name_id, target_id] = ref.GetAsBindName();
|
|
context.AddNameToLookup(ref.parse_node(), name_id, target_id);
|
|
}
|
|
context.return_scope_stack().push_back(decl_id);
|
|
context.node_stack().Push(parse_node, function_id);
|
|
|
|
return true;
|
|
}
|
|
|
|
auto SemanticsHandleFunctionIntroducer(SemanticsContext& context,
|
|
ParseTree::Node parse_node) -> bool {
|
|
// No action, just a bracketing node.
|
|
context.node_stack().Push(parse_node);
|
|
return true;
|
|
}
|
|
|
|
} // namespace Carbon
|