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

fix: if branches, final_else, and anon fns should all be "top level"

This commit is contained in:
rvcas 2023-11-18 17:15:58 -05:00 committed by Lucas
parent 7680d33663
commit 7118253401
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/aiken-lang/src/format.rs
View File

@ -610,9 +610,9 @@ impl<'comments> Formatter<'comments> {
let args = wrap_args(args.iter().map(|e| (self.fn_arg(e), false))).group();
let body = match body {
UntypedExpr::Trace { .. } | UntypedExpr::When { .. } => {
self.expr(body, false).force_break()
self.expr(body, true).force_break()
}
_ => self.expr(body, false),
_ => self.expr(body, true),
};
let header = "fn".to_doc().append(args);
@ -1071,7 +1071,7 @@ impl<'comments> Formatter<'comments> {
let else_begin = line().append("} else {");
let else_body = line().append(self.expr(final_else, false)).nest(INDENT);
let else_body = line().append(self.expr(final_else, true)).nest(INDENT);
let else_end = line().append("}");
@ -1092,7 +1092,7 @@ impl<'comments> Formatter<'comments> {
.append(break_("{", " {"))
.group();
let if_body = line().append(self.expr(&branch.body, false)).nest(INDENT);
let if_body = line().append(self.expr(&branch.body, true)).nest(INDENT);
if_begin.append(if_body)
}
@ -1146,7 +1146,7 @@ impl<'comments> Formatter<'comments> {
let precedence = name.precedence();
let left_precedence = left.binop_precedence();
let right_precedence = dbg!(right).binop_precedence();
let right_precedence = right.binop_precedence();
let left = self.expr(left, false);
let right = self.expr(right, false);

4
examples/gift_card/validators/multi.ak
View File

@ -119,12 +119,12 @@ fn check_mint_and_outputs(
when minted_assets is {
[] -> True
[(minted_asset_name, quantity), ..rest_assets] -> {
expect True =
expect
list.any(
expected_assets,
fn(expected_asset) { expected_asset == minted_asset_name },
)
expect True =
expect
list.any(
outputs,
fn(output) {