Skip to content

refactor(lowering): extract rebuild_match_arm helper method #9709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GarmashAlex wants to merge 2 commits into
base: main
Choose a base branch
from
Open

refactor(lowering): extract rebuild_match_arm helper method #9709

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b0ae7a
refactor(lowering): extract rebuild_match_arm helper method
GarmashAlex Feb 22, 2026
65b5492
Update utils.rs
GarmashAlex Mar 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 17 additions & 39 deletions crates/cairo-lang-lowering/src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,55 +129,19 @@ pub trait RebuilderEx<'db>: Rebuilder<'db> {
MatchInfo::Extern(stmt) => MatchInfo::Extern(MatchExternInfo {
function: stmt.function,
inputs: stmt.inputs.iter().map(|v| self.map_var_usage(*v)).collect(),
arms: stmt
.arms
.iter()
.map(|arm| MatchArm {
arm_selector: arm.arm_selector.clone(),
block_id: self.map_block_id(arm.block_id),
var_ids: arm
.var_ids
.iter()
.map(|var_id| self.map_var_id(*var_id))
.collect(),
})
.collect(),
arms: self.rebuild_match_arms(&stmt.arms),
location: self.map_location(stmt.location),
}),
MatchInfo::Enum(stmt) => MatchInfo::Enum(MatchEnumInfo {
concrete_enum_id: stmt.concrete_enum_id,
input: self.map_var_usage(stmt.input),
arms: stmt
.arms
.iter()
.map(|arm| MatchArm {
arm_selector: arm.arm_selector.clone(),
block_id: self.map_block_id(arm.block_id),
var_ids: arm
.var_ids
.iter()
.map(|var_id| self.map_var_id(*var_id))
.collect(),
})
.collect(),
arms: self.rebuild_match_arms(&stmt.arms),
location: self.map_location(stmt.location),
}),
MatchInfo::Value(stmt) => MatchInfo::Value(MatchEnumValue {
num_of_arms: stmt.num_of_arms,
input: self.map_var_usage(stmt.input),
arms: stmt
.arms
.iter()
.map(|arm| MatchArm {
arm_selector: arm.arm_selector.clone(),
block_id: self.map_block_id(arm.block_id),
var_ids: arm
.var_ids
.iter()
.map(|var_id| self.map_var_id(*var_id))
.collect(),
})
.collect(),
arms: self.rebuild_match_arms(&stmt.arms),
location: self.map_location(stmt.location),
}),
},
Expand All @@ -187,6 +151,20 @@ pub trait RebuilderEx<'db>: Rebuilder<'db> {
end
}

/// Rebuilds all match arms with renamed var and block ids.
fn rebuild_match_arms(&mut self, arms: &[MatchArm<'db>]) -> Vec<MatchArm<'db>> {
arms.iter().map(|arm| self.rebuild_match_arm(arm)).collect()
}

/// Rebuilds a match arm with renamed var and block ids.
fn rebuild_match_arm(&mut self, arm: &MatchArm<'db>) -> MatchArm<'db> {
MatchArm {
arm_selector: arm.arm_selector.clone(),
block_id: self.map_block_id(arm.block_id),
var_ids: arm.var_ids.iter().map(|var_id| self.map_var_id(*var_id)).collect(),
}
}

/// Rebuilds the block with renamed var and block ids.
fn rebuild_block(&mut self, block: &Block<'db>) -> Block<'db> {
let statements = block.statements.iter().map(|stmt| self.rebuild_statement(stmt)).collect();
Expand Down