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

fix first compiler pass of errors

This commit is contained in:
microproofs 2024-02-03 17:17:25 -05:00 committed by Kasey
parent a12c374258
commit 9f96e4bc5a
1 changed files with 81 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2491,7 +2491,7 @@ impl<'a> CodeGenerator<'a> {
let mut previous_defined_names = vec![]; let mut previous_defined_names = vec![];
let mut names_to_define = vec![]; let mut names_to_define = vec![];
name_index_assigns.iter().for_each(|(name, index, _)| { name_index_assigns.iter().for_each(|(name, index)| {
if let Some((index, prev_name)) = defined_indices if let Some((index, prev_name)) = defined_indices
.iter() .iter()
.find(|(defined_index, _nm)| defined_index == index) .find(|(defined_index, _nm)| defined_index == index)
@ -2505,20 +2505,16 @@ impl<'a> CodeGenerator<'a> {
} }
}); });
let tuple_name_assigns = previous_defined_names let tuple_name_assigns = previous_defined_names.into_iter().rev().fold(
.into_iter() next_then,
.map(|(index, prev_name, name)| { |inner_then, (index, prev_name, name)| {
AirTree::let_assignment( AirTree::let_assignment(
name, name,
AirTree::local_var(prev_name, items_type[index].clone()), AirTree::local_var(prev_name, items_type[index].clone()),
inner_then,
) )
}) },
.collect_vec(); );
let mut tuple_item_assigns = name_index_assigns
.into_iter()
.map(|(_, _, item)| item)
.collect_vec();
match props { match props {
ClauseProperties { ClauseProperties {
@ -2533,10 +2529,7 @@ impl<'a> CodeGenerator<'a> {
_ => unreachable!(), _ => unreachable!(),
} }
let mut sequence = tuple_name_assigns; let tuple_name_assigns = if props.final_clause && !names_to_define.is_empty() {
sequence.append(&mut tuple_item_assigns);
if props.final_clause && !names_to_define.is_empty() {
names_to_define.sort_by(|(id1, _), (id2, _)| id1.cmp(id2)); names_to_define.sort_by(|(id1, _), (id2, _)| id1.cmp(id2));
let names = let names =
@ -2550,18 +2543,19 @@ impl<'a> CodeGenerator<'a> {
names names
}); });
sequence.insert(
0,
AirTree::tuple_access( AirTree::tuple_access(
names, names,
subject_tipo.clone(), subject_tipo.clone(),
AirTree::local_var(&props.original_subject_name, subject_tipo.clone()), AirTree::local_var(&props.original_subject_name, subject_tipo.clone()),
None, None,
false, false,
), )
); .hoist_over(tuple_name_assigns)
} } else {
(AirTree::void(), AirTree::UnhoistedSequence(sequence)) tuple_name_assigns
};
(AirTree::void(), tuple_name_assigns)
} }
} }
} }
@ -2745,18 +2739,20 @@ impl<'a> CodeGenerator<'a> {
src_code: &str, src_code: &str,
lines: &LineNumbers, lines: &LineNumbers,
) -> AirTree { ) -> AirTree {
let checked_args = arguments let mut arg_names = vec![];
let checked_args =
arguments
.iter() .iter()
.enumerate() .enumerate()
.map(|(index, arg)| { .rev()
let arg_name = arg .fold(body, |inner_then, (index, arg)| {
.arg_name let arg_name = arg.arg_name.get_variable_name().unwrap_or("_").to_string();
.get_variable_name()
.map(|arg| arg.to_string())
.unwrap_or_else(|| format!("__arg_{}", index));
let arg_span = arg.location; let arg_span = arg.location;
if !(has_context && index == arguments.len() - 1) { arg_names.push(arg_name.clone());
if !(has_context && index == arguments.len() - 1) && &arg_name != "_" {
let param = AirTree::local_var(&arg_name, data()); let param = AirTree::local_var(&arg_name, data());
let actual_type = convert_opaque_type(&arg.tipo, &self.data_types); let actual_type = convert_opaque_type(&arg.tipo, &self.data_types);
@ -2765,7 +2761,9 @@ impl<'a> CodeGenerator<'a> {
TraceLevel::Silent => None, TraceLevel::Silent => None,
TraceLevel::Compact | TraceLevel::Verbose => { TraceLevel::Compact | TraceLevel::Verbose => {
let msg = match self.tracing { let msg = match self.tracing {
TraceLevel::Silent => unreachable!("excluded from pattern guards"), TraceLevel::Silent => {
unreachable!("excluded from pattern guards")
}
TraceLevel::Compact => lines TraceLevel::Compact => lines
.line_and_column_number(arg_span.start) .line_and_column_number(arg_span.start)
.expect("Out of bounds span") .expect("Out of bounds span")
@ -2788,12 +2786,13 @@ impl<'a> CodeGenerator<'a> {
} }
}; };
let assign = self.assignment( self.assignment(
&Pattern::Var { &Pattern::Var {
location: Span::empty(), location: Span::empty(),
name: arg_name.to_string(), name: arg_name.to_string(),
}, },
param, param,
inner_then,
&actual_type, &actual_type,
AssignmentProperties { AssignmentProperties {
value_type: data(), value_type: data(),
@ -2802,24 +2801,15 @@ impl<'a> CodeGenerator<'a> {
full_check: true, full_check: true,
msg_func, msg_func,
}, },
); )
(arg_name, assign)
} else { } else {
(arg_name, AirTree::no_op()) inner_then
} }
}) });
.collect_vec();
let arg_names = checked_args arg_names.reverse();
.iter()
.map(|(name, _)| name.to_string())
.collect_vec();
let arg_assigns = AirTree::anon_func(arg_names, checked_args)
AirTree::UnhoistedSequence(checked_args.into_iter().map(|(_, arg)| arg).collect_vec());
AirTree::anon_func(arg_names, arg_assigns.hoist_over(body))
} }
fn hoist_functions_to_validator( fn hoist_functions_to_validator(