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

Fix typeinference and checking for borrows/derefs

Browse Source
This commit is contained in:
Sofia 2025-07-20 22:33:00 +03:00
parent 47fa5f342f
commit 550fec2827
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
reid/src/mir/impl.rs
View File

@ -230,9 +230,9 @@ impl Expression {
Ok((ret_type.0, TypeKind::Borrow(Box::new(ret_type.1)))) Ok((ret_type.0, TypeKind::Borrow(Box::new(ret_type.1))))
} }
Deref(var) => { Deref(var) => {
let ret_type = var.return_type()?; let (kind, ret_type) = var.return_type()?;
match ret_type { match ret_type.resolve_weak(refs) {
(_, TypeKind::Borrow(type_kind)) => Ok((ret_type.0, *type_kind)), TypeKind::Borrow(type_kind) => Ok((kind, *type_kind)),
_ => Err(ReturnTypeOther::DerefNonBorrow(var.2)), _ => Err(ReturnTypeOther::DerefNonBorrow(var.2)),
} }
} }

8
reid/src/mir/linker.rs
View File

@ -103,10 +103,10 @@ impl<'map> Pass for LinkerPass<'map> {
modules.insert(module.name.clone(), Rc::new(RefCell::new((module, tokens)))); modules.insert(module.name.clone(), Rc::new(RefCell::new((module, tokens))));
} }
modules.insert( // modules.insert(
"std".to_owned(), // "std".to_owned(),
Rc::new(RefCell::new(compile_std(&mut self.module_map)?)), // Rc::new(RefCell::new(compile_std(&mut self.module_map)?)),
); // );
let mut modules_to_process: Vec<Rc<RefCell<(Module, Vec<FullToken>)>>> = let mut modules_to_process: Vec<Rc<RefCell<(Module, Vec<FullToken>)>>> =
modules.values().cloned().collect(); modules.values().cloned().collect();

2
reid/src/mir/typecheck.rs
View File

@ -677,6 +677,8 @@ impl Expression {
return Err(ErrorKind::AttemptedDerefNonBorrow(var_ref.1.clone())); return Err(ErrorKind::AttemptedDerefNonBorrow(var_ref.1.clone()));
}; };
var_ref.0 = TypeKind::Borrow(inner.clone());
Ok(*inner) Ok(*inner)
} }
} }

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

@ -144,6 +144,8 @@ impl Block {
let mut ret_type_ref = outer_refs.from_type(&ty).unwrap(); let mut ret_type_ref = outer_refs.from_type(&ty).unwrap();
// Narow return type to declared type if hard return // Narow return type to declared type if hard return
dbg!(&kind, ty);
if kind == ReturnKind::Hard { if kind == ReturnKind::Hard {
if let Some(hint) = &state.scope.return_type_hint { if let Some(hint) = &state.scope.return_type_hint {
ret_type_ref.narrow(&mut outer_refs.from_type(&hint).unwrap()); ret_type_ref.narrow(&mut outer_refs.from_type(&hint).unwrap());
@ -392,10 +394,16 @@ impl Expression {
var.0 = hint.as_type(); var.0 = hint.as_type();
} }
match &var.0.resolve_weak(type_refs.types) { dbg!(&var.0);
dbg!(&var.0.resolve_weak(type_refs.types));
let a = match &var.0.resolve_weak(type_refs.types) {
Borrow(type_kind) => Ok(type_refs.from_type(&type_kind).unwrap()), Borrow(type_kind) => Ok(type_refs.from_type(&type_kind).unwrap()),
_ => Err(ErrorKind::AttemptedDerefNonBorrow(var.1.clone())), _ => Err(ErrorKind::AttemptedDerefNonBorrow(var.1.clone())),
} };
dbg!(&a);
a
} }
} }
} }