diff options
60 files changed, 554 insertions, 554 deletions
diff --git a/.github/workflows/setup_aedifex/action.yml b/.github/workflows/setup_aedifex/action.yml index 75dacb5d3..97f2869a5 100644 --- a/.github/workflows/setup_aedifex/action.yml +++ b/.github/workflows/setup_aedifex/action.yml @@ -14,7 +14,7 @@ runs: # - uses: actions/checkout@v2 # Install Aedifex - - run: wget https://github.com/LuxLang/lux/releases/download/0.6.5/aedifex_do_not_touch_6.jar && mv aedifex_do_not_touch_6.jar aedifex.jar + - run: wget https://github.com/LuxLang/lux/releases/download/0.6.5/aedifex_do_not_touch_7.jar && mv aedifex_do_not_touch_7.jar aedifex.jar shell: bash # Make the `lux` command available. diff --git a/lux-js/source/program.lux b/lux-js/source/program.lux index 76302fa55..01646ac23 100644 --- a/lux-js/source/program.lux +++ b/lux-js/source/program.lux @@ -700,8 +700,8 @@ (def: (scope body) (-> _.Statement _.Statement) - (_.statement (_.apply_* (_.closure (list) body) - (list)))) + (_.statement (_.apply (_.closure (list) body) + (list)))) (def: (lux_compiler it) (-> Any platform.Custom) diff --git a/lux-lua/source/program.lux b/lux-lua/source/program.lux index 0a1eda39b..6f66ac45c 100644 --- a/lux-lua/source/program.lux +++ b/lux-lua/source/program.lux @@ -288,7 +288,7 @@ (list $input (` (..read (~ $input)))))) list#conjoint)) - (def: (apply_* to_host self parameters abstraction) + (def: (apply/* to_host self parameters abstraction) (-> (-> Any java/lang/Object) net/sandius/rembulan/runtime/LuaFunction (List java/lang/Object) Any Any) (<| try.trusted (do [! try.monad] @@ -343,7 +343,7 @@ void "throws" [net/sandius/rembulan/runtime/ResolvedControlThrowable] (<| (..return %) - (apply_* to_host + (apply/* to_host (ffi.is net/sandius/rembulan/runtime/LuaFunction self) (list (~~ (static.literals function.identity (..input/* <arity>)))) lux_function)))] @@ -361,7 +361,7 @@ void "throws" [net/sandius/rembulan/runtime/ResolvedControlThrowable] (<| (..return %) - (apply_* to_host + (apply/* to_host (ffi.is net/sandius/rembulan/runtime/LuaFunction self) (array.list {.#None} input/*) lux_function))) diff --git a/lux-python/source/program.lux b/lux-python/source/program.lux index cc7ef2162..feddcf1dd 100644 --- a/lux-python/source/program.lux +++ b/lux-python/source/program.lux @@ -540,13 +540,13 @@ (all _.then (_.import "sys") (_.when (_.= (_.string "__main__") (_.var "__name__")) - (_.statement (_.apply/* (list (|> (_.var "sys") (_.the "argv") - ... The first entry in the list will be the program.py file itself - ... so, it must be removed so only the program's arguments are left. - (_.slice_from (_.int +1)) - runtime.lux::program_args) - _.none) - program))))) + (_.statement (_.apply (list (|> (_.var "sys") (_.the "argv") + ... The first entry in the list will be the program.py file itself + ... so, it must be removed so only the program's arguments are left. + (_.slice_from (_.int +1)) + runtime.lux::program_args) + _.none) + program))))) (def: (declare_success! _) (-> Any (Async Any)) @@ -566,7 +566,7 @@ (; (_.do "setrecursionlimit" (list new_limit) $sys)) ... (; (_.do "stack_size" (list current_limit) $threading)) (_.def @program (list) body) - (; (_.apply/* (list) @program)) + (; (_.apply (list) @program)) )))) (def: (lux_compiler it) diff --git a/lux-ruby/source/program.lux b/lux-ruby/source/program.lux index 43b261494..5479aadb4 100644 --- a/lux-ruby/source/program.lux +++ b/lux-ruby/source/program.lux @@ -975,11 +975,11 @@ {.#None} (is _.CVar (_.manual "Object")))] (_.statement - (_.apply_lambda/* (list (runtime.lux//program_args (_.? normal_runtime? - _.command_line_arguments - (_.array (list)))) - _.nil) - program)))) + (_.apply_lambda (list (runtime.lux//program_args (_.? normal_runtime? + _.command_line_arguments + (_.array (list)))) + _.nil) + program)))) (def: (declare_success! _) (-> Any (Async Any)) diff --git a/stdlib/source/documentation/lux/control/parser/tree.lux b/stdlib/source/documentation/lux/control/parser/tree.lux index 416b9f910..282fcc7af 100644 --- a/stdlib/source/documentation/lux/control/parser/tree.lux +++ b/stdlib/source/documentation/lux/control/parser/tree.lux @@ -1,14 +1,14 @@ (.using - [library - [lux "*" - ["$" documentation {"+" documentation:}] - [data - [text {"+" \n} - ["%" format {"+" format}]]] - [macro - ["[0]" template]]]] - [\\library - ["[0]" /]]) + [library + [lux {"-" left right} + ["$" documentation {"+" documentation:}] + [data + [text {"+" \n} + ["%" format {"+" format}]]] + [macro + ["[0]" template]]]] + [\\library + ["[0]" /]]) (documentation: (/.Parser it) "A parser of arbitrary trees.") diff --git a/stdlib/source/documentation/lux/data/collection/list.lux b/stdlib/source/documentation/lux/data/collection/list.lux index 5497350e7..459e1f8c9 100644 --- a/stdlib/source/documentation/lux/data/collection/list.lux +++ b/stdlib/source/documentation/lux/data/collection/list.lux @@ -1,6 +1,6 @@ (.using [library - [lux "*" + [lux {"-" all} ["$" documentation {"+" documentation:}] [control ["<>" parser diff --git a/stdlib/source/documentation/lux/data/product.lux b/stdlib/source/documentation/lux/data/product.lux index 621ea9edb..a437421f5 100644 --- a/stdlib/source/documentation/lux/data/product.lux +++ b/stdlib/source/documentation/lux/data/product.lux @@ -1,14 +1,14 @@ (.using - [library - [lux {"-" nat int rev list type or and} - ["$" documentation {"+" documentation:}] - [data - [text - ["%" format {"+" format}]]] - [macro - ["[0]" template]]]] - [\\library - ["[0]" /]]) + [library + [lux {"-" left right} + ["$" documentation {"+" documentation:}] + [data + [text + ["%" format {"+" format}]]] + [macro + ["[0]" template]]]] + [\\library + ["[0]" /]]) (documentation: /.left "The left side of a pair.") diff --git a/stdlib/source/documentation/lux/data/sum.lux b/stdlib/source/documentation/lux/data/sum.lux index 7bdd8e54a..8d4a1edc5 100644 --- a/stdlib/source/documentation/lux/data/sum.lux +++ b/stdlib/source/documentation/lux/data/sum.lux @@ -1,14 +1,14 @@ (.using - [library - [lux "*" - ["$" documentation {"+" documentation:}] - [data - [text {"+" \n} - ["%" format {"+" format}]]] - [macro - ["[0]" template]]]] - [\\library - ["[0]" /]]) + [library + [lux {"-" left right} + ["$" documentation {"+" documentation:}] + [data + [text {"+" \n} + ["%" format {"+" format}]]] + [macro + ["[0]" template]]]] + [\\library + ["[0]" /]]) (documentation: /.left "Lifts value to the left side of a 2-variant.") diff --git a/stdlib/source/documentation/lux/macro/syntax.lux b/stdlib/source/documentation/lux/macro/syntax.lux index c4867ea7a..664439f72 100644 --- a/stdlib/source/documentation/lux/macro/syntax.lux +++ b/stdlib/source/documentation/lux/macro/syntax.lux @@ -22,13 +22,13 @@ (format \n "A more advanced way to define macros than 'macro:'." \n "The inputs to the macro can be parsed in complex ways through the use of syntax parsers." \n "The macro body is also (implicitly) run in the Meta monad, to save some typing." - \n "Also, the compiler state can be accessed through the *lux* binding.") - [(syntax: .public (object [.let [imports (class_imports *lux*)] - .let [class_vars (list)] - super (opt (super_class_decl^ imports class_vars)) - interfaces (tuple (some (super_class_decl^ imports class_vars))) - constructor_args (constructor_args^ imports class_vars) - methods (some (overriden_method_def^ imports))]) + \n "Also, the compiler state can be accessed through a special binding.") + [(syntax: .public (object lux_state [.let [imports (class_imports lux_state)] + .let [class_vars (list)] + super (opt (super_class_decl^ imports class_vars)) + interfaces (tuple (some (super_class_decl^ imports class_vars))) + constructor_args (constructor_args^ imports class_vars) + methods (some (overriden_method_def^ imports))]) (let [def_code (all text#composite "anon-class:" (spaced (list (super_class_decl$ (maybe.else object_super_class super)) (with_brackets (spaced (list#each super_class_decl$ interfaces))) diff --git a/stdlib/source/documentation/lux/target/js.lux b/stdlib/source/documentation/lux/target/js.lux index 32c800816..744b61310 100644 --- a/stdlib/source/documentation/lux/target/js.lux +++ b/stdlib/source/documentation/lux/target/js.lux @@ -34,7 +34,7 @@ ($.default /.var) ($.default /.at) ($.default /.the) - ($.default /.apply_*) + ($.default /.apply) ($.default /.do) ($.default /.object) ($.default /.,) diff --git a/stdlib/source/documentation/lux/target/python.lux b/stdlib/source/documentation/lux/target/python.lux index 4fa9c05e3..60d5172bd 100644 --- a/stdlib/source/documentation/lux/target/python.lux +++ b/stdlib/source/documentation/lux/target/python.lux @@ -48,7 +48,7 @@ ($.default /.slice) ($.default /.slice_from) ($.default /.dict) - ($.default /.apply/*) + ($.default /.apply) ($.default /.splat_poly) ($.default /.splat_keyword) ($.default /.the) diff --git a/stdlib/source/documentation/lux/target/ruby.lux b/stdlib/source/documentation/lux/target/ruby.lux index f295a437e..0f24c30da 100644 --- a/stdlib/source/documentation/lux/target/ruby.lux +++ b/stdlib/source/documentation/lux/target/ruby.lux @@ -62,8 +62,8 @@ ($.default /.array_range) ($.default /.array) ($.default /.hash) - ($.default /.apply/*) - ($.default /.apply_lambda/*) + ($.default /.apply) + ($.default /.apply_lambda) ($.default /.the) ($.default /.item) ($.default /.?) diff --git a/stdlib/source/documentation/lux/type.lux b/stdlib/source/documentation/lux/type.lux index 957dac26a..f7d1e3f64 100644 --- a/stdlib/source/documentation/lux/type.lux +++ b/stdlib/source/documentation/lux/type.lux @@ -13,7 +13,7 @@ [\\library ["[0]" /]] ["[0]" / "_" - ["[1][0]" abstract] + ["[1][0]" primitive] ["[1][0]" check] ["[1][0]" dynamic] ["[1][0]" implicit] @@ -186,7 +186,7 @@ ..by_example ..let ($.default /.equivalence)] - [/abstract.documentation + [/primitive.documentation /check.documentation /dynamic.documentation /implicit.documentation diff --git a/stdlib/source/documentation/lux/type/abstract.lux b/stdlib/source/documentation/lux/type/primitive.lux index 4fdf9e3fc..e4a180bfc 100644 --- a/stdlib/source/documentation/lux/type/abstract.lux +++ b/stdlib/source/documentation/lux/type/primitive.lux @@ -1,6 +1,6 @@ (.using [library - [lux {"-" pattern} + [lux "*" ["$" documentation {"+" documentation:}] [control ["<>" parser @@ -35,10 +35,10 @@ [/.representation Abstraction representation Representation] ) -(documentation: /.abstract: +(documentation: /.primitive: (format "Define abstract/nominal types which hide their representation details." \n "You can convert between the abstraction and its representation selectively to access the value, while hiding it from others.") - [(abstract: String + [(primitive: String Text (def: (string value) @@ -49,21 +49,21 @@ (-> String Text) (representation value)))] ["Type-parameters are optional." - (abstract: (Duplicate a) + (primitive: (Duplicate a) [a a] (def: (duplicate value) (All (_ a) (-> a (Duplicate a))) (abstraction [value value])))] ["Definitions can be nested." - (abstract: (Single a) + (primitive: (Single a) a (def: (single value) (All (_ a) (-> a (Single a))) (abstraction value)) - (abstract: (Double a) + (primitive: (Double a) [a a] (def: (double value) @@ -83,11 +83,11 @@ representation)))))] ["Type-parameters do not necessarily have to be used in the representation type." "If they are not used, they become phantom types and can be used to customize types without changing the representation." - (abstract: (JavaScript a) + (primitive: (JavaScript a) Text - (abstract: Expression Any) - (abstract: Statement Any) + (primitive: Expression Any) + (primitive: Statement Any) (def: (+ x y) (-> (JavaScript Expression) (JavaScript Expression) (JavaScript Expression)) @@ -103,11 +103,11 @@ (documentation: /.transmutation "Transmutes an abstract/nominal type's phantom types." - [(abstract: (JavaScript a) + [(primitive: (JavaScript a) Text - (abstract: Expression Any) - (abstract: Statement Any) + (primitive: Expression Any) + (primitive: Statement Any) (def: (statement expression) (-> (JavaScript Expression) (JavaScript Statement)) @@ -117,13 +117,6 @@ (-> (JavaScript Expression) (JavaScript Statement)) (transmutation JavaScript expression)))]) -(documentation: /.pattern - "Pattern-matching macro to easily extract a representation." - [(def: (computation abstraction) - (All (_ a) (-> (Abstract a) ???)) - (let [(pattern value) abstraction] - (foo (bar (baz value)))))]) - (.def: .public documentation (.List $.Module) ($.module /._ @@ -133,8 +126,7 @@ ..specific ..abstraction ..representation - ..abstract: + ..primitive: ..transmutation - ..pattern ($.default /.no_active_frames)] [])) diff --git a/stdlib/source/library/lux/ffi/export.rb.lux b/stdlib/source/library/lux/ffi/export.rb.lux index 017f40093..08f765b25 100644 --- a/stdlib/source/library/lux/ffi/export.rb.lux +++ b/stdlib/source/library/lux/ffi/export.rb.lux @@ -120,8 +120,8 @@ (/.return term)) _ - (/.statement (/.apply/* (list (/.string name) term) {.#None} - (/.manual "define_method")))))] + (/.statement (/.apply (list (/.string name) term) {.#None} + (/.manual "define_method")))))] _ (generation.execute! code) _ (generation.save! @self {.#None} code)] (generation.log! (%.format "Export " (%.text name)))))] diff --git a/stdlib/source/library/lux/macro/syntax.lux b/stdlib/source/library/lux/macro/syntax.lux index 9a2e566f0..2d092eaa6 100644 --- a/stdlib/source/library/lux/macro/syntax.lux +++ b/stdlib/source/library/lux/macro/syntax.lux @@ -1,7 +1,6 @@ (.using [library [lux "*" - ["[0]" macro {"+" with_symbols}] ["[0]" meta] [abstract ["[0]" monad {"+" do}]] @@ -20,7 +19,7 @@ ["[0]" int] ["[0]" rev] ["[0]" frac]]]]] - [// + ["[0]" // {"+" with_symbols} ["[0]" code]] ["[0]" / "_" ["[1][0]" export]]) @@ -44,17 +43,18 @@ {.#Item [[x y] pairs']} (partial_list x y (un_paired pairs')))) (def: syntax - (Parser [Code [Text (List Code)] Code]) + (Parser [Code [Text (Maybe Text) (List Code)] Code]) (/export.parser (all <>.and (</>.form (all <>.and </>.local + (<>.maybe </>.local) (</>.tuple (<>.some </>.any)))) </>.any))) (macro: .public (syntax: tokens) (case (</>.result ..syntax tokens) - {try.#Success [export_policy [name args] body]} + {try.#Success [export_policy [name g!state args] body]} (with_symbols [g!tokens g!body g!error] (do [! meta.monad] [vars+parsers (case (list.pairs args) @@ -78,9 +78,14 @@ _ (meta.failure "Syntax pattern expects pairs of bindings and code-parsers.")) + g!state (case g!state + {.#Some g!state} + (in (code.local g!state)) + + {.#None} + (//.symbol "g!state")) this_module meta.current_module_name - .let [g!state (code.symbol ["" "*lux*"]) - error_msg (code.text (macro.wrong_syntax_error [this_module name]))]] + .let [error_msg (code.text (//.wrong_syntax_error [this_module name]))]] (in (list (` (.macro: (~ export_policy) ((~ (code.symbol ["" name])) (~ g!tokens) (~ g!state)) (.case ((~! </>.result) (is ((~! </>.Parser) (Meta (List Code))) @@ -95,4 +100,4 @@ {try.#Failure ((~! text.interposed) (~! text.new_line) (list (~ error_msg) (~ g!error)))}))))))) {try.#Failure error} - (meta.failure (macro.wrong_syntax_error (symbol ..syntax:))))) + (meta.failure (//.wrong_syntax_error (symbol ..syntax:))))) diff --git a/stdlib/source/library/lux/target/js.lux b/stdlib/source/library/lux/target/js.lux index c0c178bc1..45d84ba99 100644 --- a/stdlib/source/library/lux/target/js.lux +++ b/stdlib/source/library/lux/target/js.lux @@ -139,7 +139,7 @@ (-> Text Expression Access) (abstraction (format (representation object) "." field))) - (def: .public (apply_* function inputs) + (def: .public (apply function inputs) (-> Expression (List Expression) Computation) (|> inputs (list#each ..code) @@ -150,7 +150,7 @@ (def: .public (do method inputs object) (-> Text (List Expression) Expression Computation) - (apply_* (..the method object) inputs)) + (apply (..the method object) inputs)) (def: .public object (-> (List [Text Expression]) Computation) @@ -428,7 +428,7 @@ [(`` (def: .public (<apply> function) (-> Expression (~~ (template.spliced <type>+)) Computation) (.function (_ (~~ (template.spliced <arg>+))) - (..apply_* function (list (~~ (template.spliced <arg>+))))))) + (..apply function (list (~~ (template.spliced <arg>+))))))) (`` (template [<definition> <function>] [(def: .public <definition> (<apply> (..var <function>)))] diff --git a/stdlib/source/library/lux/target/php.lux b/stdlib/source/library/lux/target/php.lux index 5a8d6faf2..ea33a351b 100644 --- a/stdlib/source/library/lux/target/php.lux +++ b/stdlib/source/library/lux/target/php.lux @@ -190,15 +190,15 @@ (-> (List Expression) Text) (|>> (list#each ..code) (text.interposed ..input_separator) ..group)) - (def: .public (apply/* args func) + (def: .public (apply args func) (-> (List Expression) Expression Computation) (|> (format (representation func) (..arguments args)) abstraction)) ... TODO: Remove when no longer using JPHP. - (def: .public (apply/*' args func) + (def: .public (apply' args func) (-> (List Expression) Expression Computation) - (apply/* (partial_list func args) (..constant "call_user_func"))) + (apply (partial_list func args) (..constant "call_user_func"))) (def: parameters (-> (List Argument) Text) @@ -249,7 +249,7 @@ <definitions> (template.spliced <function>+)] (def: .public (<apply> function [<inputs>]) (-> Expression [<types>] Computation) - (..apply/* (.list <inputs>) function)) + (..apply (.list <inputs>) function)) (template [<function>] [(`` (def: .public (~~ (template.symbol [<function> "/" <arity>])) @@ -322,7 +322,7 @@ (def: .public (array_merge/+ required optionals) (-> Expression (List Expression) Computation) - (..apply/* (partial_list required optionals) (..constant "array_merge"))) + (..apply (partial_list required optionals) (..constant "array_merge"))) (def: .public (array/** kvs) (-> (List [Expression Expression]) Literal) diff --git a/stdlib/source/library/lux/target/python.lux b/stdlib/source/library/lux/target/python.lux index 8ab7a88ec..10045f1ea 100644 --- a/stdlib/source/library/lux/target/python.lux +++ b/stdlib/source/library/lux/target/python.lux @@ -228,7 +228,7 @@ (-> (List [(Expression Any) (Expression Any)]) (Computation Any)) (composite_literal "{" "}" (.function (_ [k v]) (format (representation k) " : " (representation v))))) - (def: .public (apply/* args func) + (def: .public (apply args func) (-> (List (Expression Any)) (Expression Any) (Computation Any)) (<| abstraction ... ..expression @@ -256,7 +256,7 @@ (-> Text (List (Expression Any)) (Expression Any) (Computation Any)) (|> object (..the method) - (..apply/* args))) + (..apply args))) (def: .public (item idx array) (-> (Expression Any) (Expression Any) Access) @@ -467,7 +467,7 @@ (template [<function>] [(`` (def: .public ((~~ (template.symbol [<function> "/" <arity>])) <inputs>) (-> (~~ (arity_types <arity>)) (Computation Any)) - (..apply/* (.list <inputs>) (..var <function>))))] + (..apply (.list <inputs>) (..var <function>))))] <definitions>))] diff --git a/stdlib/source/library/lux/target/ruby.lux b/stdlib/source/library/lux/target/ruby.lux index 972628596..3bcf32d02 100644 --- a/stdlib/source/library/lux/target/ruby.lux +++ b/stdlib/source/library/lux/target/ruby.lux @@ -241,7 +241,7 @@ (..nested (representation (.the #body it)))) (text.enclosed ["{" "}"]))) - (def: .public (apply/* arguments block func) + (def: .public (apply arguments block func) (-> (List Expression) (Maybe Block) Expression Computation) (let [arguments (|> arguments (list#each (|>> representation)) @@ -451,7 +451,7 @@ [(`` (def: .public ((~~ (template.symbol [<name> "/*"])) attributes) (-> (List Text) Statement) (..statement - (..apply/* (list#each ..string attributes) {.#None} (..manual <name>)))))] + (..apply (list#each ..string attributes) {.#None} (..manual <name>)))))] ["attr_reader"] ["attr_writer"] @@ -460,7 +460,7 @@ (def: .public (do method arguments block object) (-> Text (List Expression) (Maybe Block) Expression Computation) - (|> object (..the method) (..apply/* arguments block))) + (|> object (..the method) (..apply arguments block))) (def: .public new (-> (List Expression) (Maybe Block) Expression Computation) @@ -476,7 +476,7 @@ (|> (..manual "Module") (..new (list) {.#Some definition}))) -(def: .public (apply_lambda/* args lambda) +(def: .public (apply_lambda args lambda) (-> (List Expression) Expression Computation) (|> lambda (..do "call" args {.#None}))) @@ -499,7 +499,7 @@ (template [<function>] [(`` (def: .public ((~~ (template.symbol [<function> "/" <arity>])) <inputs>) (-> <types> Computation) - (..apply/* (.list <inputs>) {.#None} (..manual <function>))))] + (..apply (.list <inputs>) {.#None} (..manual <function>))))] <definitions>))] @@ -520,11 +520,11 @@ (def: .public (throw/1 error) (-> Expression Statement) - (..statement (..apply/* (list error) {.#None} (..manual "throw")))) + (..statement (..apply (list error) {.#None} (..manual "throw")))) (def: .public (throw/2 tag value) (-> Expression Expression Statement) - (..statement (..apply/* (list tag value) {.#None} (..manual "throw")))) + (..statement (..apply (list tag value) {.#None} (..manual "throw")))) (def: .public (class_variable_set var value object) (-> SVar Expression Expression Computation) diff --git a/stdlib/source/library/lux/target/scheme.lux b/stdlib/source/library/lux/target/scheme.lux index d7b97bd0b..5a174b9db 100644 --- a/stdlib/source/library/lux/target/scheme.lux +++ b/stdlib/source/library/lux/target/scheme.lux @@ -174,14 +174,14 @@ (text.enclosed ["(" ")"]) abstraction))))) - (def: .public (apply/* args func) + (def: .public (apply args func) (-> (List Expression) Expression Computation) (..form {.#Item func args})) (template [<name> <function>] [(def: .public (<name> members) (-> (List Expression) Computation) - (..apply/* members (..var <function>)))] + (..apply members (..var <function>)))] [vector/* "vector"] [list/* "list"] @@ -189,7 +189,7 @@ (def: .public apply/0 (-> Expression Computation) - (..apply/* (list))) + (..apply (list))) (template [<lux_name> <scheme_name>] [(def: .public <lux_name> @@ -202,7 +202,7 @@ [(`` (def: .public (<apply> procedure) (-> Expression (~~ (template.spliced <type>+)) Computation) (function (_ (~~ (template.spliced <arg>+))) - (..apply/* (list (~~ (template.spliced <arg>+))) procedure)))) + (..apply (list (~~ (template.spliced <arg>+))) procedure)))) (`` (template [<definition> <function>] [(def: .public <definition> (<apply> (..var <function>)))] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/common.lux index 1c4b6e9d3..0a4a86df5 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/common.lux @@ -52,7 +52,7 @@ (/////.except extension.invalid_syntax [extension_name %synthesis input])))) (template: (!unary function) - (|>> list _.apply/* (|> (_.constant function)))) + (|>> list _.apply (|> (_.constant function)))) ... ... TODO: Get rid of this ASAP ... (def: lux::syntax_char_case! diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux index a85bc1fb6..c935634c7 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux @@ -67,7 +67,7 @@ (def: f64//decode (Unary Expression) (|>> list - (_.apply_* (_.var "parseFloat")) + (_.apply (_.var "parseFloat")) _.return (_.closure (list)) //runtime.lux//try)) @@ -76,7 +76,7 @@ (Unary Expression) (|>> //runtime.i64##number (list) - (_.apply_* (_.var "String.fromCharCode")))) + (_.apply (_.var "String.fromCharCode")))) ... [[Text]] (def: (text//concat [leftG rightG]) @@ -167,7 +167,7 @@ (in [(list#each (|>> .int _.int) chars) branch!]))) conditionals))] - ... (in (_.apply_* (_.closure (list) + ... (in (_.apply (_.closure (list) ... (_.switch (_.the //runtime.i64_low_field inputG) ... conditionals! ... {.#Some (_.return else!)})) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux index 783dde8e3..055fec9ee 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux @@ -124,7 +124,7 @@ (do [! ////////phase.monad] [abstractionG (phase archive abstractionS) inputsG (monad.each ! (phase archive) inputsS)] - (in (_.apply_* abstractionG inputsG))))])) + (in (_.apply abstractionG inputsG))))])) (def: js::function (custom @@ -143,7 +143,7 @@ (_.define g!abstraction abstractionG) (_.return (case (.nat arity) 0 (_.apply_1 g!abstraction //runtime.unit) - 1 (_.apply_* g!abstraction g!inputs) + 1 (_.apply g!abstraction g!inputs) _ (_.apply_1 g!abstraction (_.array g!inputs)))))))))])) (def: .public bundle diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/common.lux index e592ebd5c..82eb02ee5 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/common.lux @@ -52,7 +52,7 @@ (/////.except extension.invalid_syntax [extension_name %synthesis input])))) (template: (!unary function) - (|>> list _.apply/* (|> (_.constant function)))) + (|>> list _.apply (|> (_.constant function)))) ... TODO: Get rid of this ASAP (def: lux::syntax_char_case! @@ -95,7 +95,7 @@ conditionalsG))] _ (generation.execute! directive) _ (generation.save! context_artifact directive)] - (in (_.apply/* (partial_list inputG foreigns) @expression))))])) + (in (_.apply (partial_list inputG foreigns) @expression))))])) (def: lux_procs Bundle diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/host.lux index 2e257bcfc..b4be6893f 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/host.lux @@ -118,7 +118,7 @@ (do [! ////////phase.monad] [abstractionG (phase archive abstractionS) inputsG (monad.each ! (phase archive) inputsS)] - (in (_.apply/* inputsG abstractionG))))])) + (in (_.apply inputsG abstractionG))))])) (def: php::pack (custom diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux index 9de656cd2..89092a241 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux @@ -146,7 +146,7 @@ ... _ (generation.execute! closure) ... _ (generation.save! (product.right artifact_id) {.#None} closure) ] - ... (in (_.apply/* @closure dependencies)) + ... (in (_.apply @closure dependencies)) (in (<| (as (Expression Any)) (is (Statement Any)) (all _.then diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/host.lux index 766979aa0..2b06a7946 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/host.lux @@ -115,7 +115,7 @@ (function (_ extension phase archive module) (do ////////phase.monad [] - (in (_.apply/* (list (_.string module)) (_.var "__import__")))))])) + (in (_.apply (list (_.string module)) (_.var "__import__")))))])) (def: python::apply (custom @@ -124,7 +124,7 @@ (do [! ////////phase.monad] [abstractionG (phase archive abstractionS) inputsG (monad.each ! (phase archive) inputsS)] - (in (_.apply/* inputsG abstractionG))))])) + (in (_.apply inputsG abstractionG))))])) (def: python::function (custom @@ -139,9 +139,9 @@ (list.repeated (.nat arity) []))] (in (_.lambda g!inputs (case (.nat arity) - 0 (_.apply/* (list //runtime.unit) abstractionG) - 1 (_.apply/* g!inputs abstractionG) - _ (_.apply/* (list (_.list g!inputs)) abstractionG))))))])) + 0 (_.apply (list //runtime.unit) abstractionG) + 1 (_.apply g!inputs abstractionG) + _ (_.apply (list (_.list g!inputs)) abstractionG))))))])) (def: python::exec (custom diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/common.lux index 5b6428fa8..eba2036c4 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/common.lux @@ -52,7 +52,7 @@ (/////.except extension.invalid_syntax [extension_name %synthesis input])))) ... (template: (!unary function) -... (|>> list _.apply/* (|> (_.constant function)))) +... (|>> list _.apply (|> (_.constant function)))) ... ... ... TODO: Get rid of this ASAP ... ... (def: lux::syntax_char_case! diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux index 2a838bef9..bec0ecdc2 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux @@ -132,7 +132,7 @@ ... (_.return else!) ... conditionals!))] ] - ... (in (_.apply_lambda/* (list inputG) closure)) + ... (in (_.apply_lambda (list inputG) closure)) (in (<| (as Expression) (is Statement) (all _.then diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/host.lux index 2c6013cf1..a5f389ec9 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/host.lux @@ -113,7 +113,7 @@ (do [! ////////phase.monad] [abstractionG (phase archive abstractionS) inputsG (monad.each ! (phase archive) inputsS)] - (in (_.apply/* inputsG {.#None} abstractionG))))])) + (in (_.apply inputsG {.#None} abstractionG))))])) (def: ruby::import (custom diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/common.lux index 144415363..4a1218b26 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/common.lux @@ -52,7 +52,7 @@ (/////.except extension.invalid_syntax [extension_name %synthesis input])))) (template: (!unary function) - (|>> list _.apply/* (|> (_.constant function)))) + (|>> list _.apply (|> (_.constant function)))) ... TODO: Get rid of this ASAP (def: lux::syntax_char_case! diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/host.lux index 6b53f712f..aedc15c3f 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/host.lux @@ -94,7 +94,7 @@ (do [! ////////phase.monad] [abstractionG (phase archive abstractionS) inputsG (monad.each ! (phase archive) inputsS)] - (in (_.apply/* inputsG abstractionG))))])) + (in (_.apply inputsG abstractionG))))])) (def: .public bundle Bundle diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux index 515518eb7..de443a7c7 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux @@ -63,9 +63,9 @@ [valueO (expression archive valueS) bodyO (expression archive bodyS)] ... TODO: Find some way to do 'let' without paying the price of the closure. - (in (_.apply_* (_.closure (list (..register register)) - (_.return bodyO)) - (list valueO))))) + (in (_.apply (_.closure (list (..register register)) + (_.return bodyO)) + (list valueO))))) (def: .public (let! statement expression archive [valueS register bodyS]) (Generator! [Synthesis Register Synthesis]) @@ -342,4 +342,4 @@ (-> Phase! (Generator [Synthesis Path])) (do ///////phase.monad [pattern_matching! (..case! statement expression archive [valueS pathP])] - (in (_.apply_* (_.closure (list) pattern_matching!) (list))))) + (in (_.apply (_.closure (list) pattern_matching!) (list))))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux index 4f3b402f6..15c0a984a 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux @@ -38,7 +38,7 @@ (do [! ///////phase.monad] [functionO (expression archive functionS) argsO+ (monad.each ! (expression archive) argsS+)] - (in (_.apply_* functionO argsO+)))) + (in (_.apply functionO argsO+)))) (def: capture (-> Register Var) @@ -56,7 +56,7 @@ (|> (list.enumeration inits) (list#each (|>> product.left ..capture))) (_.return (_.function @self (list) body!))) - (_.apply_* @self inits)])) + (_.apply @self inits)])) (def: @curried (_.var "curried")) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/loop.lux index 8d92a81dd..62da60326 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/loop.lux @@ -93,7 +93,7 @@ _ (do [! ///////phase.monad] [loop! (scope! statement expression archive [start initsS+ bodyS])] - (in (_.apply_* (_.closure (list) loop!) (list)))))) + (in (_.apply (_.closure (list) loop!) (list)))))) (def: @temp (_.var "lux_again_values")) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux index 57f34fed4..13f2a82e0 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux @@ -118,7 +118,7 @@ inputs_typesC (list#each (function.constant (` _.Expression)) inputs)] (in (list (` (def: .public ((~ g!name) (~+ inputsC)) (-> (~+ inputs_typesC) Computation) - (_.apply_* (~ runtime_name) (list (~+ inputsC))))) + (_.apply (~ runtime_name) (list (~+ inputsC))))) (` (def: (~ (code.local (format "@" name))) Statement diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/case.lux index 1d2c9aea8..c950b555c 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/case.lux @@ -293,4 +293,4 @@ directive (_.define_function @case (list#each _.parameter @dependencies+) case!)] _ (/////generation.execute! directive) _ (/////generation.save! case_artifact directive)] - (in (_.apply/* @dependencies+ @case)))) + (in (_.apply @dependencies+ @case)))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/function.lux index dfbc53fd3..e9cc9f517 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/function.lux @@ -34,7 +34,7 @@ (do [! ///////phase.monad] [functionG (expression archive functionS) argsG+ (monad.each ! (expression archive) argsS+)] - (in (_.apply/*' argsG+ functionG)))) + (in (_.apply' argsG+ functionG)))) (def: capture (-> Register Var) @@ -65,7 +65,7 @@ (list) body!)) (_.return @selfL)))) - (_.apply/* inits @selfG)]))) + (_.apply inits @selfG)]))) (def: .public (function statement expression archive [environment arity bodyS]) (-> Phase! (Generator (Abstraction Synthesis))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/loop.lux index fb76fdea7..3c12092c7 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/loop.lux @@ -100,10 +100,10 @@ foreigns [(<| (_.define_function @loop (list#each _.parameter foreigns)) (_.return (_.closure (list#each _.parameter foreigns) (list) scope!))) - (_.apply/* foreigns @loop)]))] + (_.apply foreigns @loop)]))] _ (/////generation.execute! directive) _ (/////generation.save! loop_artifact directive)] - (in (_.apply/* (list) instantiation))))) + (in (_.apply (list) instantiation))))) ... TODO: Stop using a constant hard-coded variable. Generate a new one each time. (def: @temp diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux index dfa7afe2f..d8885e026 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux @@ -116,7 +116,7 @@ inputs)] (in (list (` (def: .public ((~ g!name) (~+ inputsC)) (-> (~+ inputs_typesC) Computation) - (_.apply/* (list (~+ inputsC)) (~ runtime_name)))) + (_.apply (list (~+ inputsC)) (~ runtime_name)))) (` (def: (~ (code.local (format "@" name))) Statement diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux index 0479e132e..19d8dd56d 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux @@ -60,9 +60,9 @@ [valueO (expression archive valueS) bodyO (expression archive bodyS)] ... TODO: Find some way to do 'let' without paying the price of the closure. - (in (_.apply/* (list valueO) - (_.lambda (list (..register register)) - bodyO))))) + (in (_.apply (list valueO) + (_.lambda (list (..register register)) + bodyO))))) (def: .public (let! statement expression archive [valueS register bodyS]) (Generator! [Synthesis Register Synthesis]) @@ -358,4 +358,4 @@ pattern_matching!)] _ (/////generation.execute! directive) _ (/////generation.save! case_artifact {.#None} directive)] - (in (_.apply/* @dependencies+ @case)))) + (in (_.apply @dependencies+ @case)))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/function.lux index 077cdf100..4f959f01c 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/function.lux @@ -39,7 +39,7 @@ (do [! ///////phase.monad] [functionO (expression archive functionS) argsO+ (monad.each ! (expression archive) argsS+)] - (in (_.apply/* argsO+ functionO)))) + (in (_.apply argsO+ functionO)))) (def: .public capture (-> Register SVar) @@ -64,7 +64,7 @@ (_.return @function)))] _ (/////generation.execute! directive) _ (/////generation.save! function_id {.#None} directive)] - (in (_.apply/* inits @function))))) + (in (_.apply inits @function))))) (def: input (|>> ++ //case.register)) @@ -82,7 +82,7 @@ @num_args (_.var "num_args") @self (_.var (///reference.artifact [function_module function_artifact])) apply_poly (.function (_ args func) - (_.apply/* (list (_.splat_poly args)) func)) + (_.apply (list (_.splat_poly args)) func)) initialize_self! (_.set (list (//case.register 0)) @self) initialize! (list#mix (.function (_ post pre!) (all _.then diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/loop.lux index 951fcbb18..12f34891b 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/loop.lux @@ -105,10 +105,10 @@ actual_loop (_.return @loop) )) - (_.apply/* foreigns @loop)]))] + (_.apply foreigns @loop)]))] _ (/////generation.execute! directive) _ (/////generation.save! loop_artifact {.#None} directive)] - (in (_.apply/* initsO+ instantiation))))) + (in (_.apply initsO+ instantiation))))) (def: .public (again! statement expression archive argsS+) (Generator! (List Synthesis)) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux index 1dd017309..ae9c18e2e 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux @@ -148,7 +148,7 @@ inputs)] (in (list (` (def: .public ((~ nameC) (~+ inputsC)) (-> (~+ inputs_typesC) (Computation Any)) - (_.apply/* (list (~+ inputsC)) (~ runtime_nameC)))) + (_.apply (list (~+ inputsC)) (~ runtime_nameC)))) (` (def: (~ code_nameC) (Statement Any) (..feature (~ runtime_nameC) @@ -159,7 +159,7 @@ (runtime: (lux::try op) (with_vars [exception] - (_.try (_.return (..right (_.apply/* (list ..unit) op))) + (_.try (_.return (..right (_.apply (list ..unit) op))) (list [(list "Exception") exception (_.return (..left (_.str/1 exception)))])))) @@ -167,7 +167,7 @@ (with_vars [inputs value] (all _.then (_.set (list inputs) ..none) - (<| (_.for_in value (_.apply/* (list program_args) (_.var "reversed"))) + (<| (_.for_in value (_.apply (list program_args) (_.var "reversed"))) (_.set (list inputs) (..some (_.list (list value inputs))))) (_.return inputs)))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/case.lux index 677f622b1..260ca2b06 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/case.lux @@ -79,7 +79,7 @@ (in (|> bodyO _.return [(list (..register register))] (_.lambda {.#None}) - (_.apply_lambda/* (list valueO)))))) + (_.apply_lambda (list valueO)))))) (def: .public (let! statement expression archive [valueS register bodyS]) (Generator! [Synthesis Register Synthesis]) @@ -380,4 +380,4 @@ (case! true statement expression archive) (# ///////phase.monad each (|>> [(list)] (_.lambda {.#None}) - (_.apply_lambda/* (list)))))) + (_.apply_lambda (list)))))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/function.lux index 45e8363c3..b8e44b9e9 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/function.lux @@ -37,7 +37,7 @@ (do [! ///////phase.monad] [functionO (expression archive functionS) argsO+ (monad.each ! (expression archive) argsS+)] - (in (_.apply_lambda/* argsO+ functionO)))) + (in (_.apply_lambda argsO+ functionO)))) (def: .public capture (-> Register LVar) @@ -59,7 +59,7 @@ (all _.then (_.set (list @self) function_definition) (_.return @self)))])) - (_.apply_lambda/* inits @self)]))) + (_.apply_lambda inits @self)]))) (def: input (|>> ++ //case.register)) @@ -106,16 +106,16 @@ arity_args (_.splat (slice (_.int +0) limitO)) output_func_args (_.splat (slice arityO @num_args))] (_.return (|> @self - (_.apply_lambda/* (list arity_args)) - (_.apply_lambda/* (list output_func_args)))))) + (_.apply_lambda (list arity_args)) + (_.apply_lambda (list output_func_args)))))) ... (|> @num_args (_.< arityO)) (let [@missing (_.local "missing")] (_.return (_.lambda {.#None} [(list (_.variadic @missing)) (_.return (|> @self - (_.apply_lambda/* (list (_.splat (|> (_.array (list)) - (_.do "concat" (list @curried) {.#None}) - (_.do "concat" (list @missing) {.#None})))))))])))) + (_.apply_lambda (list (_.splat (|> (_.array (list)) + (_.do "concat" (list @curried) {.#None}) + (_.do "concat" (list @missing) {.#None})))))))])))) )]))] _ (/////generation.execute! declaration) _ (/////generation.save! function_artifact {.#None} declaration)] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux index 08ebeaf0e..e112b7817 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux @@ -77,7 +77,7 @@ [body! (scope! statement expression archive [start initsS+ bodyS])] (in (|> body! [(list)] (_.lambda {.#None}) - (_.apply_lambda/* (list))))))) + (_.apply_lambda (list))))))) (def: .public (again! statement expression archive argsS+) (Generator! (List Synthesis)) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux index 2d7a0d116..f7f217580 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux @@ -136,8 +136,8 @@ inputs)] (in (list (` (def: .public ((~ g!name) (~+ inputsC)) (-> (~+ inputs_typesC) Computation) - (_.apply/* (list (~+ inputsC)) {.#None} - (~ runtime_name)))) + (_.apply (list (~+ inputsC)) {.#None} + (~ runtime_name)))) (` (def: (~ (code.local (format "@" name))) Statement @@ -253,7 +253,7 @@ (runtime: (lux//try risky) (with_vars [error value] (_.begin (all _.then - (_.set (list value) (_.apply_lambda/* (list ..unit) risky)) + (_.set (list value) (_.apply_lambda (list ..unit) risky)) (_.return (..right value))) (list [(list) error (_.return (..left (_.the "message" error)))])))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/function.lux index 9ff5b8f94..04560a891 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/function.lux @@ -34,7 +34,7 @@ (do [! ///////phase.monad] [functionO (expression archive functionS) argsO+ (monad.each ! (expression archive) argsS+)] - (in (_.apply/* argsO+ functionO)))) + (in (_.apply argsO+ functionO)))) (def: capture (-> Register Var) @@ -52,7 +52,7 @@ (_.lambda [(|> (list.enumeration inits) (list#each (|>> product.left ..capture))) {.#None}]) - (_.apply/* inits))))) + (_.apply inits))))) (def: @curried (_.var "curried")) (def: @missing (_.var "missing")) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/loop.lux index b42af50f0..519d52e1a 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/loop.lux @@ -1,37 +1,37 @@ (.using - [library - [lux {"-" Scope} - [abstract - ["[0]" monad {"+" do}]] - [data - ["[0]" product] - ["[0]" text - ["%" format {"+" format}]] - [collection - ["[0]" list ("[1]#[0]" functor)] - ["[0]" set {"+" Set}]]] - [math - [number - ["n" nat]]] - [target - ["_" scheme]]]] - ["[0]" // "_" - [runtime {"+" Operation Phase Generator}] - ["[1][0]" case] + [library + [lux {"-" Scope} + [abstract + ["[0]" monad {"+" do}]] + [data + ["[0]" product] + ["[0]" text + ["%" format {"+" format}]] + [collection + ["[0]" list ("[1]#[0]" functor)] + ["[0]" set {"+" Set}]]] + [math + [number + ["n" nat]]] + [target + ["_" scheme]]]] + ["[0]" // "_" + [runtime {"+" Operation Phase Generator}] + ["[1][0]" case] + ["/[1]" // "_" + ["[1][0]" reference] ["/[1]" // "_" - ["[1][0]" reference] + [synthesis + ["[0]" case]] ["/[1]" // "_" - [synthesis - ["[0]" case]] - ["/[1]" // "_" - ["[0]"synthesis {"+" Scope Synthesis}] - ["[1][0]" generation] - ["//[1]" /// "_" - ["[1][0]" phase] - [meta - [archive {"+" Archive}]] - [reference - [variable {"+" Register}]]]]]]]) + ["[0]"synthesis {"+" Scope Synthesis}] + ["[1][0]" generation] + ["//[1]" /// "_" + ["[1][0]" phase] + [meta + [archive {"+" Archive}]] + [reference + [variable {"+" Register}]]]]]]]) (def: @scope (_.var "scope")) @@ -54,11 +54,11 @@ (list#each (|>> product.left (n.+ start) //case.register))) {.#None}] bodyO)]) - (_.apply/* initsO+ @scope)))))) + (_.apply initsO+ @scope)))))) (def: .public (again expression archive argsS+) (Generator (List Synthesis)) (do [! ///////phase.monad] [@scope /////generation.anchor argsO+ (monad.each ! (expression archive) argsS+)] - (in (_.apply/* argsO+ @scope)))) + (in (_.apply argsO+ @scope)))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux index 143ff325f..dae1bb729 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux @@ -97,7 +97,7 @@ inputs)] (in (list (` (def: .public ((~ g!name) (~+ inputsC)) (-> (~+ inputs_typesC) _.Computation) - (_.apply/* (list (~+ inputsC)) (~ runtime_name)))) + (_.apply (list (~+ inputsC)) (~ runtime_name)))) (` (def: (~ (code.local (format "@" name))) _.Computation @@ -217,7 +217,7 @@ (_.lambda [(list error) {.#None}] (..left error)) (_.lambda [(list) {.#None}] - (..right (_.apply/* (list ..unit) op)))))) + (..right (_.apply (list ..unit) op)))))) (runtime: (lux//program_args program_args) (with_vars [@loop @input @output] diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux index 4791eec38..71eee1347 100644 --- a/stdlib/source/program/aedifex/command/build.lux +++ b/stdlib/source/program/aedifex/command/build.lux @@ -272,7 +272,7 @@ _ (revised ///runtime.#parameters (|>> (partial_list "-cp" (..jvm_class_path host_dependencies) - "-Xss32m" + "-Xss16m" "--add-opens" "java.base/java.lang=ALL-UNNAMED")) runtime))) diff --git a/stdlib/source/program/aedifex/runtime.lux b/stdlib/source/program/aedifex/runtime.lux index 9657affdc..7ba5e8f9b 100644 --- a/stdlib/source/program/aedifex/runtime.lux +++ b/stdlib/source/program/aedifex/runtime.lux @@ -36,11 +36,12 @@ #program <command> #parameters (`` (list (~~ (template.spliced <parameters>))))])] - [default_java "java" [] ["-Xss32m" "--add-opens" "java.base/java.lang=ALL-UNNAMED" "-jar"]] + [default_java "java" [] ["-Xss16m" "--add-opens" "java.base/java.lang=ALL-UNNAMED" "-jar"]] [default_js "node" [] ["--stack_size=8192"]] [default_python "python3" [] []] [default_lua "lua" [] []] - [default_ruby "ruby" [["RUBY_THREAD_VM_STACK_SIZE" "15700000"]] []] + ... 2^23 + [default_ruby "ruby" [["RUBY_THREAD_VM_STACK_SIZE" "8388608"]] []] ) (def: .public (for runtime path) 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 <code>.local + (these (syntax: (for_bindings|test lux_state + [fn/0 <code>.local var/0 <code>.local let/0 <code>.local @@ -1130,7 +1131,7 @@ let/2 <code>.local let/3 <code>.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 <code>.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 [<js> <lux>] [(expression (|>> (as Frac) f.int (i.= (<lux> int/0))) - (/.apply_* (/.closure (list $foreign) - (all /.then - (/.statement (<js> $foreign)) - (/.return $foreign))) - (list (/.int int/0)))) + (/.apply (/.closure (list $foreign) + (all /.then + (/.statement (<js> $foreign)) + (/.return $foreign))) + (list (/.int int/0)))) (expression (|>> (as Frac) f.int (i.= (<lux> int/0))) (let [@ (/.at (/.int +0) $foreign)] - (/.apply_* (/.closure (list $foreign) - (all /.then - (/.set $foreign (/.array (list $foreign))) - (/.statement (<js> @)) - (/.return @))) - (list (/.int int/0))))) + (/.apply (/.closure (list $foreign) + (all /.then + (/.set $foreign (/.array (list $foreign))) + (/.statement (<js> @)) + (/.return @))) + (list (/.int int/0))))) (expression (|>> (as Frac) f.int (i.= (<lux> int/0))) (let [@ (/.the field $foreign)] - (/.apply_* (/.closure (list $foreign) - (all /.then - (/.set $foreign (/.object (list [field $foreign]))) - (/.statement (<js> @)) - (/.return @))) - (list (/.int int/0)))))] + (/.apply (/.closure (list $foreign) + (all /.then + (/.set $foreign (/.object (list [field $foreign]))) + (/.statement (<js> @)) + (/.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 |