Tuples are working

JCBurnside · Mar 19, 2024 · fb69e3b · fb69e3b
1 parent 2a4d74e
commit fb69e3b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/cli/test.fb b/cli/test.fb
@@ -38,6 +38,10 @@ let show_something_else _ : () -> bool =
     print_str "general kenobi\n";
     return false;
 
+let test (a:(int32,int32)) = 
+    let x : int32 = 0;
+    return x;
+
 let main _ : () -> () =
     let a : bool = true;
     let x : int32 = 0;

diff --git a/compiler/src/lib.rs b/compiler/src/lib.rs
@@ -146,7 +146,8 @@ pub fn from_file<'ctx>(
     );
     let ast = inference_context.inference(ast);
     let mut ast = TypedModuleDeclaration::from(ast, &fwd_declarations, &HashMap::new()); //TODO: foward declare std lib
-
+    #[cfg(debug_assertions)]
+    println!("{:?}", ast.declarations);
     ast.lower_generics(&HashMap::new());
     (
         if errors.is_empty() {

diff --git a/llvm-codegen/src/code_gen.rs b/llvm-codegen/src/code_gen.rs
@@ -568,7 +568,8 @@ impl<'ctx> CodeGen<'ctx> {
                     self.builder.build_unconditional_branch(ret_bb).unwrap();
                 } else {
                     let value = self.compile_expr(expr);
-                    let value: BasicValueEnum<'ctx> = value.try_into().unwrap();
+
+                    let value = self.value_or_load(value.try_into().unwrap());
                     if let Some(ret_target) = self.ret_target.as_ref() {
                         self.builder.build_store(*ret_target, value).unwrap();
                     }