From 659537b4ec859f1e705cdd1f82da29ab1a662d94 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sat, 9 Apr 2022 04:10:28 -0400 Subject: De-sigil-ification: * --- stdlib/source/test/lux.lux | 5 +- stdlib/source/test/lux/data/text/escape.lux | 5 +- stdlib/source/test/lux/target/js.lux | 470 ++++++++++++++-------------- stdlib/source/test/lux/target/python.lux | 90 +++--- stdlib/source/test/lux/target/ruby.lux | 112 +++---- 5 files changed, 342 insertions(+), 340 deletions(-) (limited to 'stdlib/source/test') diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux index fde45451b..79265e7b3 100644 --- a/stdlib/source/test/lux.lux +++ b/stdlib/source/test/lux.lux @@ -1117,7 +1117,8 @@ )) (for @.old (these) - (these (syntax: (for_bindings|test [fn/0 .local + (these (syntax: (for_bindings|test lux_state + [fn/0 .local var/0 .local let/0 .local @@ -1130,7 +1131,7 @@ let/2 .local let/3 .local]) - (in (list (code.bit (case (the .#scopes *lux*) + (in (list (code.bit (case (the .#scopes lux_state) (pattern (partial_list scope/2 _)) (let [locals/2 (the .#locals scope/2) expected_locals/2 (set.of_list text.hash (list fn/2 var/2 let/2 diff --git a/stdlib/source/test/lux/data/text/escape.lux b/stdlib/source/test/lux/data/text/escape.lux index 937fbf4c5..bcff2ef7d 100644 --- a/stdlib/source/test/lux/data/text/escape.lux +++ b/stdlib/source/test/lux/data/text/escape.lux @@ -72,8 +72,9 @@ (syntax: (static_sample []) (do meta.monad [seed meta.seed - .let [[_ expected] (random.result (random.pcg_32 [seed seed]) - (random.ascii 10))]] + .let [[_ expected] (|> (random.ascii 10) + (random.only (|>> (text.contains? text.\0) not)) + (random.result (random.pcg_32 [seed seed])))]] (in (list (code.text expected))))) (syntax: (static_escaped [un_escaped .text]) diff --git a/stdlib/source/test/lux/target/js.lux b/stdlib/source/test/lux/target/js.lux index bfdbf32fb..d127d21d7 100644 --- a/stdlib/source/test/lux/target/js.lux +++ b/stdlib/source/test/lux/target/js.lux @@ -332,23 +332,23 @@ (all _.and (_.coverage [/.var] (expression (|>> (as Frac) (f.= number/0)) - (/.apply_* (/.closure (list $foreign) (/.return $foreign)) - (list (/.number number/0))))) + (/.apply (/.closure (list $foreign) (/.return $foreign)) + (list (/.number number/0))))) (_.coverage [/.define] (expression (|>> (as Frac) (f.= number/1)) - (/.apply_* (/.closure (list $foreign) - (all /.then - (/.define $local (/.number number/1)) - (/.return $local))) - (list (/.number number/0))))) + (/.apply (/.closure (list $foreign) + (all /.then + (/.define $local (/.number number/1)) + (/.return $local))) + (list (/.number number/0))))) (_.coverage [/.declare] (expression (|>> (as Frac) (f.= number/1)) - (/.apply_* (/.closure (list $foreign) - (all /.then - (/.declare $local) - (/.set $local (/.number number/1)) - (/.return $local))) - (list (/.number number/0))))) + (/.apply (/.closure (list $foreign) + (all /.then + (/.declare $local) + (/.set $local (/.number number/1)) + (/.return $local))) + (list (/.number number/0))))) ))) (def: test/location @@ -361,79 +361,79 @@ (all _.and (_.coverage [/.set] (and (expression (|>> (as Frac) (f.= (f.+ number/0 number/0))) - (/.apply_* (/.closure (list $foreign) - (all /.then - (/.set $foreign (/.+ $foreign $foreign)) - (/.return $foreign))) - (list (/.number number/0)))) + (/.apply (/.closure (list $foreign) + (all /.then + (/.set $foreign (/.+ $foreign $foreign)) + (/.return $foreign))) + (list (/.number number/0)))) (expression (|>> (as Frac) (f.= (f.+ number/0 number/0))) (let [@ (/.at (/.int +0) $foreign)] - (/.apply_* (/.closure (list $foreign) - (all /.then - (/.set $foreign (/.array (list $foreign))) - (/.set @ (/.+ @ @)) - (/.return @))) - (list (/.number number/0))))) + (/.apply (/.closure (list $foreign) + (all /.then + (/.set $foreign (/.array (list $foreign))) + (/.set @ (/.+ @ @)) + (/.return @))) + (list (/.number number/0))))) (expression (|>> (as Frac) (f.= (f.+ number/0 number/0))) (let [@ (/.the field $foreign)] - (/.apply_* (/.closure (list $foreign) - (all /.then - (/.set $foreign (/.object (list [field $foreign]))) - (/.set @ (/.+ @ @)) - (/.return @))) - (list (/.number number/0))))))) + (/.apply (/.closure (list $foreign) + (all /.then + (/.set $foreign (/.object (list [field $foreign]))) + (/.set @ (/.+ @ @)) + (/.return @))) + (list (/.number number/0))))))) (_.coverage [/.delete] (and (and (expression (|>> (as Bit)) - (/.apply_* (/.closure (list) - (all /.then - (/.set $foreign (/.number number/0)) - (/.return (/.delete $foreign)))) - (list))) + (/.apply (/.closure (list) + (all /.then + (/.set $foreign (/.number number/0)) + (/.return (/.delete $foreign)))) + (list))) (expression (|>> (as Bit) not) - (/.apply_* (/.closure (list $foreign) - (/.return (/.delete $foreign))) - (list (/.number number/0))))) + (/.apply (/.closure (list $foreign) + (/.return (/.delete $foreign))) + (list (/.number number/0))))) (expression (|>> (as Bit)) (let [@ (/.at (/.int +0) $foreign)] - (/.apply_* (/.closure (list $foreign) - (all /.then - (/.set $foreign (/.array (list $foreign))) - (/.return (|> (/.= (/.boolean true) (/.delete @)) - (/.and (/.= /.undefined @)))))) - (list (/.number number/0))))) + (/.apply (/.closure (list $foreign) + (all /.then + (/.set $foreign (/.array (list $foreign))) + (/.return (|> (/.= (/.boolean true) (/.delete @)) + (/.and (/.= /.undefined @)))))) + (list (/.number number/0))))) (expression (|>> (as Bit)) (let [@ (/.the field $foreign)] - (/.apply_* (/.closure (list $foreign) - (all /.then - (/.set $foreign (/.object (list [field $foreign]))) - (/.return (|> (/.= (/.boolean true) (/.delete @)) - (/.and (/.= /.undefined @)))))) - (list (/.number number/0))))) + (/.apply (/.closure (list $foreign) + (all /.then + (/.set $foreign (/.object (list [field $foreign]))) + (/.return (|> (/.= (/.boolean true) (/.delete @)) + (/.and (/.= /.undefined @)))))) + (list (/.number number/0))))) )) (_.coverage [/.Access] (`` (and (~~ (template [ ] [(expression (|>> (as Frac) f.int (i.= ( int/0))) - (/.apply_* (/.closure (list $foreign) - (all /.then - (/.statement ( $foreign)) - (/.return $foreign))) - (list (/.int int/0)))) + (/.apply (/.closure (list $foreign) + (all /.then + (/.statement ( $foreign)) + (/.return $foreign))) + (list (/.int int/0)))) (expression (|>> (as Frac) f.int (i.= ( int/0))) (let [@ (/.at (/.int +0) $foreign)] - (/.apply_* (/.closure (list $foreign) - (all /.then - (/.set $foreign (/.array (list $foreign))) - (/.statement ( @)) - (/.return @))) - (list (/.int int/0))))) + (/.apply (/.closure (list $foreign) + (all /.then + (/.set $foreign (/.array (list $foreign))) + (/.statement ( @)) + (/.return @))) + (list (/.int int/0))))) (expression (|>> (as Frac) f.int (i.= ( int/0))) (let [@ (/.the field $foreign)] - (/.apply_* (/.closure (list $foreign) - (all /.then - (/.set $foreign (/.object (list [field $foreign]))) - (/.statement ( @)) - (/.return @))) - (list (/.int int/0)))))] + (/.apply (/.closure (list $foreign) + (all /.then + (/.set $foreign (/.object (list [field $foreign]))) + (/.statement ( @)) + (/.return @))) + (list (/.int int/0)))))] [/.++ .++] [/.-- .--] @@ -462,35 +462,35 @@ (_.coverage [/.break] (let [expected (i.* (.int expected_inner_iterations) input)] (expression (|>> (as Frac) f.int (i.= expected)) - (/.apply_* (/.closure (list $input) - (all /.then - (/.define $inner_index (/.int +0)) - (/.define $output (/.int +0)) - (/.while (/.< (/.int (.int full_inner_iterations)) $inner_index) - (all /.then - (/.when (/.= (/.int (.int expected_inner_iterations)) $inner_index) - /.break) - (/.set $output (/.+ $input $output)) - (/.set $inner_index (/.+ (/.int +1) $inner_index)) - )) - (/.return $output))) - (list (/.int input)))))) + (/.apply (/.closure (list $input) + (all /.then + (/.define $inner_index (/.int +0)) + (/.define $output (/.int +0)) + (/.while (/.< (/.int (.int full_inner_iterations)) $inner_index) + (all /.then + (/.when (/.= (/.int (.int expected_inner_iterations)) $inner_index) + /.break) + (/.set $output (/.+ $input $output)) + (/.set $inner_index (/.+ (/.int +1) $inner_index)) + )) + (/.return $output))) + (list (/.int input)))))) (_.coverage [/.continue] (let [expected (i.* (.int (n.- expected_inner_iterations full_inner_iterations)) input)] (expression (|>> (as Frac) f.int (i.= expected)) - (/.apply_* (/.closure (list $input) - (all /.then - (/.define $inner_index (/.int +0)) - (/.define $output (/.int +0)) - (/.while (/.< (/.int (.int full_inner_iterations)) $inner_index) - (all /.then - (/.set $inner_index (/.+ (/.int +1) $inner_index)) - (/.when (/.<= (/.int (.int expected_inner_iterations)) $inner_index) - /.continue) - (/.set $output (/.+ $input $output)) - )) - (/.return $output))) - (list (/.int input)))))) + (/.apply (/.closure (list $input) + (all /.then + (/.define $inner_index (/.int +0)) + (/.define $output (/.int +0)) + (/.while (/.< (/.int (.int full_inner_iterations)) $inner_index) + (all /.then + (/.set $inner_index (/.+ (/.int +1) $inner_index)) + (/.when (/.<= (/.int (.int expected_inner_iterations)) $inner_index) + /.continue) + (/.set $output (/.+ $input $output)) + )) + (/.return $output))) + (list (/.int input)))))) (_.for [/.label /.with_label] (all _.and (_.coverage [/.break_at] @@ -498,54 +498,54 @@ expected_inner_iterations)) input)] (expression (|>> (as Frac) f.int (i.= expected)) - (/.apply_* (/.closure (list $input) - (all /.then - (/.define $output (/.int +0)) - (/.define $outer_index (/.int +0)) - (/.with_label @outer - (/.while (/.< (/.int (.int full_outer_iterations)) $outer_index) - (all /.then - (/.define $inner_index (/.int +0)) - (/.while (/.< (/.int (.int full_inner_iterations)) $inner_index) - (all /.then - (/.when (/.= (/.int (.int expected_outer_iterations)) $outer_index) - (/.break_at @outer)) - (/.when (/.= (/.int (.int expected_inner_iterations)) $inner_index) - /.break) - (/.set $output (/.+ $input $output)) - (/.set $inner_index (/.+ (/.int +1) $inner_index)) - )) - (/.set $outer_index (/.+ (/.int +1) $outer_index)) - ))) - (/.return $output))) - (list (/.int input)))))) + (/.apply (/.closure (list $input) + (all /.then + (/.define $output (/.int +0)) + (/.define $outer_index (/.int +0)) + (/.with_label @outer + (/.while (/.< (/.int (.int full_outer_iterations)) $outer_index) + (all /.then + (/.define $inner_index (/.int +0)) + (/.while (/.< (/.int (.int full_inner_iterations)) $inner_index) + (all /.then + (/.when (/.= (/.int (.int expected_outer_iterations)) $outer_index) + (/.break_at @outer)) + (/.when (/.= (/.int (.int expected_inner_iterations)) $inner_index) + /.break) + (/.set $output (/.+ $input $output)) + (/.set $inner_index (/.+ (/.int +1) $inner_index)) + )) + (/.set $outer_index (/.+ (/.int +1) $outer_index)) + ))) + (/.return $output))) + (list (/.int input)))))) (_.coverage [/.continue_at] (let [expected (i.* (.int (n.* (n.- expected_outer_iterations full_outer_iterations) (n.- expected_inner_iterations full_inner_iterations))) input)] (expression (|>> (as Frac) f.int (i.= expected)) - (/.apply_* (/.closure (list $input) - (all /.then - (/.define $output (/.int +0)) - (/.define $outer_index (/.int +0)) - (/.with_label @outer - (/.while (/.< (/.int (.int full_outer_iterations)) $outer_index) - (all /.then - (/.set $outer_index (/.+ (/.int +1) $outer_index)) - (/.define $inner_index (/.int +0)) - (/.while (/.< (/.int (.int full_inner_iterations)) $inner_index) - (all /.then - (/.set $inner_index (/.+ (/.int +1) $inner_index)) - (/.when (/.<= (/.int (.int expected_outer_iterations)) $outer_index) - (/.continue_at @outer)) - (/.when (/.<= (/.int (.int expected_inner_iterations)) $inner_index) - /.continue) - (/.set $output (/.+ $input $output)) - )) - ) - )) - (/.return $output))) - (list (/.int input)))))) + (/.apply (/.closure (list $input) + (all /.then + (/.define $output (/.int +0)) + (/.define $outer_index (/.int +0)) + (/.with_label @outer + (/.while (/.< (/.int (.int full_outer_iterations)) $outer_index) + (all /.then + (/.set $outer_index (/.+ (/.int +1) $outer_index)) + (/.define $inner_index (/.int +0)) + (/.while (/.< (/.int (.int full_inner_iterations)) $inner_index) + (all /.then + (/.set $inner_index (/.+ (/.int +1) $inner_index)) + (/.when (/.<= (/.int (.int expected_outer_iterations)) $outer_index) + (/.continue_at @outer)) + (/.when (/.<= (/.int (.int expected_inner_iterations)) $inner_index) + /.continue) + (/.set $output (/.+ $input $output)) + )) + ) + )) + (/.return $output))) + (list (/.int input)))))) )) ))) @@ -562,41 +562,41 @@ (all _.and (_.coverage [/.while] (expression (|>> (as Frac) f.int (i.= expected|while)) - (/.apply_* (/.closure (list $input) - (all /.then - (/.define $index (/.int +0)) - (/.define $output (/.int +0)) - (/.while (/.< (/.int (.int iterations)) $index) - (all /.then - (/.set $output (/.+ $input $output)) - (/.set $index (/.+ (/.int +1) $index)) - )) - (/.return $output))) - (list (/.int input))))) + (/.apply (/.closure (list $input) + (all /.then + (/.define $index (/.int +0)) + (/.define $output (/.int +0)) + (/.while (/.< (/.int (.int iterations)) $index) + (all /.then + (/.set $output (/.+ $input $output)) + (/.set $index (/.+ (/.int +1) $index)) + )) + (/.return $output))) + (list (/.int input))))) (_.coverage [/.do_while] (expression (|>> (as Frac) f.int (i.= expected|do_while)) - (/.apply_* (/.closure (list $input) - (all /.then - (/.define $index (/.int +0)) - (/.define $output (/.int +0)) - (/.do_while (/.< (/.int (.int iterations)) $index) - (all /.then - (/.set $output (/.+ $input $output)) - (/.set $index (/.+ (/.int +1) $index)) - )) - (/.return $output))) - (list (/.int input))))) + (/.apply (/.closure (list $input) + (all /.then + (/.define $index (/.int +0)) + (/.define $output (/.int +0)) + (/.do_while (/.< (/.int (.int iterations)) $index) + (all /.then + (/.set $output (/.+ $input $output)) + (/.set $index (/.+ (/.int +1) $index)) + )) + (/.return $output))) + (list (/.int input))))) (_.coverage [/.for] (expression (|>> (as Frac) f.int (i.= expected|while)) - (/.apply_* (/.closure (list $input) - (all /.then - (/.define $output (/.int +0)) - (/.for $index (/.int +0) - (/.< (/.int (.int iterations)) $index) - (/.++ $index) - (/.set $output (/.+ $input $output))) - (/.return $output))) - (list (/.int input))))) + (/.apply (/.closure (list $input) + (all /.then + (/.define $output (/.int +0)) + (/.for $index (/.int +0) + (/.< (/.int (.int iterations)) $index) + (/.++ $index) + (/.set $output (/.+ $input $output))) + (/.return $output))) + (list (/.int input))))) (_.for [/.Label] ..test|label) ))) @@ -611,18 +611,18 @@ (all _.and (_.coverage [/.try] (expression (|>> (as Frac) (f.= expected)) - (/.apply_* (/.closure (list) - (/.try (/.return (/.number expected)) - [$ex (/.return (/.number dummy))])) - (list)))) + (/.apply (/.closure (list) + (/.try (/.return (/.number expected)) + [$ex (/.return (/.number dummy))])) + (list)))) (_.coverage [/.throw] (expression (|>> (as Frac) (f.= expected)) - (/.apply_* (/.closure (list) - (/.try (all /.then - (/.throw (/.number expected)) - (/.return (/.number dummy))) - [$ex (/.return $ex)])) - (list)))) + (/.apply (/.closure (list) + (/.try (all /.then + (/.throw (/.number expected)) + (/.return (/.number dummy))) + [$ex (/.return $ex)])) + (list)))) ))) (def: test|apply @@ -650,12 +650,12 @@ (/.number number/0) (/.number number/1) (/.number number/2)))) - (_.coverage [/.apply_*] + (_.coverage [/.apply] (expression (|>> (as Frac) (f.= (all f.+ number/0 number/1 number/2))) - (/.apply_* (/.closure (list $arg/0 $arg/1 $arg/2) (/.return (all /.+ $arg/0 $arg/1 $arg/2))) - (list (/.number number/0) - (/.number number/1) - (/.number number/2))))) + (/.apply (/.closure (list $arg/0 $arg/1 $arg/2) (/.return (all /.+ $arg/0 $arg/1 $arg/2))) + (list (/.number number/0) + (/.number number/1) + (/.number number/2))))) )))) (def: test|function @@ -670,8 +670,8 @@ (all _.and (_.coverage [/.closure /.return] (expression (|>> (as Frac) (f.= number/0)) - (/.apply_* (/.closure (list) (/.return (/.number number/0))) - (list)))) + (/.apply (/.closure (list) (/.return (/.number number/0))) + (list)))) (_.coverage [/.function] (expression (|>> (as Frac) f.nat (n.= iterations)) (/.apply_1 (/.function $self (list $arg/0) @@ -681,14 +681,14 @@ (/.int +0)))) (_.coverage [/.function_definition] (expression (|>> (as Frac) f.nat (n.= iterations)) - (/.apply_* (/.closure (list) - (all /.then - (/.function_definition $self (list $arg/0) - (/.return (/.? (/.< (/.int (.int iterations)) $arg/0) - (/.apply_1 $self (/.+ (/.int +1) $arg/0)) - $arg/0))) - (/.return (/.apply_1 $self (/.int +0))))) - (list)))) + (/.apply (/.closure (list) + (all /.then + (/.function_definition $self (list $arg/0) + (/.return (/.? (/.< (/.int (.int iterations)) $arg/0) + (/.apply_1 $self (/.+ (/.int +1) $arg/0)) + $arg/0))) + (/.return (/.apply_1 $self (/.int +0))))) + (list)))) (_.coverage [/.new] (let [$this (/.var "this")] (expression (|>> (as Frac) (f.= number/0)) @@ -721,44 +721,44 @@ (all _.and (_.coverage [/.if] (expression (|>> (as Frac) (f.= (if ??? number/0 number/1))) - (/.apply_* (/.closure (list) - (/.if (/.boolean ???) - (/.return (/.number number/0)) - (/.return (/.number number/1)))) - (list)))) + (/.apply (/.closure (list) + (/.if (/.boolean ???) + (/.return (/.number number/0)) + (/.return (/.number number/1)))) + (list)))) (_.coverage [/.when] (expression (|>> (as Frac) (f.= (if ??? number/0 number/1))) - (/.apply_* (/.closure (list) - (all /.then - (/.when (/.boolean ???) - (/.return (/.number number/0))) - (/.return (/.number number/1)))) - (list)))) + (/.apply (/.closure (list) + (all /.then + (/.when (/.boolean ???) + (/.return (/.number number/0))) + (/.return (/.number number/1)))) + (list)))) (_.coverage [/.switch] (let [number/0' (%.frac number/0) number/1' (%.frac number/1) number/2' (%.frac number/2)] (and (expression (|>> (as Text) (text#= number/0')) - (/.apply_* (/.closure (list) - (/.switch (/.number number/0) - (list [(list (/.number number/0)) (/.return (/.string number/0'))] - [(list (/.number number/1)) (/.return (/.string number/1'))]) - {.#None})) - (list))) + (/.apply (/.closure (list) + (/.switch (/.number number/0) + (list [(list (/.number number/0)) (/.return (/.string number/0'))] + [(list (/.number number/1)) (/.return (/.string number/1'))]) + {.#None})) + (list))) (expression (|>> (as Text) (text#= number/1')) - (/.apply_* (/.closure (list) - (/.switch (/.number number/1) - (list [(list (/.number number/0)) (/.return (/.string number/0'))] - [(list (/.number number/1)) (/.return (/.string number/1'))]) - {.#Some (/.return (/.string number/2'))})) - (list))) + (/.apply (/.closure (list) + (/.switch (/.number number/1) + (list [(list (/.number number/0)) (/.return (/.string number/0'))] + [(list (/.number number/1)) (/.return (/.string number/1'))]) + {.#Some (/.return (/.string number/2'))})) + (list))) (expression (|>> (as Text) (text#= number/2')) - (/.apply_* (/.closure (list) - (/.switch (/.number number/2) - (list [(list (/.number number/0)) (/.return (/.string number/0'))] - [(list (/.number number/1)) (/.return (/.string number/1'))]) - {.#Some (/.return (/.string number/2'))})) - (list))) + (/.apply (/.closure (list) + (/.switch (/.number number/2) + (list [(list (/.number number/0)) (/.return (/.string number/0'))] + [(list (/.number number/1)) (/.return (/.string number/1'))]) + {.#Some (/.return (/.string number/2'))})) + (list))) ))) ))) @@ -802,20 +802,20 @@ (/.number number/1)))) (_.coverage [/.use_strict] (and (expression (|>> (as Frac) (f.= number/0)) - (/.apply_* (/.closure (list) - (all /.then - /.use_strict - (/.declare $arg/0) - (/.set $arg/0 (/.number number/0)) - (/.return $arg/0))) - (list))) - (|> (/.apply_* (/.closure (list) - (all /.then - /.use_strict - ... (/.declare $arg/0) - (/.set $arg/0 (/.number number/0)) - (/.return $arg/0))) - (list)) + (/.apply (/.closure (list) + (all /.then + /.use_strict + (/.declare $arg/0) + (/.set $arg/0 (/.number number/0)) + (/.return $arg/0))) + (list))) + (|> (/.apply (/.closure (list) + (all /.then + /.use_strict + ... (/.declare $arg/0) + (/.set $arg/0 (/.number number/0)) + (/.return $arg/0))) + (list)) ..eval (pipe.case {try.#Success it} diff --git a/stdlib/source/test/lux/target/python.lux b/stdlib/source/test/lux/target/python.lux index e9ce7cdda..95f765d6b 100644 --- a/stdlib/source/test/lux/target/python.lux +++ b/stdlib/source/test/lux/target/python.lux @@ -321,14 +321,14 @@ (/.do "ceil" (list (/.float float)))))) (_.coverage [/.is] (and (expression (|>> (as Bit)) - (/.apply/* (list (/.string (format string string))) - (/.lambda (list $arg/0) - (/.is $arg/0 $arg/0)))) + (/.apply (list (/.string (format string string))) + (/.lambda (list $arg/0) + (/.is $arg/0 $arg/0)))) (expression (|>> (as Bit) not) - (/.apply/* (list (/.string (format string string)) - (/.string string)) - (/.lambda (list $arg/0 $arg/1) - (/.is $arg/0 (/.+ $arg/1 $arg/1))))))) + (/.apply (list (/.string (format string string)) + (/.string string)) + (/.lambda (list $arg/0 $arg/1) + (/.is $arg/0 (/.+ $arg/1 $arg/1))))))) ))) (def: test|function @@ -343,14 +343,14 @@ (all _.and (_.coverage [/.lambda] (expression (|>> (as Frac) (f.= float/0)) - (/.apply/* (list) - (/.lambda (list) - (/.float float/0))))) - (_.coverage [/.apply/*] + (/.apply (list) + (/.lambda (list) + (/.float float/0))))) + (_.coverage [/.apply] (expression (|>> (as Frac) (f.= (all f.+ float/0 float/1 float/2))) - (/.apply/* (list (/.float float/0) (/.float float/1) (/.float float/2)) - (/.lambda (list $arg/0 $arg/1 $arg/2) - (all /.+ $arg/0 $arg/1 $arg/2))))) + (/.apply (list (/.float float/0) (/.float float/1) (/.float float/2)) + (/.lambda (list $arg/0 $arg/1 $arg/2) + (all /.+ $arg/0 $arg/1 $arg/2))))) ))) (def: test|var @@ -371,44 +371,44 @@ (all _.and (_.coverage [/.Single /.SVar /.var] (expression (|>> (as Frac) (f.= expected/0)) - (/.apply/* (list (/.float expected/0)) - (/.lambda (list $var) $var)))) + (/.apply (list (/.float expected/0)) + (/.lambda (list $var) $var)))) (_.for [/.Poly /.PVar] (all _.and (_.coverage [/.poly] (expression (|>> (as Frac) (f.= expected/?)) - (/.apply/* (list (/.int (.int poly_choice)) - (/.float expected/0) - (/.float expected/1)) - (/.lambda (list $choice (/.poly $var)) - (/.item $choice $var))))) + (/.apply (list (/.int (.int poly_choice)) + (/.float expected/0) + (/.float expected/1)) + (/.lambda (list $choice (/.poly $var)) + (/.item $choice $var))))) (_.coverage [/.splat_poly] (expression (|>> (as Frac) (f.= expected/?)) - (/.apply/* (list (/.int (.int poly_choice)) - (/.splat_poly - (/.list (list (/.float expected/0) - (/.float expected/1))))) - (/.lambda (list $choice (/.poly $var)) - (/.item $choice $var))))) + (/.apply (list (/.int (.int poly_choice)) + (/.splat_poly + (/.list (list (/.float expected/0) + (/.float expected/1))))) + (/.lambda (list $choice (/.poly $var)) + (/.item $choice $var))))) )) (_.for [/.Keyword /.KVar] (all _.and (_.coverage [/.keyword] (expression (|>> (as Nat) (n.= 2)) - (/.apply/* (list keyword_choice - (/.splat_keyword - (/.dict (list [keyword/0 (/.float expected/0)] - [keyword/1 (/.float expected/1)])))) - (/.lambda (list $choice (/.keyword $var)) - (/.len/1 $var))))) + (/.apply (list keyword_choice + (/.splat_keyword + (/.dict (list [keyword/0 (/.float expected/0)] + [keyword/1 (/.float expected/1)])))) + (/.lambda (list $choice (/.keyword $var)) + (/.len/1 $var))))) (_.coverage [/.splat_keyword] (expression (|>> (as Frac) (f.= expected/?)) - (/.apply/* (list keyword_choice - (/.splat_keyword - (/.dict (list [keyword/0 (/.float expected/0)] - [keyword/1 (/.float expected/1)])))) - (/.lambda (list $choice (/.keyword $var)) - (/.item $choice $var))))) + (/.apply (list keyword_choice + (/.splat_keyword + (/.dict (list [keyword/0 (/.float expected/0)] + [keyword/1 (/.float expected/1)])))) + (/.lambda (list $choice (/.keyword $var)) + (/.item $choice $var))))) )) ))) @@ -563,7 +563,7 @@ (/.def $def (list $var/0) (/.return (/.in? /.globals/0 (/.string (/.code $var/0))))) (/.set (list $output) (/.and (/.not (/.in? /.globals/0 (/.string (/.code $var/0)))) - (/.not (/.apply/* (list (/.float dummy/0)) $def)))) + (/.not (/.apply (list (/.float dummy/0)) $def)))) (/.set (list $var/0) (/.float dummy/0)) (/.set (list $output) (/.and $output (/.in? /.globals/0 (/.string (/.code $var/0)))))))) @@ -575,7 +575,7 @@ (/.def $def (list $var/0) (/.return (/.in? /.locals/0 (/.string (/.code $var/0))))) (/.set (list $output) (/.and (/.not (/.in? /.locals/0 (/.string (/.code $var/0)))) - (/.apply/* (list (/.float dummy/0)) $def))) + (/.apply (list (/.float dummy/0)) $def))) (/.set (list $var/0) (/.float dummy/0)) (/.set (list $output) (/.and $output (/.in? /.locals/0 (/.string (/.code $var/0)))))))) @@ -759,7 +759,7 @@ (all /.then (/.def $def (list $input/0) (/.return $input/0)) - (/.set (list $output) (/.apply/* (list (/.float expected/0)) $def))))) + (/.set (list $output) (/.apply (list (/.float expected/0)) $def))))) (as Frac) (f.= expected/0))) (_.coverage [/.if] @@ -770,7 +770,7 @@ (/.if (/.bool test) (/.return (/.float then)) (/.return (/.float else)))) - (/.set (list $output) (/.apply/* (list) $def))))) + (/.set (list $output) (/.apply (list) $def))))) (as Frac) (f.= expected/?))) (_.coverage [/.when /.then] @@ -782,7 +782,7 @@ (/.when (/.bool test) (/.return (/.float then))) (/.return (/.float else)))) - (/.set (list $output) (/.apply/* (list) $def))))) + (/.set (list $output) (/.apply (list) $def))))) (as Frac) (f.= expected/?))) (_.coverage [/.statement] @@ -793,7 +793,7 @@ (all /.then (/.statement (/.+ (/.float expected/0) (/.float expected/0))) (/.return (/.float expected/0)))) - (/.set (list $output) (/.apply/* (list) $def))))) + (/.set (list $output) (/.apply (list) $def))))) (as Frac) (f.= expected/0))) (_.coverage [/.exec] diff --git a/stdlib/source/test/lux/target/ruby.lux b/stdlib/source/test/lux/target/ruby.lux index ccbb01bd1..76269ebd5 100644 --- a/stdlib/source/test/lux/target/ruby.lux +++ b/stdlib/source/test/lux/target/ruby.lux @@ -270,7 +270,7 @@ (/.new (list) {.#None}) (/.do (/.code $method/0) (list (/.float single)) {.#None})))) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list))))) + (/.apply_lambda (list))))) (_.coverage [/.new /.initialize] (expression (|>> (as Frac) (f.= single)) (|> (all /.then @@ -285,7 +285,7 @@ (/.new (list (/.float single)) {.#None}) (/.do (/.code $method/0) (list) {.#None})))) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list))))) + (/.apply_lambda (list))))) (_.coverage [/.alias_method/2] (expression (|>> (as Frac) (f.= (f.+ single single))) (|> (all /.then @@ -298,7 +298,7 @@ (/.new (list) {.#None}) (/.do (/.code $method/1) (list (/.float single)) {.#None})))) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list))))) + (/.apply_lambda (list))))) (_.for [/.module] (all _.and (_.coverage [/.include/1] @@ -312,7 +312,7 @@ (/.new (list) {.#None}) (/.do (/.code $method/0) (list (/.float single)) {.#None})))) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list))))) + (/.apply_lambda (list))))) (_.coverage [/.extend/1] (expression (|>> (as Frac) (f.= (f.+ single single))) (|> (all /.then @@ -323,7 +323,7 @@ (/.return (|> $sub_class (/.do (/.code $method/0) (list (/.float single)) {.#None})))) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list))))) + (/.apply_lambda (list))))) )) ))) @@ -351,7 +351,7 @@ (/.set (list /.stdout) $old) (/.return (/.the "string" $new))) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list))))) + (/.apply_lambda (list))))) (_.coverage [/.print/2] (expression (|>> (as Text) (text#= expected)) (|> (all /.then @@ -363,7 +363,7 @@ (/.set (list /.stdout) $old) (/.return (/.the "string" $new))) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list))))) + (/.apply_lambda (list))))) )) (_.for [/.stdin] (all _.and @@ -378,7 +378,7 @@ (/.set (list /.stdin) $old) (/.return $it)) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list))))) + (/.apply_lambda (list))))) (_.coverage [/.last_string_read] (expression (|>> (as Text) (text#= (format right text.\n))) (|> (all /.then @@ -390,7 +390,7 @@ (/.set (list /.stdin) $old) (/.return /.last_string_read)) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list))))) + (/.apply_lambda (list))))) (_.coverage [/.last_line_number_read] (expression (|>> (as Nat) (n.= 2)) /.last_line_number_read)) @@ -442,7 +442,7 @@ (/.set (list $global) (/.float float/0)) (/.return (/.defined?/1 $global))) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list))))) + (/.apply_lambda (list))))) (_.coverage [/.script_name] (expression (let [file (format (# file.default separator) packager.main_file)] (|>> (as Text) @@ -472,7 +472,7 @@ (/.do "match" (list pattern) {.#None}))) (/.return (/.= pattern /.last_string_matched))) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list))))) + (/.apply_lambda (list))))) (_.coverage [/.last_regexp_match] (expression (|>> (as Bit)) (|> (/.return (|> (/.manual "Regexp") @@ -480,7 +480,7 @@ (/.do "match" (list pattern) {.#None}) (/.= /.last_regexp_match))) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list))))) + (/.apply_lambda (list))))) ))) (def: test|local_var @@ -493,14 +493,14 @@ (expression (|>> (as Frac) (f.= (f.+ float/0 float/0))) (|> (/.return (/.+ $foreign $foreign)) [(list $foreign)] (/.lambda {.#None}) - (/.apply_lambda/* (list (/.float float/0)))))) + (/.apply_lambda (list (/.float float/0)))))) (_.coverage [/.set] (expression (|>> (as Frac) (f.= (f.+ float/0 float/0))) (|> (all /.then (/.set (list $foreign) (/.float float/0)) (/.return (/.+ $foreign $foreign))) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list))))) + (/.apply_lambda (list))))) ))) (def: test|instance_var @@ -531,7 +531,7 @@ (/.new (list) {.#None}) (/.do (/.code $method) (list) {.#None})))) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list))))) + (/.apply_lambda (list))))) (_.coverage [/.attr_reader/*] (expression (|>> (as Frac) (f.= float/0)) (|> (all /.then @@ -545,7 +545,7 @@ (/.new (list) {.#None}) (/.the instance)))) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list))))) + (/.apply_lambda (list))))) (_.coverage [/.attr_writer/*] (expression (|>> (as Frac) (f.= float/0)) (|> (all /.then @@ -561,7 +561,7 @@ (/.return (|> $object (/.do (/.code $method) (list) {.#None})))) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list))))) + (/.apply_lambda (list))))) (_.coverage [/.attr_accessor/*] (expression (|>> (as Frac) (f.= float/0)) (|> (all /.then @@ -572,7 +572,7 @@ (/.set (list (/.the instance $object)) (/.float float/0)) (/.return (/.the instance $object))) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list))))) + (/.apply_lambda (list))))) ))) (def: test|static_var @@ -598,7 +598,7 @@ (/.statement (/.class_variable_set $static (/.int int/0) $class)) (/.return (/.class_variable_get $static $class))) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list))))) + (/.apply_lambda (list))))) ))) (def: test|variadic @@ -619,18 +619,18 @@ (expression (|>> (as Int) .nat (n.= arity)) (|> (/.return (/.the "length" $inputs)) [(list (/.variadic $inputs))] (/.lambda {.#None}) - (/.apply_lambda/* vals)))) + (/.apply_lambda vals)))) (_.coverage [/.splat] (expression (|>> (as Int) .nat (n.= arity)) (|> (/.return (/.the "length" (/.array (list (/.splat $inputs))))) [(list (/.variadic $inputs))] (/.lambda {.#None}) - (/.apply_lambda/* vals)))))) + (/.apply_lambda vals)))))) (<| (_.for [/.LVar**]) (_.coverage [/.variadic_kv /.double_splat] (expression (|>> (as Int) .nat (n.= arity)) (|> (/.return (/.the "length" $inputs)) [(list (/.variadic_kv $inputs))] (/.lambda {.#None}) - (/.apply_lambda/* (list (/.double_splat (/.hash (list.zipped_2 keys vals))))))))) + (/.apply_lambda (list (/.double_splat (/.hash (list.zipped_2 keys vals))))))))) ))) (def: test|var @@ -650,7 +650,7 @@ (/.set (list $foreign) (/.float float/0)) (/.return (/.defined?/1 $foreign))) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list)))))) + (/.apply_lambda (list)))))) (_.for [/.CVar] (_.coverage [/.constant] (expression (|>> (as Text) (text#= "constant")) @@ -658,7 +658,7 @@ (/.set (list $constant) (/.float float/0)) (/.return (/.defined?/1 $constant))) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list)))))) + (/.apply_lambda (list)))))) (_.for [/.GVar] ..test|global) (_.for [/.LVar] @@ -687,7 +687,7 @@ (/.set (list @) (/.+ @ @)) (/.return @)) [(list $foreign)] (/.lambda {.#None}) - (/.apply_lambda/* (list (/.float float/0)))))) + (/.apply_lambda (list (/.float float/0)))))) (expression (|>> (as Frac) (f.= (f.+ float/0 float/0))) (let [@ (/.item field $foreign)] (|> (all /.then @@ -695,7 +695,7 @@ (/.set (list @) (/.+ @ @)) (/.return @)) [(list $foreign)] (/.lambda {.#None}) - (/.apply_lambda/* (list (/.float float/0)))))) + (/.apply_lambda (list (/.float float/0)))))) )) ))) @@ -744,7 +744,7 @@ )) (/.return $output)) [(list $input)] (/.lambda {.#None}) - (/.apply_lambda/* (list (/.int input))))))) + (/.apply_lambda (list (/.int input))))))) (_.coverage [/.next] (let [expected (i.* (.int (n.- expected_inner_iterations full_inner_iterations)) input)] (expression (|>> (as Frac) f.int (i.= expected)) @@ -760,7 +760,7 @@ )) (/.return $output)) [(list $input)] (/.lambda {.#None}) - (/.apply_lambda/* (list (/.int input))))))) + (/.apply_lambda (list (/.int input))))))) (_.coverage [/.redo] (let [expected (i.* (.int (n.- expected_inner_iterations full_inner_iterations)) input)] (expression (|>> (as Frac) f.int (i.= expected)) @@ -776,7 +776,7 @@ )) (/.return $output)) [(list $input)] (/.lambda {.#None}) - (/.apply_lambda/* (list (/.int input))))))) + (/.apply_lambda (list (/.int input))))))) ))) (def: test|loop @@ -801,7 +801,7 @@ )) (/.return $output)) [(list $input)] (/.lambda {.#None}) - (/.apply_lambda/* (list (/.int input)))))) + (/.apply_lambda (list (/.int input)))))) (_.coverage [/.for_in] (expression (|>> (as Int) (i.= expected)) (|> (all /.then @@ -810,7 +810,7 @@ (/.set (list $output) (/.+ $index $output))) (/.return $output)) [(list $input)] (/.lambda {.#None}) - (/.apply_lambda/* (list (/.int input)))))) + (/.apply_lambda (list (/.int input)))))) ..test|label ))) @@ -839,7 +839,7 @@ (|> (/.begin (/.return (/.float expected)) (list [(list) $ex (/.return (/.float dummy))])) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list))))) + (/.apply_lambda (list))))) (_.coverage [/.Rescue /.throw/1] (expression (|>> (as Frac) (f.= expected)) (|> (/.begin (all /.then @@ -847,7 +847,7 @@ (/.return (/.float dummy))) (list [(list) $ex (/.return (/.float expected))])) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list))))) + (/.apply_lambda (list))))) (_.coverage [/.raise] (expression (|>> (as Frac) (f.= expected)) (|> (/.begin (all /.then @@ -855,23 +855,23 @@ (/.return (/.float dummy))) (list [(list) $ex (/.return (/.float expected))])) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list))))) + (/.apply_lambda (list))))) (_.coverage [/.catch /.throw/2] (and (expression (|>> (as Frac) (f.= expected)) - (<| (/.apply_lambda/* (list)) + (<| (/.apply_lambda (list)) (/.lambda {.#None}) [(list)] /.return (/.catch expected_tag) [(list)] (/.throw/2 expected_tag (/.float expected)))) (expression (|>> (as Frac) (f.= expected)) - (<| (/.apply_lambda/* (list)) + (<| (/.apply_lambda (list)) (/.lambda {.#None}) [(list)] /.return (/.catch expected_tag) [(list)] /.statement (/.catch dummy_tag) [(list)] (/.throw/2 expected_tag (/.float expected)))) (expression (|>> (as Frac) (f.= expected)) - (<| (/.apply_lambda/* (list)) + (<| (/.apply_lambda (list)) (/.lambda {.#None}) [(list)] /.return (/.catch dummy_tag) [(list)] @@ -884,11 +884,11 @@ (/.return (/.float dummy))) (list [(list) $ex (/.return (/.the "message" /.latest_error_message))])) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list))))) + (/.apply_lambda (list))))) (_.coverage [/.latest_error_location] (and (|> (/.return /.latest_error_location) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list)) + (/.apply_lambda (list)) ..nil) (expression (|>> (as Bit) (bit#= true)) (|> (/.begin (all /.then @@ -898,7 +898,7 @@ (/.do "kind_of?" (list (is /.CVar (/.manual "Array"))) {.#None} /.latest_error_location) (/.> (/.int +0) (/.the "length" /.latest_error_location))))])) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list)))))) + (/.apply_lambda (list)))))) ))) (def: test|function @@ -920,36 +920,36 @@ (and (expression (|>> (as Frac) (f.= float/0)) (|> (/.return (/.float float/0)) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list)))) + (/.apply_lambda (list)))) (expression (|>> (as Frac) f.nat (n.= iterations)) (|> (/.return (/.? (/.< (/.int (.int iterations)) $arg/0) - (/.apply_lambda/* (list (/.+ (/.int +1) $arg/0)) $self) + (/.apply_lambda (list (/.+ (/.int +1) $arg/0)) $self) $arg/0)) [(list $arg/0)] (/.lambda {.#Some $self}) - (/.apply_lambda/* (list (/.int +0))))))) - (_.coverage [/.apply_lambda/*] + (/.apply_lambda (list (/.int +0))))))) + (_.coverage [/.apply_lambda] (expression (|>> (as Frac) (f.= (all f.+ float/0 float/1 float/2))) (|> (/.return (all /.+ $arg/0 $arg/1 $arg/2)) [(list $arg/0 $arg/1 $arg/2)] (/.lambda {.#None}) - (/.apply_lambda/* (list (/.float float/0) (/.float float/1) (/.float float/2)))))) + (/.apply_lambda (list (/.float float/0) (/.float float/1) (/.float float/2)))))) (_.coverage [/.function] (expression (|>> (as Frac) f.nat (n.= iterations)) (|> (all /.then (/.function $self (list $arg/0) (/.return (/.? (/.< (/.int (.int iterations)) $arg/0) - (/.apply/* (list (/.+ (/.int +1) $arg/0)) {.#None} $self) + (/.apply (list (/.+ (/.int +1) $arg/0)) {.#None} $self) $arg/0))) - (/.return (/.apply/* (list (/.int +0)) {.#None} $self))) + (/.return (/.apply (list (/.int +0)) {.#None} $self))) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list))))) - (_.coverage [/.apply/*] + (/.apply_lambda (list))))) + (_.coverage [/.apply] (expression (|>> (as Frac) (f.= (all f.+ float/0 float/1 float/2))) (|> (all /.then (/.function $self (list $arg/0 $arg/1 $arg/2) (/.return (all /.+ $arg/0 $arg/1 $arg/2))) - (/.return (/.apply/* (list (/.float float/0) (/.float float/1) (/.float float/2)) {.#None} $self))) + (/.return (/.apply (list (/.float float/0) (/.float float/1) (/.float float/2)) {.#None} $self))) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list))))) + (/.apply_lambda (list))))) ))) (def: test|branching @@ -975,7 +975,7 @@ (/.return (/.float float/0)) (/.return (/.float float/1))) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list))))) + (/.apply_lambda (list))))) (_.coverage [/.when] (expression (|>> (as Frac) (f.= (if ??? float/0 float/1))) (|> (all /.then @@ -983,7 +983,7 @@ (/.return (/.float float/0))) (/.return (/.float float/1))) [(list)] (/.lambda {.#None}) - (/.apply_lambda/* (list))))) + (/.apply_lambda (list))))) ))) (def: test|statement @@ -1004,14 +1004,14 @@ (/.statement (/.+ $arg/0 $arg/0)) (/.return $arg/0)) [(list $arg/0)] (/.lambda {.#None}) - (/.apply_lambda/* (list (/.float float/0)))))) + (/.apply_lambda (list (/.float float/0)))))) (_.coverage [/.then] (expression (|>> (as Frac) (f.= float/0)) (|> (all /.then (/.return $arg/0) (/.return $arg/1)) [(list $arg/0 $arg/1)] (/.lambda {.#None}) - (/.apply_lambda/* (list (/.float float/0) (/.float float/1)))))) + (/.apply_lambda (list (/.float float/0) (/.float float/1)))))) (_.coverage [/.require/1] (let [$JSON (is /.CVar (/.manual "JSON"))] (expression (|>> (as Text) (text#= expected)) @@ -1020,7 +1020,7 @@ (/.return (let [json (/.do "parse" (list $arg/0) {.#None} $JSON)] (/.do "generate" (list json) {.#None} $JSON)))) [(list $arg/0)] (/.lambda {.#None}) - (/.apply_lambda/* (list (/.string expected))))))) + (/.apply_lambda (list (/.string expected))))))) ..test|exception ..test|branching ..test|loop -- cgit v1.2.3