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

Generate parameter pattern-match IR from pattern IR (#4388)

Browse Source 
Also propagate the pattern IR along with the pattern-match IR, and use
it where appropriate.

Strictly speaking, some parts of the pattern-match IR are allocated
eagerly, while traversing the pattern's parse tree, but they still
aren't actually emitted until we traverse the associated pattern insts.

---------

Co-authored-by: Jon Ross-Perkins <jperkins@google.com>
This commit is contained in:
Geoff Romer
2024-10-16 19:15:29 +00:00
committed by GitHub
co-authored by Jon Ross-Perkins
parent 4a73b36688
commit 9d942f4633
347 changed files with 9148 additions and 5802 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/name_component.cpp
+16 -7
View File
@@ -5,6 +5,7 @@
#include "toolchain/check/name_component.h"
#include "toolchain/check/context.h"
#include "toolchain/check/pattern_match.h"
namespace Carbon::Check {
@@ -13,20 +14,22 @@ auto PopNameComponent(Context& context) -> NameComponent {
Parse::NodeId last_param_node_id = Parse::InvalidNodeId();
// Explicit params.
auto [params_loc_id, params_id] =
auto [params_loc_id, param_patterns_id] =
context.node_stack().PopWithNodeIdIf<Parse::NodeKind::TuplePattern>();
if (params_id) {
if (param_patterns_id) {
first_param_node_id =
context.node_stack()
.PopForSoloNodeId<Parse::NodeKind::TuplePatternStart>();
last_param_node_id = params_loc_id;
} else {
param_patterns_id = SemIR::InstBlockId::Invalid;
}
// Implicit params.
auto [implicit_params_loc_id, implicit_params_id] =
auto [implicit_params_loc_id, implicit_param_patterns_id] =
context.node_stack()
.PopWithNodeIdIf<Parse::NodeKind::ImplicitParamList>();
if (implicit_params_id) {
if (implicit_param_patterns_id) {
// Implicit params always come before explicit params.
first_param_node_id =
context.node_stack()
@@ -35,8 +38,13 @@ auto PopNameComponent(Context& context) -> NameComponent {
if (last_param_node_id.is_valid()) {
last_param_node_id = params_loc_id;
}
} else {
implicit_param_patterns_id = SemIR::InstBlockId::Invalid;
}
auto [implicit_params_id, params_id] = CalleePatternMatch(
context, *implicit_param_patterns_id, *param_patterns_id);
auto [name_loc_id, name_id] = context.node_stack().PopNameWithNodeId();
return {
.name_loc_id = name_loc_id,
@@ -44,10 +52,11 @@ auto PopNameComponent(Context& context) -> NameComponent {
.first_param_node_id = first_param_node_id,
.last_param_node_id = last_param_node_id,
.implicit_params_loc_id = implicit_params_loc_id,
.implicit_params_id =
implicit_params_id.value_or(SemIR::InstBlockId::Invalid),
.implicit_params_id = implicit_params_id,
.implicit_param_patterns_id = *implicit_param_patterns_id,
.params_loc_id = params_loc_id,
.params_id = params_id.value_or(SemIR::InstBlockId::Invalid),
.params_id = params_id,
.param_patterns_id = *param_patterns_id,
.pattern_block_id = context.pattern_block_stack().Pop(),
};
}