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

Fix delay of arguments to be exactly the same as codegen tests

This commit is contained in:
microproofs 2024-06-25 09:21:44 -04:00 committed by Lucas
parent f695276bf7
commit 4bd9125b86
5 changed files with 173 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,24 +260,14 @@ impl<'a> CodeGenerator<'a> {
let air_value = self.build(value, module_build_name, &[]); let air_value = self.build(value, module_build_name, &[]);
let otherwise_delayed = match (self.tracing, kind) { let otherwise_delayed = {
( let msg = match (self.tracing, kind) {
TraceLevel::Silent, (TraceLevel::Silent, _) | (_, AssignmentKind::Let { .. }) => "".to_string(),
AssignmentKind::Let { .. } | AssignmentKind::Expect { .. }, (TraceLevel::Compact, _) => {
) => AirTree::error(void(), false),
(TraceLevel::Compact | TraceLevel::Verbose, AssignmentKind::Let { .. }) => {
AirTree::error(void(), false)
}
(TraceLevel::Verbose | TraceLevel::Compact, AssignmentKind::Expect { .. }) => {
let msg = match self.tracing {
TraceLevel::Silent => unreachable!("excluded from pattern guards"),
TraceLevel::Compact => {
get_line_columns_by_span(module_build_name, location, &self.module_src) get_line_columns_by_span(module_build_name, location, &self.module_src)
.to_string() .to_string()
} }
TraceLevel::Verbose => { (TraceLevel::Verbose, _) => {
get_src_code_by_span(module_build_name, location, &self.module_src) get_src_code_by_span(module_build_name, location, &self.module_src)
} }
}; };
@ -286,12 +276,15 @@ impl<'a> CodeGenerator<'a> {
self.special_functions.insert_new_function( self.special_functions.insert_new_function(
msg_func_name.clone(), msg_func_name.clone(),
Term::Error.delayed_trace(Term::string(msg)).delay(), if msg.is_empty() {
Term::Error.delay()
} else {
Term::Error.delayed_trace(Term::string(msg)).delay()
},
void(), void(),
); );
self.special_functions.use_function_tree(msg_func_name) self.special_functions.use_function_tree(msg_func_name)
}
}; };
let (then, context) = context.split_first().unwrap(); let (then, context) = context.split_first().unwrap();
@ -341,6 +334,7 @@ impl<'a> CodeGenerator<'a> {
.map(|arg| arg.arg_name.get_variable_name().unwrap_or("_").to_string()) .map(|arg| arg.arg_name.get_variable_name().unwrap_or("_").to_string())
.collect_vec(), .collect_vec(),
self.build(body, module_build_name, &[]), self.build(body, module_build_name, &[]),
false,
), ),
TypedExpr::List { TypedExpr::List {
@ -649,7 +643,7 @@ impl<'a> CodeGenerator<'a> {
Some(pattern) => AirTree::let_assignment( Some(pattern) => AirTree::let_assignment(
"acc_var", "acc_var",
// use anon function as a delay to avoid evaluating the acc // use anon function as a delay to avoid evaluating the acc
AirTree::anon_func(vec![], acc), AirTree::anon_func(vec![], acc, true),
self.assignment( self.assignment(
pattern, pattern,
condition, condition,
@ -1350,6 +1344,13 @@ impl<'a> CodeGenerator<'a> {
pattern.location().end pattern.location().end
); );
let subject_name = format!(
"__subject_{}_span_{}_{}",
name,
pattern.location().start,
pattern.location().end
);
let local_value = AirTree::local_var(&constructor_name, tipo.clone()); let local_value = AirTree::local_var(&constructor_name, tipo.clone());
let then = if check_replaceable_opaque_type(tipo, &self.data_types) { let then = if check_replaceable_opaque_type(tipo, &self.data_types) {
@ -1379,11 +1380,17 @@ impl<'a> CodeGenerator<'a> {
panic!("Found constructor type {} with 0 constructors", name) panic!("Found constructor type {} with 0 constructors", name)
}); });
AirTree::when(
&subject_name,
void(),
tipo.clone(),
AirTree::local_var(&constructor_name, tipo.clone()),
AirTree::assert_constr_index( AirTree::assert_constr_index(
index, index,
AirTree::local_var(&constructor_name, tipo.clone()), AirTree::local_var(&subject_name, tipo.clone()),
then, then,
props.otherwise.clone(), props.otherwise.clone(),
),
) )
} else { } else {
assert!(data_type.constructors.len() == 1); assert!(data_type.constructors.len() == 1);
@ -1543,7 +1550,7 @@ impl<'a> CodeGenerator<'a> {
otherwise.clone(), otherwise.clone(),
); );
let unwrap_function = AirTree::anon_func(vec![pair_name], anon_func_body); let unwrap_function = AirTree::anon_func(vec![pair_name], anon_func_body, false);
let function = self.code_gen_functions.get(EXPECT_ON_LIST); let function = self.code_gen_functions.get(EXPECT_ON_LIST);
@ -1658,7 +1665,8 @@ impl<'a> CodeGenerator<'a> {
let anon_func_body = expect_item; let anon_func_body = expect_item;
let unwrap_function = AirTree::anon_func(vec![item_name], anon_func_body); let unwrap_function =
AirTree::anon_func(vec![item_name], anon_func_body, false);
let function = self.code_gen_functions.get(EXPECT_ON_LIST); let function = self.code_gen_functions.get(EXPECT_ON_LIST);
@ -1844,6 +1852,7 @@ impl<'a> CodeGenerator<'a> {
) )
}; };
// Special case here for future refactoring
AirTree::anon_func( AirTree::anon_func(
vec![], vec![],
AirTree::assert_constr_index( AirTree::assert_constr_index(
@ -1858,6 +1867,7 @@ impl<'a> CodeGenerator<'a> {
then, then,
acc, acc,
), ),
true,
) )
}, },
); );
@ -1870,7 +1880,7 @@ impl<'a> CodeGenerator<'a> {
format!("__constr_var_span_{}_{}", location.start, location.end), format!("__constr_var_span_{}_{}", location.start, location.end),
tipo.clone(), tipo.clone(),
), ),
constr_clauses, AirTree::call(constr_clauses, void(), vec![]),
); );
let func_body = AirTree::let_assignment( let func_body = AirTree::let_assignment(
@ -3030,7 +3040,7 @@ impl<'a> CodeGenerator<'a> {
itertools::Position::First(arg) if has_context => { itertools::Position::First(arg) if has_context => {
let arg_name = arg.arg_name.get_variable_name().unwrap_or("_").to_string(); let arg_name = arg.arg_name.get_variable_name().unwrap_or("_").to_string();
AirTree::anon_func(vec![arg_name], inner_then) AirTree::anon_func(vec![arg_name], inner_then, true)
} }
itertools::Position::First(arg) itertools::Position::First(arg)
| itertools::Position::Middle(arg) | itertools::Position::Middle(arg)
@ -3044,13 +3054,9 @@ impl<'a> CodeGenerator<'a> {
let actual_type = convert_opaque_type(&arg.tipo, &self.data_types, true); let actual_type = convert_opaque_type(&arg.tipo, &self.data_types, true);
let otherwise_delayed = match self.tracing { let otherwise_delayed = {
TraceLevel::Silent => AirTree::error(void(), false),
TraceLevel::Compact | TraceLevel::Verbose => {
let msg = match self.tracing { let msg = match self.tracing {
TraceLevel::Silent => { TraceLevel::Silent => "".to_string(),
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")
@ -3064,13 +3070,16 @@ impl<'a> CodeGenerator<'a> {
let msg_func_name = msg.split_whitespace().join(""); let msg_func_name = msg.split_whitespace().join("");
self.special_functions.insert_new_function( self.special_functions.insert_new_function(
msg_func_name.to_string(), msg_func_name.clone(),
Term::Error.delayed_trace(Term::string(msg)).delay(), if msg.is_empty() {
Term::Error.delay()
} else {
Term::Error.delayed_trace(Term::string(msg)).delay()
},
void(), void(),
); );
self.special_functions.use_function_tree(msg_func_name) self.special_functions.use_function_tree(msg_func_name)
}
}; };
let inner_then = self.assignment( let inner_then = self.assignment(
@ -3090,7 +3099,7 @@ impl<'a> CodeGenerator<'a> {
}, },
); );
AirTree::anon_func(vec![arg_name], inner_then) AirTree::anon_func(vec![arg_name], inner_then, true)
} }
itertools::Position::Only(_) => unreachable!(), itertools::Position::Only(_) => unreachable!(),
}) })
@ -3860,7 +3869,7 @@ impl<'a> CodeGenerator<'a> {
let mut function_variant_path = IndexMap::new(); let mut function_variant_path = IndexMap::new();
let mut body = body.clone(); let mut body = AirTree::no_op(body.clone());
body.traverse_tree_with( body.traverse_tree_with(
&mut |air_tree, _| { &mut |air_tree, _| {
@ -4031,7 +4040,7 @@ impl<'a> CodeGenerator<'a> {
fn gen_uplc(&mut self, ir: Air, arg_stack: &mut Vec<Term<Name>>) -> Option<Term<Name>> { fn gen_uplc(&mut self, ir: Air, arg_stack: &mut Vec<Term<Name>>) -> Option<Term<Name>> {
let convert_data_to_type = |term, tipo, otherwise| { let convert_data_to_type = |term, tipo, otherwise| {
if otherwise == Term::Error { if otherwise == Term::Error.delay() {
builder::unknown_data_to_type(term, tipo) builder::unknown_data_to_type(term, tipo)
} else { } else {
builder::unknown_data_to_type_otherwise(term, tipo, otherwise) builder::unknown_data_to_type_otherwise(term, tipo, otherwise)
@ -4340,7 +4349,7 @@ impl<'a> CodeGenerator<'a> {
let otherwise = if matches!(expect_level, ExpectLevel::Full | ExpectLevel::Items) { let otherwise = if matches!(expect_level, ExpectLevel::Full | ExpectLevel::Items) {
arg_stack.pop().unwrap() arg_stack.pop().unwrap()
} else { } else {
Term::Error Term::Error.delay()
}; };
let list_id = self.id_gen.next(); let list_id = self.id_gen.next();
@ -4403,17 +4412,25 @@ impl<'a> CodeGenerator<'a> {
Some(term) Some(term)
} }
Air::Fn { params } => { Air::Fn {
params,
allow_inline,
} => {
let mut term = arg_stack.pop().unwrap(); let mut term = arg_stack.pop().unwrap();
for param in params.iter().rev() { for param in params.iter().rev() {
term = term.lambda(param); term = term.lambda(param);
} }
term = if allow_inline {
term
} else {
term.lambda(NO_INLINE)
};
if params.is_empty() { if params.is_empty() {
Some(term.lambda(NO_INLINE).delay()) Some(term.delay())
} else { } else {
Some(term.lambda(NO_INLINE)) Some(term)
} }
} }
Air::Call { count, .. } => { Air::Call { count, .. } => {
@ -4431,7 +4448,8 @@ impl<'a> CodeGenerator<'a> {
// How we handle zero arg anon functions has changed // How we handle zero arg anon functions has changed
// We now delay zero arg anon functions and force them on a call operation // We now delay zero arg anon functions and force them on a call operation
if let Term::Var(name) = &term { match &term {
Term::Var(name) => {
let zero_arg_functions = self.zero_arg_functions.clone(); let zero_arg_functions = self.zero_arg_functions.clone();
let text = &name.text; let text = &name.text;
@ -4446,7 +4464,8 @@ impl<'a> CodeGenerator<'a> {
), ),
_, _,
)| { )| {
let name_module = format!("{module_name}_{function_name}{variant}"); let name_module =
format!("{module_name}_{function_name}{variant}");
let name = format!("{function_name}{variant}"); let name = format!("{function_name}{variant}");
text == &name || text == &name_module text == &name || text == &name_module
@ -4478,14 +4497,13 @@ impl<'a> CodeGenerator<'a> {
} else { } else {
Some(term.force()) Some(term.force())
} }
} else if let Term::Apply { .. } = &term { }
// Case for mutually recursive zero arg functions Term::Delay(inner_term) => Some(inner_term.as_ref().clone()),
Some(term.force()) Term::Apply { .. } => Some(term.force()),
} else { _ => unreachable!(
unreachable!( "Shouldn't call anything other than var or apply\n{:#?}",
"Shouldn't call anything other than var or apply {:#?}",
term term
) ),
} }
} }
} }
@ -4784,7 +4802,7 @@ impl<'a> CodeGenerator<'a> {
let otherwise = if full_cast { let otherwise = if full_cast {
arg_stack.pop().unwrap() arg_stack.pop().unwrap()
} else { } else {
Term::Error Term::Error.delay()
}; };
term = if full_cast { term = if full_cast {
@ -4854,13 +4872,7 @@ impl<'a> CodeGenerator<'a> {
term = Term::equals_integer() term = Term::equals_integer()
.apply(Term::integer(constr_index.into())) .apply(Term::integer(constr_index.into()))
.apply( .apply(constr)
Term::var(
self.special_functions
.use_function_uplc(CONSTR_INDEX_EXPOSER.to_string()),
)
.apply(constr),
)
.if_then_else(term.delay(), otherwise) .if_then_else(term.delay(), otherwise)
.force(); .force();
@ -5309,7 +5321,7 @@ impl<'a> CodeGenerator<'a> {
let otherwise = if is_expect { let otherwise = if is_expect {
arg_stack.pop().unwrap() arg_stack.pop().unwrap()
} else { } else {
Term::Error Term::Error.delay()
}; };
let list_id = self.id_gen.next(); let list_id = self.id_gen.next();
@ -5577,7 +5589,7 @@ impl<'a> CodeGenerator<'a> {
let otherwise = if is_expect { let otherwise = if is_expect {
arg_stack.pop().unwrap() arg_stack.pop().unwrap()
} else { } else {
Term::Error Term::Error.delay()
}; };
let list_id = self.id_gen.next(); let list_id = self.id_gen.next();
@ -5620,7 +5632,7 @@ impl<'a> CodeGenerator<'a> {
let otherwise = if is_expect { let otherwise = if is_expect {
arg_stack.pop().unwrap() arg_stack.pop().unwrap()
} else { } else {
Term::Error Term::Error.delay()
}; };
let list_id = self.id_gen.next(); let list_id = self.id_gen.next();

1
crates/aiken-lang/src/gen_uplc/air.rs
View File

@ -81,6 +81,7 @@ pub enum Air {
}, },
Fn { Fn {
params: Vec<String>, params: Vec<String>,
allow_inline: bool,
}, },
Builtin { Builtin {
count: usize, count: usize,

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

@ -659,6 +659,7 @@ pub fn modify_cyclic_calls(
AirTree::anon_func( AirTree::anon_func(
names.clone(), names.clone(),
AirTree::local_var(index_name, tipo), AirTree::local_var(index_name, tipo),
false,
), ),
], ],
); );
@ -1172,7 +1173,7 @@ pub fn unknown_data_to_type_otherwise(
.choose_data( .choose_data(
Term::snd_pair() Term::snd_pair()
.apply(Term::var("__pair__")) .apply(Term::var("__pair__"))
.delayed_choose_list( .choose_list(
Term::equals_integer() Term::equals_integer()
.apply(Term::integer(1.into())) .apply(Term::integer(1.into()))
.apply(Term::fst_pair().apply(Term::var("__pair__"))) .apply(Term::fst_pair().apply(Term::var("__pair__")))
@ -1181,13 +1182,16 @@ pub fn unknown_data_to_type_otherwise(
Term::equals_integer() Term::equals_integer()
.apply(Term::integer(0.into())) .apply(Term::integer(0.into()))
.apply(Term::fst_pair().apply(Term::var("__pair__"))) .apply(Term::fst_pair().apply(Term::var("__pair__")))
.delayed_if_then_else( .if_then_else(
Term::bool(false), Term::bool(false).delay(),
otherwise_delayed.clone(),
),
),
otherwise_delayed.clone(), otherwise_delayed.clone(),
) )
.force(),
)
.delay(),
otherwise_delayed.clone(),
)
.force()
.lambda("__pair__") .lambda("__pair__")
.apply(Term::unconstr_data().apply(Term::var("__val"))) .apply(Term::unconstr_data().apply(Term::var("__val")))
.delay(), .delay(),
@ -1204,12 +1208,15 @@ pub fn unknown_data_to_type_otherwise(
Term::equals_integer() Term::equals_integer()
.apply(Term::integer(0.into())) .apply(Term::integer(0.into()))
.apply(Term::fst_pair().apply(Term::unconstr_data().apply(Term::var("__val")))) .apply(Term::fst_pair().apply(Term::unconstr_data().apply(Term::var("__val"))))
.delayed_if_then_else( .if_then_else(
Term::snd_pair() Term::snd_pair()
.apply(Term::unconstr_data().apply(Term::var("__val"))) .apply(Term::unconstr_data().apply(Term::var("__val")))
.delayed_choose_list(Term::unit(), otherwise_delayed.clone()), .choose_list(Term::unit().delay(), otherwise_delayed.clone())
.force()
.delay(),
otherwise_delayed.clone(), otherwise_delayed.clone(),
) )
.force()
.delay(), .delay(),
otherwise_delayed.clone(), otherwise_delayed.clone(),
otherwise_delayed.clone(), otherwise_delayed.clone(),
@ -1442,7 +1449,7 @@ pub fn list_access_to_uplc(
Term::head_list().apply(Term::var(tail_name.to_string())) Term::head_list().apply(Term::var(tail_name.to_string()))
} else if matches!(expect_level, ExpectLevel::Full) { } else if matches!(expect_level, ExpectLevel::Full) {
// Expect level is full so we have an unknown piece of data to cast // Expect level is full so we have an unknown piece of data to cast
if otherwise_delayed == Term::Error { if otherwise_delayed == Term::Error.delay() {
unknown_data_to_type( unknown_data_to_type(
Term::head_list().apply(Term::var(tail_name.to_string())), Term::head_list().apply(Term::var(tail_name.to_string())),
&tipo.to_owned(), &tipo.to_owned(),
@ -1486,7 +1493,7 @@ pub fn list_access_to_uplc(
ExpectLevel::None => acc.lambda(name).apply(head_item).lambda(tail_name), ExpectLevel::None => acc.lambda(name).apply(head_item).lambda(tail_name),
ExpectLevel::Full | ExpectLevel::Items => { ExpectLevel::Full | ExpectLevel::Items => {
if otherwise_delayed == Term::Error && tail_present { if otherwise_delayed == Term::Error.delay() && tail_present {
// No need to check last item if tail was present // No need to check last item if tail was present
acc.lambda(name).apply(head_item).lambda(tail_name) acc.lambda(name).apply(head_item).lambda(tail_name)
} else if tail_present { } else if tail_present {
@ -1498,11 +1505,11 @@ pub fn list_access_to_uplc(
) )
.force() .force()
.lambda(tail_name) .lambda(tail_name)
} else if otherwise_delayed == Term::Error { } else if otherwise_delayed == Term::Error.delay() {
// Check head is last item in this list // Check head is last item in this list
Term::tail_list() Term::tail_list()
.apply(Term::var(tail_name.to_string())) .apply(Term::var(tail_name.to_string()))
.choose_list(acc.delay(), otherwise_delayed.clone()) .choose_list(acc.delay(), Term::Error.delay())
.force() .force()
.lambda(name) .lambda(name)
.apply(head_item) .apply(head_item)
@ -1533,7 +1540,8 @@ pub fn list_access_to_uplc(
let head_item = head_item(name, tipo, &tail_name); let head_item = head_item(name, tipo, &tail_name);
if matches!(expect_level, ExpectLevel::None) || otherwise_delayed == Term::Error if matches!(expect_level, ExpectLevel::None)
|| otherwise_delayed == Term::Error.delay()
{ {
acc.apply(Term::tail_list().apply(Term::var(tail_name.to_string()))) acc.apply(Term::tail_list().apply(Term::var(tail_name.to_string())))
.lambda(name) .lambda(name)

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

@ -288,6 +288,7 @@ pub enum AirTree {
Fn { Fn {
params: Vec<String>, params: Vec<String>,
func_body: Box<AirTree>, func_body: Box<AirTree>,
allow_inline: bool,
}, },
Builtin { Builtin {
func: DefaultFunction, func: DefaultFunction,
@ -538,10 +539,11 @@ impl AirTree {
} }
} }
pub fn anon_func(params: Vec<String>, func_body: AirTree) -> AirTree { pub fn anon_func(params: Vec<String>, func_body: AirTree, allow_inline: bool) -> AirTree {
AirTree::Fn { AirTree::Fn {
params, params,
func_body: func_body.into(), func_body: func_body.into(),
allow_inline,
} }
} }
@ -1388,9 +1390,14 @@ impl AirTree {
arg.create_air_vec(air_vec); arg.create_air_vec(air_vec);
} }
} }
AirTree::Fn { params, func_body } => { AirTree::Fn {
params,
func_body,
allow_inline,
} => {
air_vec.push(Air::Fn { air_vec.push(Air::Fn {
params: params.clone(), params: params.clone(),
allow_inline: *allow_inline,
}); });
func_body.create_air_vec(air_vec); func_body.create_air_vec(air_vec);
} }
@ -2184,6 +2191,7 @@ impl AirTree {
AirTree::Fn { AirTree::Fn {
params: _, params: _,
func_body, func_body,
allow_inline: _,
} => { } => {
func_body.do_traverse_tree_with( func_body.do_traverse_tree_with(
tree_path, tree_path,
@ -2920,6 +2928,7 @@ impl AirTree {
AirTree::Fn { AirTree::Fn {
params: _, params: _,
func_body, func_body,
allow_inline: _,
} => match field { } => match field {
Fields::SecondField => func_body.as_mut().do_find_air_tree_node(tree_path_iter), Fields::SecondField => func_body.as_mut().do_find_air_tree_node(tree_path_iter),
_ => panic!("Tree Path index outside tree children nodes"), _ => panic!("Tree Path index outside tree children nodes"),

6
crates/uplc/src/optimize/shrinker.rs
View File

@ -1029,6 +1029,12 @@ impl Program<Name> {
if let Some((arg_id, arg_term)) = arg_stack.pop() { if let Some((arg_id, arg_term)) = arg_stack.pop() {
match &arg_term { match &arg_term {
Term::Constant(c) if matches!(c.as_ref(), Constant::String(_)) => {} Term::Constant(c) if matches!(c.as_ref(), Constant::String(_)) => {}
Term::Delay(e) if matches!(e.as_ref(), Term::Error) => {
let body = Rc::make_mut(body);
lambda_applied_ids.push(arg_id);
// creates new body that replaces all var occurrences with the arg
*term = substitute_var(body, parameter_name.clone(), &arg_term);
}
Term::Constant(_) | Term::Var(_) | Term::Builtin(_) => { Term::Constant(_) | Term::Var(_) | Term::Builtin(_) => {
let body = Rc::make_mut(body); let body = Rc::make_mut(body);
lambda_applied_ids.push(arg_id); lambda_applied_ids.push(arg_id);