From 58cc633f98e874c0e7d5da915e4a333af6dbe0b2 Mon Sep 17 00:00:00 2001
From: sofia <sofia@teascade.net>
Date: Sat, 26 Jul 2025 12:55:44 +0300
Subject: [PATCH] Update typerefs in statements and expressions as well for
 extern types

---
 examples/a.reid                     | 12 -------
 examples/imported_type.reid         | 19 +++++++++++
 reid/src/mir/linker.rs              | 49 +++++++++++++++++++++++++++--
 reid/src/mir/typecheck/typecheck.rs |  6 ++--
 4 files changed, 70 insertions(+), 16 deletions(-)
 delete mode 100644 examples/a.reid
 create mode 100644 examples/imported_type.reid

diff --git a/examples/a.reid b/examples/a.reid
deleted file mode 100644
index aea7789..0000000
--- a/examples/a.reid
+++ /dev/null
@@ -1,12 +0,0 @@
-
-import std::print;
-import std::new_string;
-import std::String;
-
-fn otus() -> String {
-    return new_string();
-}
-
-fn main() -> u8 {
-    return 0;
-}
\ No newline at end of file
diff --git a/examples/imported_type.reid b/examples/imported_type.reid
new file mode 100644
index 0000000..d020484
--- /dev/null
+++ b/examples/imported_type.reid
@@ -0,0 +1,19 @@
+
+import std::print;
+import std::from_str;
+import std::concat_strings;
+import std::free_string;
+import std::String;
+
+fn otus(param: &mut String) {
+    let b: String = from_str(" bello");
+    concat_strings(param, b);
+    free_string(&b);
+}
+
+fn main() -> u8 {
+    let mut otus = from_str("hello");
+    otus(&mut otus);
+    print(otus);
+    return 0;
+}
\ No newline at end of file
diff --git a/reid/src/mir/linker.rs b/reid/src/mir/linker.rs
index 3022663..d3facc1 100644
--- a/reid/src/mir/linker.rs
+++ b/reid/src/mir/linker.rs
@@ -326,14 +326,59 @@ impl<'map> Pass for LinkerPass<'map> {
     fn function(
         &mut self,
         function: &mut FunctionDefinition,
-        mut state: PassState<Self::Data, Self::TError>,
+        state: PassState<Self::Data, Self::TError>,
     ) -> PassResult {
         if matches!(function.kind, FunctionDefinitionKind::Local(_, _)) {
             let mod_id = state.scope.module_id.unwrap();
             let extern_types = &state.scope.data.extern_imported_types.get(&mod_id);
             if let Some(extern_types) = extern_types {
                 function.return_type = function.return_type.update_imported(*extern_types, mod_id);
-                dbg!(&function.return_type);
+                for param in function.parameters.iter_mut() {
+                    param.1 = param.1.update_imported(extern_types, mod_id);
+                }
+            }
+        }
+        Ok(())
+    }
+
+    fn stmt(&mut self, stmt: &mut super::Statement, state: PassState<Self::Data, Self::TError>) -> PassResult {
+        let mod_id = state.scope.module_id.unwrap();
+        let extern_types = &state.scope.data.extern_imported_types.get(&mod_id);
+        if let Some(extern_types) = extern_types {
+            match &mut stmt.0 {
+                super::StmtKind::Let(var_ref, _, _) => {
+                    var_ref.0 = var_ref.0.update_imported(extern_types, mod_id);
+                }
+                _ => {}
+            }
+        }
+        Ok(())
+    }
+
+    fn expr(&mut self, expr: &mut super::Expression, state: PassState<Self::Data, Self::TError>) -> PassResult {
+        let mod_id = state.scope.module_id.unwrap();
+        let extern_types = &state.scope.data.extern_imported_types.get(&mod_id);
+        if let Some(extern_types) = extern_types {
+            match &mut expr.0 {
+                super::ExprKind::Variable(var_ref) => {
+                    var_ref.0 = var_ref.0.update_imported(extern_types, mod_id);
+                }
+                super::ExprKind::Indexed(.., type_kind, _) => {
+                    *type_kind = type_kind.update_imported(extern_types, mod_id)
+                }
+                super::ExprKind::Accessed(.., type_kind, _) => {
+                    *type_kind = type_kind.update_imported(extern_types, mod_id)
+                }
+                super::ExprKind::BinOp(.., type_kind) => *type_kind = type_kind.update_imported(extern_types, mod_id),
+
+                super::ExprKind::Borrow(var_ref, _) => {
+                    var_ref.0 = var_ref.0.update_imported(extern_types, mod_id);
+                }
+                super::ExprKind::Deref(var_ref) => {
+                    var_ref.0 = var_ref.0.update_imported(extern_types, mod_id);
+                }
+                super::ExprKind::CastTo(_, type_kind) => *type_kind = type_kind.update_imported(extern_types, mod_id),
+                _ => {}
             }
         }
         Ok(())
diff --git a/reid/src/mir/typecheck/typecheck.rs b/reid/src/mir/typecheck/typecheck.rs
index 6dc089a..e77bf55 100644
--- a/reid/src/mir/typecheck/typecheck.rs
+++ b/reid/src/mir/typecheck/typecheck.rs
@@ -50,8 +50,10 @@ impl<'t> Pass for TypeCheck<'t> {
                 }
             }
 
-            if let Some(_) = defmap.insert(&typedef.name, typedef) {
-                state.ok::<_, Infallible>(Err(ErrorKind::DuplicateTypeName(name.clone())), meta.clone());
+            if typedef.source_module == module.module_id || typedef.importer == Some(module.module_id) {
+                if let Some(_) = defmap.insert(&typedef.name, typedef) {
+                    state.ok::<_, Infallible>(Err(ErrorKind::DuplicateTypeName(name.clone())), meta.clone());
+                }
             }
         }