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

Parse vars in classes the same as vars in other locations (#7188)

Browse Source 
Class vars are still restricted to simple `name: type` bindings, not
full patterns. This is now handled in the check phase instead of during
parsing.

This is in preparation for supporting `static var`.
This commit is contained in:
Nicholas Bishop
2026-05-13 21:22:46 +00:00
committed by GitHub
parent 5706601096
commit bd918fb33b
91 changed files with 370 additions and 660 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/handle_binding_pattern.cpp
+2 -49
View File
@@ -339,7 +339,8 @@ static auto HandleAnyBindingPattern(Context& context, Parse::NodeId node_id,
break;
}
case FullPatternStack::Kind::NameBindingDecl: {
case FullPatternStack::Kind::NameBindingDecl:
case FullPatternStack::Kind::FieldDecl: {
if (node_kind == Parse::NodeKind::FormBindingPattern) {
return context.TODO(node_id, "support local form bindings");
}
@@ -487,54 +488,6 @@ auto HandleParseNode(Context& context,
return true;
}
auto HandleParseNode(Context& context, Parse::FieldNameAndTypeId node_id)
-> bool {
auto [type_node, parsed_type_id] = context.node_stack().PopExprWithNodeId();
auto [cast_type_inst_id, cast_type_id] =
ExprAsType(context, type_node, parsed_type_id);
auto [name_node, name_id] = context.node_stack().PopNameWithNodeId();
auto parent_class_decl =
context.scope_stack().TryGetCurrentScopeAs<SemIR::ClassDecl>();
CARBON_CHECK(parent_class_decl);
if (!RequireConcreteType(
context, cast_type_id, type_node,
[&](auto& builder) {
CARBON_DIAGNOSTIC(IncompleteTypeInFieldDecl, Context,
"field has incomplete type {0}", SemIR::TypeId);
builder.Context(type_node, IncompleteTypeInFieldDecl, cast_type_id);
},
[&](auto& builder) {
CARBON_DIAGNOSTIC(AbstractTypeInFieldDecl, Context,
"field has abstract type {0}", SemIR::TypeId);
builder.Context(type_node, AbstractTypeInFieldDecl, cast_type_id);
})) {
cast_type_id = SemIR::ErrorInst::TypeId;
}
if (cast_type_id == SemIR::ErrorInst::TypeId) {
cast_type_inst_id = SemIR::ErrorInst::TypeInstId;
}
auto& class_info = context.classes().Get(parent_class_decl->class_id);
auto field_type_id = GetUnboundElementType(
context, context.types().GetTypeInstId(class_info.self_type_id),
cast_type_inst_id);
auto field_id =
AddInst<SemIR::FieldDecl>(context, node_id,
{.type_id = field_type_id,
.name_id = name_id,
.index = SemIR::ElementIndex::None});
context.field_decls_stack().AppendToTop(field_id);
auto name_context =
context.decl_name_stack().MakeUnqualifiedName(node_id, name_id);
context.decl_name_stack().AddNameOrDiagnose(
name_context, field_id,
context.decl_introducer_state_stack()
.innermost()
.modifier_set.GetAccessKind());
return true;
}
auto HandleParseNode(Context& context, Parse::RefBindingNameId node_id)
-> bool {
context.node_stack().Push(node_id);