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

fix issue with constructor clauses and clause props

This commit is contained in:
Kasey White 2022-12-28 16:06:25 -05:00 committed by Lucas
parent c4c0ace3a6
commit cce76bbd63
2 changed files with 49 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
crates/aiken-lang/src/builder.rs
View File

@ -748,15 +748,42 @@ pub fn check_when_pattern_needs(
Pattern::Var { .. } => {
*clause_properties.needs_constr_var() = true;
}
Pattern::List { .. }
| Pattern::Constructor { .. }
| Pattern::Tuple { .. }
| Pattern::Int { .. } => {
Pattern::List { elements, tail, .. } => {
*clause_properties.needs_constr_var() = true;
*clause_properties.is_complex_clause() = true;
for element in elements {
check_when_pattern_needs(element, clause_properties);
}
if let Some(tail) = tail {
check_when_pattern_needs(tail, clause_properties);
}
}
Pattern::Tuple { elems, .. } => {
*clause_properties.needs_constr_var() = true;
*clause_properties.is_complex_clause() = true;
for element in elems {
check_when_pattern_needs(element, clause_properties);
}
}
Pattern::Int { .. } => {
*clause_properties.needs_constr_var() = true;
*clause_properties.is_complex_clause() = true;
}
Pattern::Discard { .. } => {}
Pattern::Constructor { arguments, .. } => {
*clause_properties.needs_constr_var() = true;
*clause_properties.is_complex_clause() = true;
for argument in arguments {
check_when_pattern_needs(&argument.value, clause_properties);
}
}
Pattern::Discard { .. } => {}
_ => todo!("{pattern:#?}"),
}
}

22
crates/aiken-lang/src/uplc.rs
View File

@ -320,7 +320,9 @@ impl<'a> CodeGenerator<'a> {
let last_pattern = &last_clause.pattern[0];
let mut final_scope = scope.clone();
final_scope.push(self.id_gen.next());
pattern_vec.push(Air::Finally {
scope: final_scope.clone(),
});
@ -785,8 +787,11 @@ impl<'a> CodeGenerator<'a> {
name: constr_name,
..
} => {
let mut temp_clause_properties = clause_properties.clone();
*temp_clause_properties.needs_constr_var() = false;
for arg in arguments {
check_when_pattern_needs(&arg.value, clause_properties);
check_when_pattern_needs(&arg.value, &mut temp_clause_properties);
}
// find data type definition
@ -821,7 +826,7 @@ impl<'a> CodeGenerator<'a> {
location: Span::empty(),
},
),
name: clause_properties.clause_var_name().clone(),
name: temp_clause_properties.clause_var_name().clone(),
scope: scope.clone(),
variant_name: String::new(),
}];
@ -835,7 +840,7 @@ impl<'a> CodeGenerator<'a> {
});
}
if *clause_properties.needs_constr_var() {
if *temp_clause_properties.needs_constr_var() {
self.when_recursive_ir(
pattern,
pattern_vec,
@ -844,7 +849,6 @@ impl<'a> CodeGenerator<'a> {
tipo,
scope,
);
pattern_vec.append(values);
} else {
self.when_recursive_ir(
pattern,
@ -854,8 +858,16 @@ impl<'a> CodeGenerator<'a> {
tipo,
scope,
);
pattern_vec.append(values);
}
pattern_vec.append(values);
// unify clause properties
*clause_properties.is_complex_clause() = *clause_properties.is_complex_clause()
|| *temp_clause_properties.is_complex_clause();
*clause_properties.needs_constr_var() = *clause_properties.needs_constr_var()
|| *temp_clause_properties.needs_constr_var();
}
Pattern::Tuple { elems, .. } => {
for elem in elems {