waalge/aiken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: attempt to convert from opaque before doing monomorphization

Browse Source
This commit is contained in:
microproofs
2023-06-22 15:38:21 -04:00
committed by Kasey
parent 24f5c4de6b
commit 626033ff9b
5 changed files with 158 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
crates/aiken-lang/src/gen_uplc.rs
View File

@@ -2519,7 +2519,8 @@ impl<'a> CodeGenerator<'a> {
let mut data_type_variant = String::new();
if let Some(types) = tipo.arg_types() {
for tipo in types {
for mut tipo in types {
replace_opaque_type(&mut tipo, &self.data_types);
get_variant_name(&mut data_type_variant, &tipo);
}
}
@@ -3178,7 +3179,7 @@ impl<'a> CodeGenerator<'a> {
mono_types = map.into_iter().collect();
let (variant_name, func_ir) =
builder::monomorphize(func_ir, mono_types, &constructor.tipo);
builder::monomorphize(func_ir, mono_types, &constructor.tipo, &self.data_types);
let function_key = FunctionAccessKey {
module_name: module.clone(),
@@ -3264,8 +3265,12 @@ impl<'a> CodeGenerator<'a> {
let temp_ir = func_stack.complete();
let (variant_name, _) =
builder::monomorphize(temp_ir, mono_types, &constructor.tipo);
let (variant_name, _) = builder::monomorphize(
temp_ir,
mono_types,
&constructor.tipo,
&self.data_types,
);
func_calls.insert(
FunctionAccessKey {

26
crates/aiken-lang/src/gen_uplc/builder.rs
View File

@@ -929,17 +929,12 @@ pub fn get_variant_name(new_name: &mut String, t: &Arc<Type>) {
} else if t.is_unbound() {
"_unbound".to_string()
} else {
let mut full_type = "_data".to_string();
let full_type = "_data".to_string();
if t.is_generic() {
panic!("FOUND A POLYMORPHIC TYPE. EXPECTED MONOMORPHIC TYPE");
}
let inner_types = t.get_inner_types();
for arg_type in inner_types {
get_variant_name(&mut full_type, &arg_type);
}
full_type
});
}
@@ -1061,6 +1056,7 @@ pub fn monomorphize(
ir: Vec<Air>,
mono_types: IndexMap<u64, Arc<Type>>,
full_type: &Arc<Type>,
data_types: &IndexMap<DataTypeKey, &TypedDataType>,
) -> (String, Vec<Air>) {
let mut new_air = ir.clone();
let mut new_name = String::new();
@@ -1084,14 +1080,19 @@ pub fn monomorphize(
let mut constructor = constructor.clone();
constructor.tipo = tipo;
if let Type::Fn { args, .. } = &*constructor.tipo {
if let Type::Fn { args, ret } = &*constructor.tipo {
if matches!(
constructor.variant,
ValueConstructorVariant::ModuleFn { .. }
) {
for arg in args {
get_variant_name(&mut variant, arg);
let mut arg = arg.clone();
replace_opaque_type(&mut arg, data_types);
get_variant_name(&mut variant, &arg);
}
let mut ret = ret.clone();
replace_opaque_type(&mut ret, data_types);
get_variant_name(&mut variant, &ret);
}
}
new_air[index] = Air::Var {
@@ -1500,11 +1501,16 @@ pub fn monomorphize(
}
}
if let Type::Fn { args, .. } = &**full_type {
if let Type::Fn { args, ret } = &**full_type {
if needs_variant {
for arg in args {
get_variant_name(&mut new_name, arg);
let mut arg = arg.clone();
replace_opaque_type(&mut arg, data_types);
get_variant_name(&mut new_name, &arg);
}
let mut ret = ret.clone();
replace_opaque_type(&mut ret, data_types);
get_variant_name(&mut new_name, &ret)
}
}