teascade/reid-llvm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix struct access type inference

Browse Source
This commit is contained in:
Sofia 2025-07-15 23:30:32 +03:00
parent 7075b6f73f
commit aafab49f82
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
reid/src/mir/typeinference.rs
View File

@ -371,11 +371,12 @@ impl Expression {
let kind = expr_ty.resolve_weak().unwrap(); let kind = expr_ty.resolve_weak().unwrap();
match kind { match kind {
CustomType(name) => { CustomType(name) => {
let struct_ty = state.scope.get_struct_type_mut(&name)?; let struct_ty = state.scope.get_struct_type(&name)?;
match struct_ty.get_field_ty_mut(&field_name) { match struct_ty.get_field_ty(&field_name) {
Some(field_ty) => { Some(field_ty) => {
let elem_ty = type_refs.from_type(&type_kind).unwrap(); let mut elem_ty = type_refs.from_type(&type_kind).unwrap();
*field_ty = elem_ty.as_type().clone(); elem_ty.narrow(&type_refs.from_type(&field_ty).unwrap());
*type_kind = elem_ty.as_type().clone();
Ok(elem_ty) Ok(elem_ty)
} }
None => Err(ErrorKind::NoSuchField(field_name.clone())), None => Err(ErrorKind::NoSuchField(field_name.clone())),
@ -389,8 +390,10 @@ impl Expression {
for field in fields { for field in fields {
if let Some(expected_field_ty) = expected_struct_ty.get_field_ty(&field.0) { if let Some(expected_field_ty) = expected_struct_ty.get_field_ty(&field.0) {
let field_ty = field.1.infer_types(state, type_refs); let field_ty = field.1.infer_types(state, type_refs);
dbg!(&field_ty, expected_field_ty);
if let Some(mut field_ty) = state.ok(field_ty, field.1 .1) { if let Some(mut field_ty) = state.ok(field_ty, field.1 .1) {
field_ty.narrow(&type_refs.from_type(&expected_field_ty).unwrap()); field_ty.narrow(&type_refs.from_type(&expected_field_ty).unwrap());
dbg!(&field_ty);
} }
} else { } else {
state.ok::<_, Infallible>( state.ok::<_, Infallible>(