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

Add support for _ binding patterns (#5097)

Browse Source 
Co-authored-by: Jon Ross-Perkins <jperkins@google.com>
This commit is contained in:
Geoff Romer
2025-03-17 22:29:56 +00:00
committed by GitHub
co-authored by Jon Ross-Perkins
parent d8d2da4ea0
commit a584ee120e
15 changed files with 423 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/pattern_match.cpp
+18 -8
View File
@@ -203,20 +203,30 @@ auto MatchContext::DoEmitPatternMatch(Context& context,
std::exchange(context.bind_name_map().Lookup(entry.pattern_id).value(),
{.bind_name_id = SemIR::InstId::None,
.type_expr_region_id = SemIR::ExprRegionId::None});
// bind_name_id doesn't have a value in the case of an unused binding pattern,
// but type_expr_region_id should always be populated.
CARBON_CHECK(type_expr_region_id.has_value());
InsertHere(context, type_expr_region_id);
auto value_id = SemIR::InstId::None;
if (kind_ == MatchKind::Local) {
value_id = ConvertToValueOrRefOfType(
context, context.insts().GetLocId(entry.scrutinee_id),
entry.scrutinee_id, binding_pattern.type_id);
value_id =
Convert(context, context.insts().GetLocId(entry.scrutinee_id),
entry.scrutinee_id,
{.kind = bind_name_id.has_value() ? ConversionTarget::ValueOrRef
: ConversionTarget::Discarded,
.type_id = binding_pattern.type_id});
} else {
// In a function call, conversion is handled while matching the enclosing
// `*ParamPattern`.
value_id = entry.scrutinee_id;
}
auto bind_name = context.insts().GetAs<SemIR::AnyBindName>(bind_name_id);
CARBON_CHECK(!bind_name.value_id.has_value());
bind_name.value_id = value_id;
ReplaceInstBeforeConstantUse(context, bind_name_id, bind_name);
context.inst_block_stack().AddInstId(bind_name_id);
if (bind_name_id.has_value()) {
auto bind_name = context.insts().GetAs<SemIR::AnyBindName>(bind_name_id);
CARBON_CHECK(!bind_name.value_id.has_value());
bind_name.value_id = value_id;
ReplaceInstBeforeConstantUse(context, bind_name_id, bind_name);
context.inst_block_stack().AddInstId(bind_name_id);
}
}
auto MatchContext::DoEmitPatternMatch(Context& context,