toni/zern
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use FnType instead of the tuple mess

Browse Source
This commit is contained in:
Antoni Piasecki
2026-03-17 16:27:39 +01:00
parent a3f480dc1d
commit 15a68a41d1
3 changed files with 74 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/typechecker.rs
View File

@@ -4,13 +4,11 @@
use std::{cell::RefCell, collections::HashMap, rc::Rc};
use crate::{
analyzer::Analyzer,
analyzer::{Analyzer, Type},
parser::{Expr, Stmt},
tokenizer::{TokenType, ZernError, error},
};
type Type = String;
macro_rules! expect_type {
($expr_type:expr, $expected:expr, $loc:expr) => {
if $expected != "any" && $expr_type != "any" && $expr_type != $expected {
@@ -330,14 +328,15 @@ impl TypeChecker {
.functions
.contains_key(&callee_name.lexeme)
{
let params = self.analyzer.borrow().functions[&callee_name.lexeme].clone();
if let (_, Some(params)) = params {
let fn_type =
&self.analyzer.borrow().functions[&callee_name.lexeme].clone();
if let Some(params) = fn_type.params.clone() {
// its a function (defined/builtin/extern)
for (i, arg) in args.iter().enumerate() {
expect_type!(self.typecheck_expr(env, arg)?, params[i], paren.loc);
}
}
Ok(params.0)
Ok(fn_type.return_type.clone())
} else {
// its a variable containing function address
expect_type!(self.typecheck_expr(env, callee)?, "fnptr", paren.loc);