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

Fix comparison return type in typechecking

Browse Source
This commit is contained in:
Sofia 2025-07-07 23:31:32 +03:00
parent 9b68ecb614
commit a7292f4719
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reid/examples/reid/fibonacci.reid
View File

@ -1,6 +1,6 @@
// Main // Main
fn main() -> i32 { fn main() -> i32 {
return (fibonacci(3) < 5) + 5; return fibonacci(3);
} }
// Fibonacci // Fibonacci

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

@ -142,12 +142,15 @@ impl Module {
let mut scope = Scope::default(); let mut scope = Scope::default();
for function in &self.functions { for function in &self.functions {
let r = scope.function_returns.set( state.ok(
function.name.clone(), scope.function_returns.set(
ScopeFunction { function.name.clone(),
ret: function.return_type, ScopeFunction {
params: function.parameters.iter().map(|v| v.1).collect(), ret: function.return_type,
}, params: function.parameters.iter().map(|v| v.1).collect(),
},
),
function.signature(),
); );
} }
@ -251,14 +254,14 @@ impl Expression {
)) ))
} }
ExprKind::Literal(literal) => Ok(literal.as_type()), ExprKind::Literal(literal) => Ok(literal.as_type()),
ExprKind::BinOp(_, lhs, rhs) => { ExprKind::BinOp(op, lhs, rhs) => {
// TODO make sure lhs and rhs can actually do this binary // TODO make sure lhs and rhs can actually do this binary
// operation once relevant // operation once relevant
let lhs_res = lhs.typecheck(state, scope); let lhs_res = lhs.typecheck(state, scope);
let rhs_res = rhs.typecheck(state, scope); let rhs_res = rhs.typecheck(state, scope);
let lhs_type = state.or_else(lhs_res, Vague(Unknown), lhs.1); let lhs_type = state.or_else(lhs_res, Vague(Unknown), lhs.1);
let rhs_type = state.or_else(rhs_res, Vague(Unknown), rhs.1); let rhs_type = state.or_else(rhs_res, Vague(Unknown), rhs.1);
lhs_type.collapse_into(&rhs_type) lhs_type.binop_type(op, &rhs_type)
} }
ExprKind::FunctionCall(function_call) => { ExprKind::FunctionCall(function_call) => {
let true_function = scope let true_function = scope
@ -315,6 +318,17 @@ impl TypeKind {
fn assert_known(&self) -> Result<TypeKind, ErrorKind> { fn assert_known(&self) -> Result<TypeKind, ErrorKind> {
self.is_known().map_err(ErrorKind::TypeIsVague) self.is_known().map_err(ErrorKind::TypeIsVague)
} }
fn binop_type(&self, op: &BinaryOperator, other: &TypeKind) -> Result<TypeKind, ErrorKind> {
let res = self.collapse_into(other)?;
Ok(match op {
BinaryOperator::Add => res,
BinaryOperator::Minus => res,
BinaryOperator::Mult => res,
BinaryOperator::And => res,
BinaryOperator::Logic(_) => Bool,
})
}
} }
fn try_collapse(lhs: &TypeKind, rhs: &TypeKind) -> Result<TypeKind, ErrorKind> { fn try_collapse(lhs: &TypeKind, rhs: &TypeKind) -> Result<TypeKind, ErrorKind> {
@ -323,7 +337,7 @@ fn try_collapse(lhs: &TypeKind, rhs: &TypeKind) -> Result<TypeKind, ErrorKind> {
.or(Err(ErrorKind::TypesIncompatible(*lhs, *rhs))) .or(Err(ErrorKind::TypesIncompatible(*lhs, *rhs)))
} }
trait Collapsable: Sized + Clone { pub trait Collapsable: Sized + Clone {
fn collapse_into(&self, other: &Self) -> Result<Self, ErrorKind>; fn collapse_into(&self, other: &Self) -> Result<Self, ErrorKind>;
} }