Continued working on new type resolution system and got simple local …

…types resolving
IsaacShelton · Oct 12, 2024 · 2b0d268 · 2b0d268
1 parent 4ec6cc7
commit 2b0d268
Show file tree

Hide file tree

Showing 6 changed files with 275 additions and 289 deletions.
diff --git a/src/resolve/expr/call.rs b/src/resolve/expr/call.rs
@@ -4,7 +4,7 @@ use crate::{
     resolve::{
         conform::{conform_expr, to_default::conform_expr_to_default, ConformMode, Perform},
         error::{ResolveError, ResolveErrorKind},
-        resolve_type, Initialized,
+        Initialized, ResolveTypeCtx,
     },
     resolved::{self, TypedExpr},
     source_files::Source,
@@ -91,12 +91,13 @@ pub fn resolve_call_expr(
     }
 
     if let Some(required_ty) = &call.expected_to_return {
-        let resolved_required_ty = resolve_type(
-            ctx.resolved_ast,
+        let type_ctx = ResolveTypeCtx::new(
+            &ctx.resolved_ast,
             ctx.module_fs_node_id,
-            required_ty,
-            &mut Default::default(),
-        )?;
+            ctx.types_in_modules,
+        );
+
+        let resolved_required_ty = type_ctx.resolve(required_ty)?;
 
         if resolved_required_ty != return_type {
             return Err(ResolveErrorKind::FunctionMustReturnType {

diff --git a/src/resolve/expr/mod.rs b/src/resolve/expr/mod.rs
@@ -21,7 +21,7 @@ use super::{
     function_search_ctx::FunctionSearchCtx,
     global_search_ctx::GlobalSearchCtx,
     variable_search_ctx::VariableSearchCtx,
-    Initialized,
+    Initialized, ResolveTypeCtx,
 };
 use crate::{
     ast::{
@@ -37,7 +37,7 @@ use crate::{
             struct_literal::resolve_struct_literal_expr,
             unary_operation::resolve_unary_math_operation_expr, variable::resolve_variable_expr,
         },
-        resolve_stmts, resolve_type,
+        resolve_stmts,
     },
     resolved::{self, Expr, ExprKind, FunctionRef, StructureRef, TypeKind, TypedExpr},
     workspace::fs::FsNodeId,
@@ -57,6 +57,7 @@ pub struct ResolveExprCtx<'a, 'b> {
     pub helper_exprs: &'b IndexMap<ResolvedName, &'a ast::HelperExpr>,
     pub settings: &'b Settings,
     pub public_functions: &'b HashMap<FsNodeId, HashMap<String, Vec<resolved::FunctionRef>>>,
+    pub types_in_modules: &'b HashMap<FsNodeId, HashMap<String, resolved::TypeDecl>>,
     pub module_fs_node_id: FsNodeId,
 }
 
@@ -390,22 +391,22 @@ pub fn resolve_expr(
                 result_type,
             } = &**info;
 
-            let resolved_type = resolve_type(
-                ctx.resolved_ast,
+            let resolved_type = ResolveTypeCtx::new(
+                &ctx.resolved_ast,
                 ctx.module_fs_node_id,
-                result_type,
-                &mut Default::default(),
-            )?;
+                ctx.types_in_modules,
+            )
+            .resolve(result_type)?;
 
             let mut resolved_args = Vec::with_capacity(args.len());
 
             for (expected_arg_type, arg) in args {
-                let preferred_type = resolve_type(
-                    ctx.resolved_ast,
+                let type_ctx = ResolveTypeCtx::new(
+                    &ctx.resolved_ast,
                     ctx.module_fs_node_id,
-                    expected_arg_type,
-                    &mut Default::default(),
-                )?;
+                    ctx.types_in_modules,
+                );
+                let preferred_type = type_ctx.resolve(expected_arg_type)?;
 
                 resolved_args.push(
                     resolve_expr(

diff --git a/src/resolve/global_search_ctx.rs b/src/resolve/global_search_ctx.rs
@@ -7,7 +7,7 @@ use crate::{
 };
 use std::collections::HashMap;
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Default)]
 pub struct GlobalSearchCtx {
     globals: HashMap<ResolvedName, (resolved::Type, GlobalVarRef)>,
 }