Skip to content

refactor(rir): replace Vec fields with extra array pattern #595

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

Merged
steveklabnik merged 1 commit into from
Dec 31, 2025
Merged

refactor(rir): replace Vec fields with extra array pattern #595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
70 changes: 53 additions & 17 deletions crates/rue-air/src/inference/generate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,8 @@ impl<'a> ConstraintGenerator<'a> {

// Local variable allocation
InstData::Alloc {
directives: _,
directives_start: _,
directives_len: _,
name,
is_mut,
ty: type_annotation,
Expand Down Expand Up @@ -442,7 +443,12 @@ impl<'a> ConstraintGenerator<'a> {
}

// Function call
InstData::Call { name, args } => {
InstData::Call {
name,
args_start,
args_len,
} => {
let args = self.rir.get_call_args(*args_start, *args_len);
if let Some(func) = self.functions.get(name) {
// Check argument count matches parameter count.
// Semantic analysis will emit a proper error; we just need to avoid
Expand Down Expand Up @@ -476,8 +482,13 @@ impl<'a> ConstraintGenerator<'a> {
}

// Intrinsic call
InstData::Intrinsic { name, args } => {
InstData::Intrinsic {
name,
args_start,
args_len,
} => {
let intrinsic_name = self.interner.get(*name);
let args = self.rir.get_inst_refs(*args_start, *args_len);

if intrinsic_name == "intCast" {
// @intCast: target type is inferred from context
Expand Down Expand Up @@ -617,8 +628,13 @@ impl<'a> ConstraintGenerator<'a> {
InstData::Break | InstData::Continue => InferType::Concrete(Type::Never),

// Match expression
InstData::Match { scrutinee, arms } => {
InstData::Match {
scrutinee,
arms_start,
arms_len,
} => {
let scrutinee_info = self.generate(*scrutinee, ctx);
let arms = self.rir.get_match_arms(*arms_start, *arms_len);

// Collect arm types, handling Never coercion
let mut arm_types: Vec<ExprInfo> = Vec::new();
Expand Down Expand Up @@ -662,8 +678,13 @@ impl<'a> ConstraintGenerator<'a> {
}

// Struct initialization
InstData::StructInit { type_name, fields } => {
InstData::StructInit {
type_name,
fields_start,
fields_len,
} => {
if let Some(&struct_ty) = self.structs.get(type_name) {
let fields = self.rir.get_field_inits(*fields_start, *fields_len);
// Generate constraints for each field
for (_, value_ref) in fields.iter() {
self.generate(*value_ref, ctx);
Expand Down Expand Up @@ -709,7 +730,11 @@ impl<'a> ConstraintGenerator<'a> {
}

// Array initialization
InstData::ArrayInit { elements } => {
InstData::ArrayInit {
elems_start,
elems_len,
} => {
let elements = self.rir.get_inst_refs(*elems_start, *elems_len);
if elements.is_empty() {
// Empty array - need type annotation to know element type
// Use a fresh type variable for the element type
Expand Down Expand Up @@ -790,10 +815,12 @@ impl<'a> ConstraintGenerator<'a> {
InstData::MethodCall {
receiver,
method,
args,
args_start,
args_len,
} => {
// Generate type for receiver
let receiver_info = self.generate(*receiver, ctx);
let args = self.rir.get_call_args(*args_start, *args_len);

// Get struct name from receiver type if it's a struct
// If we can't determine the struct type, we still generate constraints
Expand Down Expand Up @@ -852,8 +879,10 @@ impl<'a> ConstraintGenerator<'a> {
InstData::AssocFnCall {
type_name,
function,
args,
args_start,
args_len,
} => {
let args = self.rir.get_call_args(*args_start, *args_len);
let method_key = (*type_name, *function);
if let Some(method_sig) = self.methods.get(&method_key) {
// Generate constraints for arguments
Expand Down Expand Up @@ -1569,13 +1598,15 @@ mod tests {
data: InstData::IntConst(42),
span: Span::new(4, 6),
});
let (args_start, args_len) = rir.add_call_args(&[rue_rir::RirCallArg {
value: arg,
mode: rue_rir::RirArgMode::Normal,
}]);
let call = rir.add_inst(rue_rir::Inst {
data: InstData::Call {
name: func_name,
args: vec![rue_rir::RirCallArg {
value: arg,
mode: rue_rir::RirArgMode::Normal,
}],
args_start,
args_len,
},
span: Span::new(0, 7),
});
Expand Down Expand Up @@ -1607,13 +1638,15 @@ mod tests {
data: InstData::IntConst(42),
span: Span::new(8, 10),
});
let (args_start, args_len) = rir.add_call_args(&[rue_rir::RirCallArg {
value: arg,
mode: rue_rir::RirArgMode::Normal,
}]);
let call = rir.add_inst(rue_rir::Inst {
data: InstData::Call {
name: unknown_func,
args: vec![rue_rir::RirCallArg {
value: arg,
mode: rue_rir::RirArgMode::Normal,
}],
args_start,
args_len,
},
span: Span::new(0, 11),
});
Expand Down Expand Up @@ -1666,10 +1699,13 @@ mod tests {
});
let pattern3 = rue_rir::RirPattern::Wildcard(Span::new(30, 31));

let arms = vec![(pattern1, body1), (pattern2, body2), (pattern3, body3)];
let (arms_start, arms_len) = rir.add_match_arms(&arms);
let match_inst = rir.add_inst(rue_rir::Inst {
data: InstData::Match {
scrutinee,
arms: vec![(pattern1, body1), (pattern2, body2), (pattern3, body3)],
arms_start,
arms_len,
},
span: Span::new(0, 40),
});
Expand Down
Loading