- Adjust Environment to use BoundNode for the function registry and

correctly initialize the `TypeChecker` with argument types during
  macro expansion.
- Refactor `Specializer::compile` to perform type checking with provided
  arguments before specialization and to correctly extract the return
  type.
- Enhance the `Dumper` to introspect and display specialized closure
  bodies.
- Update `LambdaCollector` to use `BoundNode` consistently.
- Modify `TypeChecker` to accept and inject specialized argument types
  for lambdas.

src/ast/environment.rs

@@ -15,23 +15,23 @@ use crate::ast::compiler::macros::{MacroExpander, MacroRegistry, MacroEvaluator}
 use crate::ast::compiler::specializer::{Specializer, MonoCache, FunctionRegistry};
 use crate::ast::rtl;
 use crate::ast::rtl::intrinsics;
-use crate::ast::compiler::bound_nodes::{BoundKind, Address};
+use crate::ast::compiler::bound_nodes::{Address, BoundNode};
 
 pub struct Environment {
     pub global_names: Rc<RefCell<HashMap<Symbol, u32>>>,
     pub global_types: Rc<RefCell<HashMap<u32, StaticType>>>,
     pub global_values: Rc<RefCell<Vec<Value>>>,
-    pub function_registry: Rc<RefCell<HashMap<u32, TypedNode>>>,
+    pub function_registry: Rc<RefCell<HashMap<u32, BoundNode>>>,
     pub monomorph_cache: Rc<RefCell<MonoCache>>,
     pub debug_mode: bool,
 }
 
 struct EnvFunctionRegistry {
-    registry: Rc<RefCell<HashMap<u32, TypedNode>>>,
+    registry: Rc<RefCell<HashMap<u32, BoundNode>>>,
 }
 
 impl FunctionRegistry for EnvFunctionRegistry {
-    fn resolve(&self, addr: Address) -> Option<TypedNode> {
+    fn resolve(&self, addr: Address) -> Option<BoundNode> {
         if let Address::Global(idx) = addr {
             self.registry.borrow().get(&idx).cloned()
         } else {
@@ -40,15 +40,15 @@ impl FunctionRegistry for EnvFunctionRegistry {
     }
 }
 
-
 /// Evaluator used during macro expansion to allow compile-time logic.
 struct RuntimeMacroEvaluator {
     global_names: Rc<RefCell<HashMap<Symbol, u32>>>,
     global_types: Rc<RefCell<HashMap<u32, StaticType>>>,
     global_values: Rc<RefCell<Vec<Value>>>,
-    function_registry: Rc<RefCell<HashMap<u32, TypedNode>>>,
+    function_registry: Rc<RefCell<HashMap<u32, BoundNode>>>,
 }
 
+
 impl MacroEvaluator for RuntimeMacroEvaluator {
     fn evaluate(&self, node: &Node<UntypedKind>, bindings: &HashMap<Rc<str>, Node<UntypedKind>>) -> Result<Value, String> {
         // 1. Check if it's a simple parameter substitution
@@ -61,7 +61,7 @@ impl MacroEvaluator for RuntimeMacroEvaluator {
         let bound_ast = Binder::bind_root(self.global_names.clone(), node)?;
         
         let checker = TypeChecker::new(self.global_types.clone());
-        let typed_ast = checker.check(bound_ast)?;
+        let typed_ast = checker.check(bound_ast, &[])?;
         
         let mut vm = VM::new(self.global_values.clone());
         vm.run(&typed_ast)
@@ -152,23 +152,22 @@ impl Environment {
         // 4. Bind
         let bound_ast = Binder::bind_root(self.global_names.clone(), &expanded_ast)?;
 
-        // 5. Type Check
+        // 5. Collect Lambdas (Populate the registry with untyped templates)
+        LambdaCollector::collect(&bound_ast, &mut self.function_registry.borrow_mut());
+
+        // 6. Type Check
         let checker = TypeChecker::new(self.global_types.clone());
-        let typed_ast = checker.check(bound_ast)?;
+        let typed_ast = checker.check(bound_ast, &[])?;
 
         Ok(typed_ast)
     }
 
     /// Backend: Optimization (TCO, etc.)
     pub fn link(&self, node: TypedNode) -> TypedNode {
-        // 1. Collect Lambdas (Populate the registry for the specializer)
-        LambdaCollector::collect(&node, &mut self.function_registry.borrow_mut());
-
-        // 2. Specialize
+        // 1. Specialize
         let specialized = self.specialize_node(node);
-        // let specialized = node;
 
-        // 3. Optimize
+        // 2. Optimize
         TCO::optimize(specialized)
     }
 
@@ -179,50 +178,42 @@ impl Environment {
         
         let rtl_lookup = Rc::new(|name: &str, args: &[StaticType]| intrinsics::lookup(name, args));
         
-        // We need to construct a compiler callback that can recursively specialize and compile.
-        // To avoid complex self-capturing, we reconstruct the environment context needed.
         let func_reg = self.function_registry.clone();
         let mono_cache = self.monomorph_cache.clone();
-        let global_values = self.global_values.clone(); // Needed for VM/Closure creation
+        let global_values = self.global_values.clone();
+        let global_types = self.global_types.clone();
         
-        let compiler = Rc::new(move |func_node: TypedNode, _arg_types: &[StaticType]| -> Result<(Value, StaticType), String> {
-            // 1. Specialize the body (Recursive)
-            // We recreate the specializer context here. 
-            // Note: This creates a new Specializer for each recursion, but they SHARE the 'mono_cache'.
+        let compiler = Rc::new(move |func_template: BoundNode, arg_types: &[StaticType]| -> Result<(Value, StaticType), String> {
+            // 1. Re-TypeCheck the template with concrete argument types
+            let checker = TypeChecker::new(global_types.clone());
+            let retyped_ast = checker.check(func_template, arg_types)?; 
+            
+            // 2. Specialize (Recursive)
             let sub_registry = Rc::new(EnvFunctionRegistry { registry: func_reg.clone() });
             let sub_rtl_lookup = Rc::new(|name: &str, args: &[StaticType]| intrinsics::lookup(name, args));
             
-            // Note: We are passing 'None' as compiler to the inner specializer for now to prevent infinite recursion on cycles.
-            // A robust implementation would handle the recursion cycle or use a shared compiler reference.
-            // For 'tak', the recursion is handled by the cache or dynamic fallback.
             let sub_specializer = Specializer::new(
                 Some(sub_registry),
-                None, // recursive compilation limit (depth 1) for safety
+                None, 
                 Some(sub_rtl_lookup),
                 Some(mono_cache.clone())
             );
             
-            let specialized_ast = sub_specializer.specialize(func_node);
+            let specialized_ast = sub_specializer.specialize(retyped_ast);
             
-            // 2. Optimize (TCO)
+            // 3. Optimize (TCO)
             let optimized_ast = TCO::optimize(specialized_ast);
             
-            // 3. Compile to Closure (VM)
-            // We run the VM once to evaluate the Lambda definition, producing a closure Value.
+            // 4. Compile to Value (VM)
             let mut vm = VM::new(global_values.clone());
-            
             let compiled_val = match vm.run(&optimized_ast) {
                 Ok(v) => v,
                 Err(e) => return Err(format!("VM Error during specialization: {}", e)),
             };
 
-            // We need the return type.
-            // For a Lambda, the type is stored in the node.
-            // But we need the return type of the FUNCTION (e.g. Int), not the type of the Lambda node (Method).
-            // Actually, Specializer expects (Value, ReturnType).
-            // If the specialized function returns Int, we return Int.
-            let ret_type = if let BoundKind::Lambda { body, .. } = &optimized_ast.kind {
-                body.ty.clone()
+            // 5. Determine correct return type from the newly inferred function signature
+            let ret_type = if let StaticType::Function(sig) = &optimized_ast.ty {
+                sig.ret.clone()
             } else {
                 StaticType::Any
             };