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

Check type argument count

Browse Source
This commit is contained in:
Sofia 2025-08-25 21:00:37 +03:00
parent ffb3515aaa
commit 08626c8559
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/generics.reid
View File

@ -5,5 +5,5 @@ fn test<T>(value: T) -> T {
} }
fn main() -> u32 { fn main() -> u32 {
return test<u32>(5); return test<u32>(15);
} }

33
reid/src/mir/generics.rs
View File

@ -1,5 +1,7 @@
use std::{collections::HashMap, path::PathBuf}; use std::{collections::HashMap, path::PathBuf};
use log::Metadata;
use crate::mir::{ use crate::mir::{
self, generics, CustomTypeKey, FunctionCall, FunctionDefinition, FunctionParam, GlobalKind, GlobalValue, self, generics, CustomTypeKey, FunctionCall, FunctionDefinition, FunctionParam, GlobalKind, GlobalValue,
IfExpression, Literal, Module, SourceModuleId, TypeKind, WhileStatement, IfExpression, Literal, Module, SourceModuleId, TypeKind, WhileStatement,
@ -11,9 +13,11 @@ use super::pass::{Pass, PassResult, PassState};
pub enum ErrorKind { pub enum ErrorKind {
#[error("Should never be encountered!")] #[error("Should never be encountered!")]
Null, Null,
#[error("Expected {0} type-arguments, got {1}!")]
InvalidNumberTypeArguments(u32, u32),
} }
type Calls = Vec<Vec<TypeKind>>; type Calls = Vec<(Vec<TypeKind>, mir::Metadata)>;
pub struct GenericsPass { pub struct GenericsPass {
pub function_map: HashMap<SourceModuleId, Functions>, pub function_map: HashMap<SourceModuleId, Functions>,
@ -92,17 +96,29 @@ impl Pass for GenericsPass {
let functions = self.function_map.get(&source).unwrap(); let functions = self.function_map.get(&source).unwrap();
let calls = functions.calls.get(&function.name).unwrap(); let calls = functions.calls.get(&function.name).unwrap();
for call in calls {
if call.0.len() != function.generics.len() {
state.note_errors(
&vec![ErrorKind::InvalidNumberTypeArguments(
function.generics.len() as u32,
call.0.len() as u32,
)],
call.1,
);
}
}
if function.generics.len() > 0 { if function.generics.len() > 0 {
for call in calls { for call in calls {
if let Some(clone) = function.try_clone() { if let Some(clone) = function.try_clone() {
let generics = function let generics = function
.generics .generics
.iter() .iter()
.zip(call) .zip(call.0.clone())
.map(|((n, _), t)| (n.clone(), t.clone())) .map(|((n, _), t)| (n.clone(), t.clone()))
.collect(); .collect();
module.functions.push(FunctionDefinition { module.functions.push(FunctionDefinition {
name: name_fmt(function.name.clone(), call.clone()), name: name_fmt(function.name.clone(), call.0.clone()),
return_type: function.return_type.replace_generic(&generics), return_type: function.return_type.replace_generic(&generics),
parameters: function parameters: function
.parameters .parameters
@ -185,19 +201,22 @@ impl mir::Expression {
} }
mir::ExprKind::FunctionCall(function_call) => { mir::ExprKind::FunctionCall(function_call) => {
if let Some(calls) = calls.get_mut(&function_call.name) { if let Some(calls) = calls.get_mut(&function_call.name) {
calls.push(function_call.generics.clone()); calls.push((function_call.generics.clone(), self.1));
} else { } else {
calls.insert(function_call.name.clone(), vec![function_call.generics.clone()]); calls.insert(
function_call.name.clone(),
vec![(function_call.generics.clone(), self.1)],
);
} }
function_call.name = name_fmt(function_call.name.clone(), function_call.generics.clone()) function_call.name = name_fmt(function_call.name.clone(), function_call.generics.clone())
} }
mir::ExprKind::AssociatedFunctionCall(ty, function_call) => { mir::ExprKind::AssociatedFunctionCall(ty, function_call) => {
if let Some(calls) = assoc_calls.get_mut(&(ty.clone(), function_call.name.clone())) { if let Some(calls) = assoc_calls.get_mut(&(ty.clone(), function_call.name.clone())) {
calls.push(function_call.generics.clone()); calls.push((function_call.generics.clone(), self.1));
} else { } else {
assoc_calls.insert( assoc_calls.insert(
(ty.clone(), function_call.name.clone()), (ty.clone(), function_call.name.clone()),
vec![function_call.generics.clone()], vec![(function_call.generics.clone(), self.1)],
); );
} }
function_call.name = name_fmt(function_call.name.clone(), function_call.generics.clone()) function_call.name = name_fmt(function_call.name.clone(), function_call.generics.clone())