carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-03 22:02:51 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Sorting out how bindings are added to name lookup. (#2869)

Browse Source 
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.
This commit is contained in:
Jon Ross-Perkins
2023-06-01 16:50:34 -07:00
committed by GitHub
parent a1a7251716
commit 39f7aae98d
76 changed files with 484 additions and 620 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/semantics/semantics_handle_function.cpp
+17 -11
View File
@@ -12,21 +12,22 @@ auto SemanticsHandleFunctionDeclaration(SemanticsContext& context,
}
auto SemanticsHandleFunctionDefinition(SemanticsContext& context,
ParseTree::Node parse_node) -> bool {
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 decl_id = context.node_stack().Pop<SemanticsNodeId>(
auto function_id = context.node_stack().Pop<SemanticsFunctionId>(
ParseNodeKind::FunctionDefinitionStart);
context.return_scope_stack().pop_back();
context.PopScope();
auto block_id = context.node_block_stack().Pop();
context.AddNode(
SemanticsNode::FunctionDefinition::Make(parse_node, decl_id, block_id));
context.node_stack().Push(parse_node);
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;
}
@@ -53,10 +54,15 @@ auto SemanticsHandleFunctionDefinitionStart(SemanticsContext& context,
auto name_str = context.parse_tree().GetNodeText(name_node);
auto name_id = context.semantics_ir().AddString(name_str);
auto callable_id = context.semantics_ir().AddCallable(
{.param_refs_id = param_refs_id, .return_type_id = return_type_id});
// 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, name_id, callable_id));
SemanticsNode::FunctionDeclaration::Make(fn_node, function_id));
context.AddNameToLookup(name_node, name_id, decl_id);
context.node_block_stack().Push();
@@ -64,10 +70,10 @@ auto SemanticsHandleFunctionDefinitionStart(SemanticsContext& context,
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.AddNameToLookupIgnoreConflicts(name_id, target_id);
context.AddNameToLookup(ref.parse_node(), name_id, target_id);
}
context.return_scope_stack().push_back(decl_id);
context.node_stack().Push(parse_node, decl_id);
context.node_stack().Push(parse_node, function_id);
return true;
}