UnBCIC-TP2
diff --git a/‎src/environment/environment.rs
Lines changed: 3 additions & 2 deletions b/‎src/environment/environment.rs
Lines changed: 3 additions & 2 deletions
diff --git a/‎src/ir/ast.rs
Lines changed: 2 additions & 2 deletions b/‎src/ir/ast.rs
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/parser/parser_stmt.rs
Lines changed: 2 additions & 2 deletions b/‎src/parser/parser_stmt.rs
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/tc/type_checker.rs
Lines changed: 24 additions & 1 deletion b/‎src/tc/type_checker.rs
Lines changed: 24 additions & 1 deletion
@@ -1,5 +1,6 @@
 use crate::ir::ast::Function;
 use crate::ir::ast::Name;
+use crate::ir::ast::Type;
 
 use std::collections::HashMap;
 use std::collections::LinkedList;
@@ -165,14 +166,14 @@ mod tests {
 
         let global_func = Function {
             name: "global".to_string(),
-            kind: None,
+            kind: Type::TVoid,
             params: None,
             body: None,
         };
 
         let local_func = Function {
             name: "local".to_string(),
-            kind: None,
+            kind: Type::TVoid,
             params: None,
             body: None,
         };
 
@@ -114,7 +114,7 @@ impl<A> Environment<A> {
 #[derive(Clone, Debug, PartialEq)]
 pub struct Function {
     pub name: Name,
-    pub kind: Option<Type>,
+    pub kind: Type,
     pub params: Option<Vec<(Name, Type)>>,
     pub body: Option<Box<Statement>>,
 }
@@ -123,7 +123,7 @@ impl Function {
     pub fn new() -> Function {
         return Function {
             name: "__main__".to_string(),
-            kind: None,
+            kind: Type::TVoid,
             params: None,
             body: None,
         };
 
@@ -139,7 +139,7 @@ fn parse_function_definition_statement(input: &str) -> IResult<&str, Statement>
 
             Statement::FuncDef(Function {
                 name: name.to_string(),
-                kind: Some(t),
+                kind: t,
                 params: Some(params),
                 body: Some(Box::new(block))
             })
@@ -259,7 +259,7 @@ mod tests {
         let input = "def f(x: Int) -> Int: x = 1; end";
         let expected = Statement::FuncDef(Function {
             name: "f".to_string(),
-            kind: Some(Type::TInteger),
+            kind: Type::TInteger,
             params: Some(vec![("x".to_string(), Type::TInteger)]),
             body: Some(Box::new(Statement::Block(vec![
                 Statement::Assignment("x".to_string(), Box::new(Expression::CInt(1)))
 
@@ -772,7 +772,7 @@ mod tests {
 
         let func = FuncDef(Function {
             name: "add".to_string(),
-            kind: Some(TInteger),
+            kind: Type::TInteger,
             params: Some(vec![
                 ("a".to_string(), TInteger),
                 ("b".to_string(), TInteger),
@@ -908,4 +908,27 @@ mod tests {
         // Should fail - trying to reassign different type
         assert!(check_stmt(stmt, &env).is_err());
     }
+
+    #[test]
+    fn test_function_scoping() {
+        let mut env: Environment<i32> = Environment::new();
+        
+        let global_func = Function {
+            name: "global".to_string(),
+            kind: Type::TVoid,
+            params: None,
+            body: None,
+        };
+
+        let local_func = Function {
+            name: "local".to_string(),
+            kind: Type::TVoid,
+            params: None,
+            body: None,
+        };
+
+        // Test function scoping
+        env.map_function(global_func.clone());
+        assert!(env.lookup_function(&"global".to_string()).is_some());
+    }
 }