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

Use the full name declaration logic when adding var names to scope. (#3312)

Browse Source 
This causes the names of class members to get added to the class scope.
This commit is contained in:
Richard Smith
2023-10-19 21:34:04 +00:00
committed by GitHub
parent b01dfb3f93
commit a95e122123
6 changed files with 129 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/handle_variable.cpp
+13 -3
View File
@@ -21,12 +21,22 @@ auto HandleVariableDeclaration(Context& context, Parse::Node parse_node)
.PopAndDiscardSoloParseNode<Parse::NodeKind::VariableInitializer>();
}
// Get the storage and add it to name lookup.
// Extract the name binding.
SemIR::NodeId var_id =
context.node_stack().Pop<Parse::NodeKind::PatternBinding>();
auto var = context.semantics_ir().GetNodeAs<SemIR::VarStorage>(var_id);
context.AddNameToLookup(var.parse_node, var.name_id, var_id);
// If there was an initializer, assign it to storage.
// Form a corresponding name in the current context, and bind the name to the
// variable.
context.declaration_name_stack().AddNameToLookup(
context.declaration_name_stack().MakeUnqualifiedName(var.parse_node,
var.name_id),
var_id);
// If there was an initializer, assign it to the storage.
//
// TODO: In a class scope, we should instead save the initializer somewhere
// so that we can use it as a default.
if (has_init) {
init_id = Initialize(context, parse_node, var_id, init_id);
// TODO: Consider using different node kinds for assignment versus