From a17ebf301f81bacb99b54c311496fc44d91c3614 Mon Sep 17 00:00:00 2001
From: Kasey White <kwhitemsg@gmail.com>
Date: Sat, 8 Apr 2023 16:54:42 -0400
Subject: [PATCH] fix: now we monomorphize __expect_type functions

---
 crates/aiken-lang/src/gen_uplc.rs         | 31 ++++++++---------------
 crates/aiken-lang/src/gen_uplc/builder.rs |  7 -----
 2 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/crates/aiken-lang/src/gen_uplc.rs b/crates/aiken-lang/src/gen_uplc.rs
index b9ab776d..f0d7add3 100644
--- a/crates/aiken-lang/src/gen_uplc.rs
+++ b/crates/aiken-lang/src/gen_uplc.rs
@@ -20,7 +20,7 @@ use crate::{
     },
     builtins::{bool, data},
     expr::TypedExpr,
-    gen_uplc::builder::{find_and_replace_generics, get_generic_id_and_type},
+    gen_uplc::builder::{find_and_replace_generics, get_generic_id_and_type, get_variant_name},
     tipo::{
         ModuleValueConstructor, PatternConstructor, Type, TypeInfo, ValueConstructor,
         ValueConstructorVariant,
@@ -114,10 +114,6 @@ impl<'a> CodeGenerator<'a> {
 
         self.convert_opaque_type_to_inner_ir(&mut ir_stack);
 
-        println!("{:#?}", self.code_gen_functions);
-
-        println!("{:#?}", ir_stack);
-
         let mut term = self.uplc_code_gen(&mut ir_stack);
 
         if let Some(other) = other_fun {
@@ -172,8 +168,6 @@ impl<'a> CodeGenerator<'a> {
 
         self.convert_opaque_type_to_inner_ir(&mut ir_stack);
 
-        println!("{:#?}", ir_stack);
-
         let term = self.uplc_code_gen(&mut ir_stack);
 
         self.finalize(term)
@@ -194,8 +188,6 @@ impl<'a> CodeGenerator<'a> {
             term,
         };
 
-        println!("{}", program.to_pretty());
-
         program = aiken_optimize_and_intern(program);
 
         // This is very important to call here.
@@ -2394,16 +2386,21 @@ impl<'a> CodeGenerator<'a> {
             let data_type =
                 builder::lookup_data_type_by_tipo(self.data_types.clone(), &tipo).unwrap();
 
-            println!("NAME IS {} AND TYPE IS {:#?}", name, tipo);
-            println!("DATATYPE IS {:#?}", data_type);
-
             let new_id = self.id_gen.next();
 
             let mut var_stack = expect_stack.empty_with_scope();
             let mut func_stack = expect_stack.empty_with_scope();
             let mut call_stack = expect_stack.empty_with_scope();
 
-            let data_type_name = format!("__expect_{}", data_type.name);
+            let mut data_type_variant = String::new();
+
+            if let Some(types) = tipo.arg_types() {
+                for tipo in types {
+                    get_variant_name(&mut data_type_variant, &tipo);
+                }
+            }
+
+            let data_type_name = format!("__expect_{}{}", data_type.name, data_type_variant);
 
             let function = self.code_gen_functions.get(&data_type_name);
 
@@ -2489,7 +2486,6 @@ impl<'a> CodeGenerator<'a> {
                             diff_defined_types.insert(inner_data_type.to_string(), *inner_count);
                         }
                     }
-                    println!("DIFF DEFINED TYPES {:#?}", diff_defined_types);
 
                     arg_stack.void();
 
@@ -2749,17 +2745,12 @@ impl<'a> CodeGenerator<'a> {
                 .collect_vec(),
         );
 
-        println!("DEPENDENCY VEC IS {:#?}", dependency_vec);
-        println!("FUNC INDEX MAP IS {:#?}", func_index_map);
-
         for func in dependency_vec {
             if self.defined_functions.contains_key(&func) {
                 continue;
             }
 
             let func_scope = func_index_map.get(&func).unwrap();
-            println!("FUNC IS {:#?}", func);
-            println!("FUNC SCOPE IS {:#?}", func_scope);
 
             let mut added_dependencies = vec![];
 
@@ -4993,8 +4984,6 @@ impl<'a> CodeGenerator<'a> {
 
                 replace_opaque_type(&mut actual_type, self.data_types.clone());
 
-                println!("ACTUAL TYPE IS {:#?}", actual_type);
-
                 self.assignment(
                     &Pattern::Var {
                         location: Span::empty(),
diff --git a/crates/aiken-lang/src/gen_uplc/builder.rs b/crates/aiken-lang/src/gen_uplc/builder.rs
index 38729449..cdf3b65c 100644
--- a/crates/aiken-lang/src/gen_uplc/builder.rs
+++ b/crates/aiken-lang/src/gen_uplc/builder.rs
@@ -1463,8 +1463,6 @@ pub fn handle_func_dependencies(
     dependency_vec.extend(dependency_map.keys().cloned());
     dependency_vec.reverse();
 
-    println!("HANDLE FUNC DEP VEC {:#?}", dependency_vec);
-
     while let Some(dependency) = dependency_vec.pop() {
         let func_component_dep = func_components.get(&dependency);
 
@@ -1478,10 +1476,6 @@ pub fn handle_func_dependencies(
             .get(&dependency)
             .unwrap_or_else(|| unreachable!());
 
-        println!("THING @ {:#?}", depend_comp.ir);
-
-        println!("FUNC DEFINE IS {:#?}", function_component.ir[0]);
-
         if (dep_scope.common_ancestor(func_scope) == *func_scope && !depend_comp.args.is_empty())
             || function_component.args.is_empty()
         {
@@ -1502,7 +1496,6 @@ pub fn handle_func_dependencies(
 
             if depend_comp.is_code_gen_func {
                 temp_stack = recursion_stack;
-                println!("TEMP STACK IS {:#?}", temp_stack);
             } else {
                 temp_stack.define_func(
                     dependency.function_name.clone(),