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

Force unwrap_xxx_or inside function body 

Otherwise, it becomes the responsibility of the caller to force the result; which may be easily forgotten.
This commit is contained in:
KtorZ 2024-08-01 17:42:20 +02:00 committed by Kasey
parent a132a2e486
commit 021679b8ac
2 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -932,8 +932,12 @@ pub fn unknown_data_to_type(term: Term<Name>, field_type: &Type) -> Term<Name> {
) )
.lambda("__list_data") .lambda("__list_data")
.apply(Term::unlist_data().apply(term)), .apply(Term::unlist_data().apply(term)),
Some(UplcType::Bool) => Term::unwrap_bool_or(term, |result| result, &Term::Error.delay()), Some(UplcType::Bool) => {
Some(UplcType::Unit) => Term::unwrap_void_or(term, |result| result, &Term::Error.delay()), Term::unwrap_bool_or(term, |result| result.delay(), &Term::Error.delay())
}
Some(UplcType::Unit) => {
Term::unwrap_void_or(term, |result| result.delay(), &Term::Error.delay())
}
Some(UplcType::Data) | None => term, Some(UplcType::Data) | None => term,
} }

45
crates/uplc/src/builder.rs
View File

@ -610,6 +610,7 @@ impl Term<Name> {
otherwise.clone(), otherwise.clone(),
) )
}) })
.force()
} }
/// Convert an arbitrary 'term' into a unit term and pass it into a 'callback'. /// Convert an arbitrary 'term' into a unit term and pass it into a 'callback'.
@ -671,11 +672,13 @@ impl Term<Name> {
}, },
otherwise, otherwise,
) )
.force()
}) })
.force()
} }
/// Continue with the tail of a list, if any; or fallback 'otherwise'. /// Continue with the tail of a list, if any; or fallback 'otherwise'.
pub fn unwrap_tail_or<F>(var: Rc<Name>, callback: F, otherwise: &Term<Name>) -> Term<Name> fn unwrap_tail_or<F>(var: Rc<Name>, callback: F, otherwise: &Term<Name>) -> Term<Name>
where where
F: FnOnce(Term<Name>) -> Term<Name>, F: FnOnce(Term<Name>) -> Term<Name>,
{ {
@ -709,9 +712,7 @@ mod tests {
#[test] #[test]
fn unwrap_bool_or_false() { fn unwrap_bool_or_false() {
let result = quick_eval( let result = quick_eval(
Term::data(Data::constr(0, vec![])) Term::data(Data::constr(0, vec![])).unwrap_bool_or(|b| b.delay(), &Term::Error.delay()),
.unwrap_bool_or(|b| b.delay(), &Term::Error.delay())
.force(),
); );
assert_eq!(result, Ok(Term::bool(false))); assert_eq!(result, Ok(Term::bool(false)));
@ -720,9 +721,7 @@ mod tests {
#[test] #[test]
fn unwrap_bool_or_true() { fn unwrap_bool_or_true() {
let result = quick_eval( let result = quick_eval(
Term::data(Data::constr(1, vec![])) Term::data(Data::constr(1, vec![])).unwrap_bool_or(|b| b.delay(), &Term::Error.delay()),
.unwrap_bool_or(|b| b.delay(), &Term::Error.delay())
.force(),
); );
assert_eq!(result, Ok(Term::bool(true))); assert_eq!(result, Ok(Term::bool(true)));
@ -732,8 +731,7 @@ mod tests {
fn unwrap_bool_or_extra_args() { fn unwrap_bool_or_extra_args() {
let result = quick_eval( let result = quick_eval(
Term::data(Data::constr(1, vec![Data::integer(42.into())])) Term::data(Data::constr(1, vec![Data::integer(42.into())]))
.unwrap_bool_or(|b| b.delay(), &Term::Error.delay()) .unwrap_bool_or(|b| b.delay(), &Term::Error.delay()),
.force(),
); );
assert_eq!(result, Err(Error::EvaluationFailure)); assert_eq!(result, Err(Error::EvaluationFailure));
@ -742,9 +740,7 @@ mod tests {
#[test] #[test]
fn unwrap_bool_or_invalid_constr_hi() { fn unwrap_bool_or_invalid_constr_hi() {
let result = quick_eval( let result = quick_eval(
Term::data(Data::constr(2, vec![])) Term::data(Data::constr(2, vec![])).unwrap_bool_or(|b| b.delay(), &Term::Error.delay()),
.unwrap_bool_or(|b| b.delay(), &Term::Error.delay())
.force(),
); );
assert_eq!(result, Err(Error::EvaluationFailure)); assert_eq!(result, Err(Error::EvaluationFailure));
@ -798,8 +794,7 @@ mod tests {
Constant::Data(Data::integer(14.into())), Constant::Data(Data::integer(14.into())),
Constant::Data(Data::bytestring(vec![1, 2, 3])), Constant::Data(Data::bytestring(vec![1, 2, 3])),
]) ])
.unwrap_pair_or(|p| p.delay(), &Term::Error.delay()) .unwrap_pair_or(|p| p.delay(), &Term::Error.delay()),
.force(),
); );
assert_eq!( assert_eq!(
@ -815,8 +810,7 @@ mod tests {
fn unwrap_pair_or_not_enough_args_1() { fn unwrap_pair_or_not_enough_args_1() {
let result = quick_eval( let result = quick_eval(
Term::list_values(vec![Constant::Data(Data::integer(1.into()))]) Term::list_values(vec![Constant::Data(Data::integer(1.into()))])
.unwrap_pair_or(|p| p.delay(), &Term::Error.delay()) .unwrap_pair_or(|p| p.delay(), &Term::Error.delay()),
.force(),
); );
assert_eq!(result, Err(Error::EvaluationFailure)); assert_eq!(result, Err(Error::EvaluationFailure));
@ -825,9 +819,7 @@ mod tests {
#[test] #[test]
fn unwrap_pair_or_not_enough_args_0() { fn unwrap_pair_or_not_enough_args_0() {
let result = quick_eval( let result = quick_eval(
Term::list_values(vec![]) Term::list_values(vec![]).unwrap_pair_or(|p| p.delay(), &Term::Error.delay()),
.unwrap_pair_or(|p| p.delay(), &Term::Error.delay())
.force(),
); );
assert_eq!(result, Err(Error::EvaluationFailure)); assert_eq!(result, Err(Error::EvaluationFailure));
@ -841,8 +833,7 @@ mod tests {
Constant::Data(Data::integer(2.into())), Constant::Data(Data::integer(2.into())),
Constant::Data(Data::integer(3.into())), Constant::Data(Data::integer(3.into())),
]) ])
.unwrap_pair_or(|p| p.delay(), &Term::Error.delay()) .unwrap_pair_or(|p| p.delay(), &Term::Error.delay()),
.force(),
); );
assert_eq!(result, Err(Error::EvaluationFailure)); assert_eq!(result, Err(Error::EvaluationFailure));
@ -852,9 +843,7 @@ mod tests {
fn unwrap_void_or_happy() { fn unwrap_void_or_happy() {
let result = quick_eval( let result = quick_eval(
Term::data(Data::constr(0, vec![])).as_var("__unit", |unit| { Term::data(Data::constr(0, vec![])).as_var("__unit", |unit| {
Term::Var(unit) Term::Var(unit).unwrap_void_or(|u| u.delay(), &Term::Error.delay())
.unwrap_void_or(|u| u.delay(), &Term::Error.delay())
.force()
}), }),
); );
@ -865,9 +854,7 @@ mod tests {
fn unwrap_void_or_wrong_constr() { fn unwrap_void_or_wrong_constr() {
let result = quick_eval( let result = quick_eval(
Term::data(Data::constr(14, vec![])).as_var("__unit", |unit| { Term::data(Data::constr(14, vec![])).as_var("__unit", |unit| {
Term::Var(unit) Term::Var(unit).unwrap_void_or(|u| u.delay(), &Term::Error.delay())
.unwrap_void_or(|u| u.delay(), &Term::Error.delay())
.force()
}), }),
); );
@ -878,9 +865,7 @@ mod tests {
fn unwrap_void_or_too_many_args() { fn unwrap_void_or_too_many_args() {
let result = quick_eval( let result = quick_eval(
Term::data(Data::constr(0, vec![Data::integer(0.into())])).as_var("__unit", |unit| { Term::data(Data::constr(0, vec![Data::integer(0.into())])).as_var("__unit", |unit| {
Term::Var(unit) Term::Var(unit).unwrap_void_or(|u| u.delay(), &Term::Error.delay())
.unwrap_void_or(|u| u.delay(), &Term::Error.delay())
.force()
}), }),
); );