Started adding support for specified generics at function call sites

Author: IsaacShelton

Diff for: src/resolve/expr/call/cast.rs

@@ -20,14 +20,8 @@ pub fn cast(
     args: Vec<TypedExpr>,
     source: Source,
 ) -> Result<Result<TypedExpr, Vec<TypedExpr>>, ResolveError> {
-    if !call.generics.is_empty() {
-        return Err(ResolveError::other(
-            "Resolution of casting call with generics is not implemented yet",
-            source,
-        ));
-    }
-
-    if !call.name.namespace.is_empty() || args.len() != 1 {
+    if !call.name.namespace.is_empty() || args.len() != 1 || !call.generics.is_empty() {
+        // No match
         return Ok(Err(args));
     }
 

Diff for: src/resolve/expr/call/mod.rs

@@ -24,13 +24,6 @@ pub fn resolve_call_expr(
     call: &ast::Call,
     source: Source,
 ) -> Result<TypedExpr, ResolveError> {
-    if !call.generics.is_empty() {
-        return Err(ResolveError::other(
-            "Resolution of calls with generics is not implemented yet",
-            source,
-        ));
-    }
-
     let mut args = Vec::with_capacity(call.args.len());
     for arg in call.args.iter() {
         args.push(resolve_expr(
@@ -49,7 +42,7 @@ pub fn resolve_call_expr(
 
     let callee = ctx
         .func_haystack
-        .find(ctx, &call.name, &args[..], source)
+        .find(ctx, &call.name, call.generics.as_slice(), &args[..], source)
         .map_err(|reason| {
             ResolveErrorKind::FailedToFindFunction {
                 signature: format!(

Diff for: src/resolve/expr/static_member.rs

@@ -183,7 +183,14 @@ pub fn resolve_static_member_call_named(
         .into_iter()
         .copied()
         .flat_map(|func_ref| {
-            FuncHaystack::fits(ctx, func_ref, &args, Some(catalog.clone()), *call_source)
+            FuncHaystack::fits(
+                ctx,
+                func_ref,
+                static_member_call.call.generics.as_slice(),
+                &args,
+                Some(catalog.clone()),
+                *call_source,
+            )
         });
 
     let callee = only_match.next().ok_or_else(|| {

Diff for: src/resolve/func_haystack.rs

@@ -8,6 +8,7 @@ use super::{
 };
 use crate::{
     asg::{self, Callee, TypeKind, TypedExpr},
+    ast::TypeArg,
     name::{Name, ResolvedName},
     resolve::conform::Perform,
     source_files::Source,
@@ -42,14 +43,15 @@ impl FuncHaystack {
         &self,
         ctx: &ResolveExprCtx,
         name: &Name,
+        generics: &[TypeArg],
         arguments: &[TypedExpr],
         source: Source,
     ) -> Result<Callee, FindFunctionError> {
         let resolved_name = ResolvedName::new(self.fs_node_id, name);
 
-        self.find_local(ctx, &resolved_name, arguments, source)
-            .or_else(|| self.find_remote(ctx, &name, arguments, source))
-            .or_else(|| self.find_imported(ctx, &name, arguments, source))
+        self.find_local(ctx, &resolved_name, generics, arguments, source)
+            .or_else(|| self.find_remote(ctx, &name, generics, arguments, source))
+            .or_else(|| self.find_imported(ctx, &name, generics, arguments, source))
             .unwrap_or(Err(FindFunctionError::NotDefined))
     }
 
@@ -95,6 +97,7 @@ impl FuncHaystack {
     pub fn fits(
         ctx: &ResolveExprCtx,
         func_ref: asg::FuncRef,
+        generics: &[TypeArg],
         args: &[TypedExpr],
         existing_catalog: Option<PolyCatalog>,
         source: Source,
@@ -104,6 +107,10 @@ impl FuncHaystack {
 
         let mut catalog = existing_catalog.unwrap_or_default();
 
+        if generics.len() != 0 {
+            todo!("FuncHaystack::fits does not support specified generics yet");
+        }
+
         if !params.is_cstyle_vararg && args.len() != params.required.len() {
             return None;
         }
@@ -167,6 +174,7 @@ impl FuncHaystack {
         &self,
         ctx: &ResolveExprCtx,
         resolved_name: &ResolvedName,
+        generics: &[TypeArg],
         arguments: &[TypedExpr],
         source: Source,
     ) -> Option<Result<Callee, FindFunctionError>> {
@@ -175,7 +183,7 @@ impl FuncHaystack {
             .get(&resolved_name)
             .into_iter()
             .flatten()
-            .flat_map(|f| Self::fits(ctx, *f, arguments, None, source));
+            .flat_map(|f| Self::fits(ctx, *f, generics, arguments, None, source));
 
         local_matches.next().map(|found| {
             if local_matches.next().is_some() {
@@ -190,6 +198,7 @@ impl FuncHaystack {
         &self,
         ctx: &ResolveExprCtx,
         name: &Name,
+        generics: &[TypeArg],
         arguments: &[TypedExpr],
         source: Source,
     ) -> Option<Result<Callee, FindFunctionError>> {
@@ -211,7 +220,7 @@ impl FuncHaystack {
                     .into_iter()
             })
             .flatten()
-            .flat_map(|f| Self::fits(ctx, *f, arguments, None, source));
+            .flat_map(|f| Self::fits(ctx, *f, generics, arguments, None, source));
 
         remote_matches.next().map(|found| {
             if remote_matches.next().is_some() {
@@ -226,6 +235,7 @@ impl FuncHaystack {
         &self,
         ctx: &ResolveExprCtx,
         name: &Name,
+        generics: &[TypeArg],
         arguments: &[TypedExpr],
         source: Source,
     ) -> Option<Result<Callee, FindFunctionError>> {
@@ -281,7 +291,7 @@ impl FuncHaystack {
                     .into_iter()
                     .flatten()
             })
-            .flat_map(|f| Self::fits(ctx, *f, arguments, None, source));
+            .flat_map(|f| Self::fits(ctx, *f, generics, arguments, None, source));
 
         matches.next().map(|found| {
             if matches.next().is_some() {