From d62b73ce837dc2a38419e16b43c1c1205065c17b Mon Sep 17 00:00:00 2001 From: Nicolas Abril Date: Mon, 20 May 2024 14:50:49 +0200 Subject: [PATCH] [sc-663] Update tests for rebase --- .../cli__compile_pre_reduce.bend.snap | 2 +- .../cli__compile_wrong_opt.bend.snap | 2 +- .../cli__no_check_net_size.bend.snap | 90 +++++++++++++------ .../run_file__imp_empty_literals.bend.snap | 4 +- .../run_file__lam_op2_nested.bend.snap | 2 +- .../run_file__let_tup_readback.bend.snap | 2 +- .../run_file__linearize_match.bend.snap | 2 +- ...n_file__match_mult_linearization.bend.snap | 2 +- ...run_file__nested_list_and_string.bend.snap | 4 +- .../snapshots/run_file__nested_str.bend.snap | 4 +- 10 files changed, 73 insertions(+), 41 deletions(-) diff --git a/tests/snapshots/cli__compile_pre_reduce.bend.snap b/tests/snapshots/cli__compile_pre_reduce.bend.snap index 794fc014..35e3536c 100644 --- a/tests/snapshots/cli__compile_pre_reduce.bend.snap +++ b/tests/snapshots/cli__compile_pre_reduce.bend.snap @@ -3,6 +3,6 @@ source: tests/golden_tests.rs input_file: tests/golden_tests/cli/compile_pre_reduce.bend --- error: invalid value 'pre-reduce' for '-O ' - [possible values: all, no-all, eta, no-eta, prune, no-prune, linearize-matches, linearize-matches-alt, no-linearize-matches, float-combinators, no-float-combinators, merge, no-merge, inline, no-inline, adt-scott, adt-num-scott] + [possible values: all, no-all, eta, no-eta, prune, no-prune, linearize-matches, linearize-matches-alt, no-linearize-matches, float-combinators, no-float-combinators, merge, no-merge, inline, no-inline, check-net-size, no-check-net-size, adt-scott, adt-num-scott] For more information, try '--help'. diff --git a/tests/snapshots/cli__compile_wrong_opt.bend.snap b/tests/snapshots/cli__compile_wrong_opt.bend.snap index 8f88d81c..947d8daf 100644 --- a/tests/snapshots/cli__compile_wrong_opt.bend.snap +++ b/tests/snapshots/cli__compile_wrong_opt.bend.snap @@ -3,7 +3,7 @@ source: tests/golden_tests.rs input_file: tests/golden_tests/cli/compile_wrong_opt.bend --- error: invalid value 'foo' for '-O ' - [possible values: all, no-all, eta, no-eta, prune, no-prune, linearize-matches, linearize-matches-alt, no-linearize-matches, float-combinators, no-float-combinators, merge, no-merge, inline, no-inline, adt-scott, adt-num-scott] + [possible values: all, no-all, eta, no-eta, prune, no-prune, linearize-matches, linearize-matches-alt, no-linearize-matches, float-combinators, no-float-combinators, merge, no-merge, inline, no-inline, check-net-size, no-check-net-size, adt-scott, adt-num-scott] tip: a similar value exists: 'float-combinators' diff --git a/tests/snapshots/cli__no_check_net_size.bend.snap b/tests/snapshots/cli__no_check_net_size.bend.snap index 0dd87f26..2f85b256 100644 --- a/tests/snapshots/cli__no_check_net_size.bend.snap +++ b/tests/snapshots/cli__no_check_net_size.bend.snap @@ -2,11 +2,11 @@ source: tests/golden_tests.rs input_file: tests/golden_tests/cli/no_check_net_size.bend --- -@Arr/Leaf = (a (* ((a b) (* b)))) +@Arr/Leaf = (a ((1 (a b)) b)) -@Arr/Node = (a (b (* (* ((a (b c)) c))))) +@Arr/Node = (a (b ((2 (a (b c))) c))) -@Arr/Null = (a (* (* a))) +@Arr/Null = ((0 a) a) @Gen = (a b) & @Gen.go ~ (a (0 b)) @@ -30,30 +30,46 @@ input_file: tests/golden_tests/cli/no_check_net_size.bend @Main__C2 = a & @Sort ~ (@Main__C1 a) -@Map_/Both = (a (b (* (* ((a (b c)) c))))) +@Map_/Both = (a (b ((2 (a (b c))) c))) -@Map_/Free = (a (* (* a))) +@Map_/Free = ((0 a) a) -@Map_/Used = (* (a (* a))) +@Map_/Used = ((1 a) a) -@Merge = ((@Merge__C5 (@Merge__C4 (@Merge__C3 a))) a) +@Merge = ((@Merge__C13 a) a) -@Merge__C0 = (b (e (a (d g)))) +@Merge__C0 = (* a) + & @Map_/Both ~ a + +@Merge__C1 = (?((@Map_/Used @Merge__C0) a) a) + +@Merge__C10 = (* (a (b ((@Merge__C8 (a (b c))) c)))) + +@Merge__C11 = ((@Merge__C2 a) a) + +@Merge__C12 = (?((@Merge__C9 @Merge__C10) a) a) + +@Merge__C13 = (?((@Merge__C11 @Merge__C12) a) a) + +@Merge__C2 = (?((@Map_/Free @Merge__C1) a) a) + +@Merge__C3 = (?((@Map_/Used *) a) a) + +@Merge__C4 = (?((@Map_/Used @Merge__C3) a) a) + +@Merge__C5 = (* (b (e (a (d g))))) & @Map_/Both ~ (c (f g)) &! @Merge ~ (a (b c)) &! @Merge ~ (d (e f)) -@Merge__C1 = a +@Merge__C6 = a & @Map_/Both ~ a -@Merge__C2 = a - & @Map_/Both ~ a +@Merge__C7 = (?((* @Merge__C5) a) a) -@Merge__C3 = (a (b ((@Merge__C1 (* (@Merge__C0 (a (b c))))) c))) +@Merge__C8 = (?((@Merge__C6 @Merge__C7) a) a) -@Merge__C4 = ((@Map_/Used (@Map_/Used (* a))) a) - -@Merge__C5 = ((@Map_/Free (@Map_/Used (@Merge__C2 a))) a) +@Merge__C9 = ((@Merge__C4 a) a) @Radix = ({$([&8388608] a) {$([&4194304] b) {$([&2097152] c) {$([&1048576] d) {$([&524288] e) {$([&262144] f) {$([&131072] g) {$([&65536] h) {$([&32768] i) {$([&16384] j) {$([&8192] k) {$([&4096] l) {$([&2048] m) {$([&1024] n) {$([&512] o) {$([&256] p) {$([&128] q) {$([&64] r) {$([&32] s) {$([&16] t) {$([&8] u) {$([&4] v) {$([&2] w) $([&1] x)}}}}}}}}}}}}}}}}}}}}}}} vb) & @Swap ~ (a (ub (@Map_/Free vb))) @@ -81,26 +97,34 @@ input_file: tests/golden_tests/cli/no_check_net_size.bend & @Swap ~ (w (y (@Map_/Free z))) & @Swap ~ (x (@Map_/Used (@Map_/Free y))) -@Reverse = ((@Arr/Null (@Reverse__C1 (@Reverse__C0 a))) a) +@Reverse = ((@Reverse__C3 a) a) -@Reverse__C0 = (c (a e)) +@Reverse__C0 = a + & @Arr/Leaf ~ a + +@Reverse__C1 = (* (c (a e))) & @Arr/Node ~ (b (d e)) &! @Reverse ~ (a b) &! @Reverse ~ (c d) -@Reverse__C1 = a - & @Arr/Leaf ~ a +@Reverse__C2 = (?((@Reverse__C0 @Reverse__C1) a) a) + +@Reverse__C3 = (?((@Arr/Null @Reverse__C2) a) a) @Sort = (a c) & @ToArr ~ (0 (b c)) & @ToMap ~ (a b) -@Sum = ((0 ((a a) (@Sum__C0 b))) b) +@Sum = ((@Sum__C2 a) a) -@Sum__C0 = (a (b d)) +@Sum__C0 = (* (a (b d))) &! @Sum ~ (a $(:[+] $(c d))) &! @Sum ~ (b c) +@Sum__C1 = (?(((a a) @Sum__C0) b) b) + +@Sum__C2 = (?((0 @Sum__C1) a) a) + @Swap = (?((@Swap__C0 @Swap__C1) (a (b c))) (b (a c))) @Swap__C0 = (b (a c)) @@ -109,25 +133,33 @@ input_file: tests/golden_tests/cli/no_check_net_size.bend @Swap__C1 = (* a) & @Map_/Both ~ a -@ToArr = (a (((* @Arr/Null) (@ToArr__C1 (@ToArr__C0 (a b)))) b)) +@ToArr = (a ((@ToArr__C3 (a b)) b)) -@ToArr__C0 = (b (e ({$([*2] $([+1] d)) $([*2] $([+0] a))} g))) +@ToArr__C0 = a + & @Arr/Leaf ~ a + +@ToArr__C1 = (* (b (e ({$([*2] $([+1] d)) $([*2] $([+0] a))} g)))) & @Arr/Node ~ (c (f g)) &! @ToArr ~ (a (b c)) &! @ToArr ~ (d (e f)) -@ToArr__C1 = a - & @Arr/Leaf ~ a +@ToArr__C2 = (?((@ToArr__C0 @ToArr__C1) a) a) -@ToMap = ((@Map_/Free (@ToMap__C1 (@ToMap__C0 a))) a) +@ToArr__C3 = (?(((* @Arr/Null) @ToArr__C2) a) a) -@ToMap__C0 = (a (c e)) +@ToMap = ((@ToMap__C3 a) a) + +@ToMap__C0 = a + & @Radix ~ a + +@ToMap__C1 = (* (a (c e))) & @Merge ~ (b (d e)) &! @ToMap ~ (a b) &! @ToMap ~ (c d) -@ToMap__C1 = a - & @Radix ~ a +@ToMap__C2 = (?((@ToMap__C0 @ToMap__C1) a) a) + +@ToMap__C3 = (?((@Map_/Free @ToMap__C2) a) a) @main = a & @Sum ~ (@Main__C2 a) diff --git a/tests/snapshots/run_file__imp_empty_literals.bend.snap b/tests/snapshots/run_file__imp_empty_literals.bend.snap index 12585653..41fa2fbe 100644 --- a/tests/snapshots/run_file__imp_empty_literals.bend.snap +++ b/tests/snapshots/run_file__imp_empty_literals.bend.snap @@ -3,7 +3,7 @@ source: tests/golden_tests.rs input_file: tests/golden_tests/run_file/imp_empty_literals.bend --- NumScott: -λa (a 0) +[] Scott: -λa λ* a +[] diff --git a/tests/snapshots/run_file__lam_op2_nested.bend.snap b/tests/snapshots/run_file__lam_op2_nested.bend.snap index 49a01b27..e5201177 100644 --- a/tests/snapshots/run_file__lam_op2_nested.bend.snap +++ b/tests/snapshots/run_file__lam_op2_nested.bend.snap @@ -5,7 +5,7 @@ input_file: tests/golden_tests/run_file/lam_op2_nested.bend NumScott: Warnings: During readback: - Invalid Numeric Operation. (2 occurrences) + Encountered an invalid numeric operation. (2 occurrences) λa (* a (+ a )) diff --git a/tests/snapshots/run_file__let_tup_readback.bend.snap b/tests/snapshots/run_file__let_tup_readback.bend.snap index 90df351a..662ee8a9 100644 --- a/tests/snapshots/run_file__let_tup_readback.bend.snap +++ b/tests/snapshots/run_file__let_tup_readback.bend.snap @@ -5,7 +5,7 @@ input_file: tests/golden_tests/run_file/let_tup_readback.bend NumScott: Warnings: During readback: - Reached Root. + Unable to interpret the HVM result as a valid Bend term. (Reached Root) λa ($b (a λc ( λ$b c))) diff --git a/tests/snapshots/run_file__linearize_match.bend.snap b/tests/snapshots/run_file__linearize_match.bend.snap index 69503559..2b91e28e 100644 --- a/tests/snapshots/run_file__linearize_match.bend.snap +++ b/tests/snapshots/run_file__linearize_match.bend.snap @@ -5,7 +5,7 @@ input_file: tests/golden_tests/run_file/linearize_match.bend NumScott: Warnings: During readback: - Invalid Numeric Match. + Encountered an invalid 'switch'. λa switch a = a { 0: λb b; _: λa λb (+ a b); } diff --git a/tests/snapshots/run_file__match_mult_linearization.bend.snap b/tests/snapshots/run_file__match_mult_linearization.bend.snap index 759b149b..b2915107 100644 --- a/tests/snapshots/run_file__match_mult_linearization.bend.snap +++ b/tests/snapshots/run_file__match_mult_linearization.bend.snap @@ -5,7 +5,7 @@ input_file: tests/golden_tests/run_file/match_mult_linearization.bend NumScott: Warnings: During readback: - Invalid Numeric Match. + Encountered an invalid 'switch'. λa switch a = a { 0: λa λb λc (+ (+ a b) c); _: λa λb λc λd (+ (+ (+ a b) c) d); } diff --git a/tests/snapshots/run_file__nested_list_and_string.bend.snap b/tests/snapshots/run_file__nested_list_and_string.bend.snap index e8ef24e1..5a7e0c7a 100644 --- a/tests/snapshots/run_file__nested_list_and_string.bend.snap +++ b/tests/snapshots/run_file__nested_list_and_string.bend.snap @@ -3,7 +3,7 @@ source: tests/golden_tests.rs input_file: tests/golden_tests/run_file/nested_list_and_string.bend --- NumScott: -λa [a, λ* 2, λe (e 1 [7, "1234", 9] λm (m 1 a (String/Cons * "42")))] +λa [a, λ* 2, λe (e 1 [7, "1234", 9] λm (m 1 a λn (n 1 * "42")))] Scott: -λa [a, λ* 2, λ* λe (e [7, "1234", 9] λ* λm (m a (String/Cons * "42")))] +λa [a, λ* 2, λ* λe (e [7, "1234", 9] λ* λm (m a λ* λn (n * "42")))] diff --git a/tests/snapshots/run_file__nested_str.bend.snap b/tests/snapshots/run_file__nested_str.bend.snap index 5e83397c..f37d1a22 100644 --- a/tests/snapshots/run_file__nested_str.bend.snap +++ b/tests/snapshots/run_file__nested_str.bend.snap @@ -3,7 +3,7 @@ source: tests/golden_tests.rs input_file: tests/golden_tests/run_file/nested_str.bend --- NumScott: -((String/Cons "a" ""), (λa (a 1 97 λb (b 1 "bc" "")), (λe (e 1 "ab" "c"), λi (i 1 "ab" λl (l 1 "cd" ""))))) +(λa (a 1 "a" ""), (λc (c 1 97 λd (d 1 "bc" "")), (λg (g 1 "ab" "c"), λk (k 1 "ab" λn (n 1 "cd" ""))))) Scott: -((String/Cons "a" ""), (λ* λa (a 97 λ* λb (b "bc" "")), (λ* λe (e "ab" "c"), λ* λi (i "ab" λ* λl (l "cd" ""))))) +(λ* λa (a "a" ""), (λ* λc (c 97 λ* λd (d "bc" "")), (λ* λg (g "ab" "c"), λ* λk (k "ab" λ* λn (n "cd" "")))))