diff options
| author | Eduardo Julian | 2022-07-02 05:38:27 -0400 |
|---|---|---|
| committer | Eduardo Julian | 2022-07-02 05:38:27 -0400 |
| commit | b96beb587c11fcfbce86ce2d62351600cf6cad1b (patch) | |
| tree | c9a558ab1391ac97cb11e8777ea78299f1ab5555 /stdlib/source/test | |
| parent | 104130efba46a875eba566384578f8aa8593ad37 (diff) | |
More traditional names for unquoting macros.
Diffstat (limited to '')
88 files changed, 505 insertions, 504 deletions
diff --git a/stdlib/source/test/aedifex/artifact/extension.lux b/stdlib/source/test/aedifex/artifact/extension.lux index bf2127d23..7024ed43b 100644 --- a/stdlib/source/test/aedifex/artifact/extension.lux +++ b/stdlib/source/test/aedifex/artifact/extension.lux @@ -30,7 +30,7 @@ (n.= (list.size options) (set.size uniques)))) (_.coverage [/.extension /.type] - (`` (and (~~ (with_template [<type> <extension>] + (`` (and (,, (with_template [<type> <extension>] [(and (text#= <extension> (/.extension <type>)) (text#= <type> diff --git a/stdlib/source/test/aedifex/command/build.lux b/stdlib/source/test/aedifex/command/build.lux index 5aedb67a9..7ae2a8c72 100644 --- a/stdlib/source/test/aedifex/command/build.lux +++ b/stdlib/source/test/aedifex/command/build.lux @@ -115,7 +115,7 @@ ///dependency.#type ///artifact/type.js_library]]] (`` (all random.either (in js_compiler) - (~~ (with_template [<compiler>] + (,, (with_template [<compiler>] [(in [///dependency.#artifact [///artifact.#group /.lux_group ///artifact.#name <compiler> ///artifact.#version lux_version] @@ -219,7 +219,7 @@ expected/1 (random.alphabetic 5) expected/2 (random.alphabetic 5)] (`` (all _.and - (~~ (with_template [<error?> <log!>] + (,, (with_template [<error?> <log!>] [(let [console (@version.echo "") shell (|> (list expected/0 expected/1 expected/2) (..reader_shell <error?>) diff --git a/stdlib/source/test/aedifex/dependency/resolution.lux b/stdlib/source/test/aedifex/dependency/resolution.lux index 1507398b6..e724392a5 100644 --- a/stdlib/source/test/aedifex/dependency/resolution.lux +++ b/stdlib/source/test/aedifex/dependency/resolution.lux @@ -271,7 +271,7 @@ {try.#Failure _} false)))) - (~~ (with_template [<exception> <bad>] + (,, (with_template [<exception> <bad>] [(in (do async.monad [actual_package (/.one (///repository.mock <bad> []) [///dependency.#artifact expected_artifact diff --git a/stdlib/source/test/aedifex/hash.lux b/stdlib/source/test/aedifex/hash.lux index 1d8569413..0bce4febc 100644 --- a/stdlib/source/test/aedifex/hash.lux +++ b/stdlib/source/test/aedifex/hash.lux @@ -45,7 +45,7 @@ )) (_.for [/.data] (all _.and - (~~ (with_template [<hash> <constructor> <exception>] + (,, (with_template [<hash> <constructor> <exception>] [(do random.monad [expected (..random <hash>)] (_.coverage [<hash> <constructor> <exception>] @@ -67,7 +67,7 @@ [/.sha-1 /.as_sha-1 /.not_a_sha-1] [/.md5 /.as_md5 /.not_a_md5] )))) - (~~ (with_template [<codec> <hash>] + (,, (with_template [<codec> <hash>] [(_.for [<codec>] ($codec.spec /.equivalence <codec> (..random <hash>)))] @@ -76,7 +76,7 @@ )) (_.for [/.not_a_hash] (all _.and - (~~ (with_template [<codec> <hash>] + (,, (with_template [<codec> <hash>] [(do random.monad [expected (..random <hash>)] (_.coverage [<codec>] diff --git a/stdlib/source/test/aedifex/runtime.lux b/stdlib/source/test/aedifex/runtime.lux index 25471077d..2a10e763e 100644 --- a/stdlib/source/test/aedifex/runtime.lux +++ b/stdlib/source/test/aedifex/runtime.lux @@ -41,7 +41,7 @@ (_.for [/.equivalence] ($equivalence.spec /.equivalence ..random)) - (~~ (with_template [<command>] + (,, (with_template [<command>] [(_.coverage [/.default_java /.default_js /.default_python /.default_lua /.default_ruby] (let [listing (|> (list /.default_java /.default_js /.default_python /.default_lua /.default_ruby) (list#each (the /.#program))) diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux index a7cb9cfa9..1e997b2cf 100644 --- a/stdlib/source/test/lux.lux +++ b/stdlib/source/test/lux.lux @@ -63,13 +63,13 @@ ["[1][0]" ffi] ["[1][0]" extension] ["[1][0]" target (.only) - (.~~ (.for "{old}" (.~~ (.these ["[1]/[0]" jvm])) - "JVM" (.~~ (.these ["[1]/[0]" jvm])) - "JavaScript" (.~~ (.these ["[1]/[0]" js])) - "Lua" (.~~ (.these ["[1]/[0]" lua])) - "Python" (.~~ (.these ["[1]/[0]" python])) - "Ruby" (.~~ (.these ["[1]/[0]" ruby])) - (.~~ (.these))))] + (.,, (.for "{old}" (.,, (.these ["[1]/[0]" jvm])) + "JVM" (.,, (.these ["[1]/[0]" jvm])) + "JavaScript" (.,, (.these ["[1]/[0]" js])) + "Lua" (.,, (.these ["[1]/[0]" lua])) + "Python" (.,, (.these ["[1]/[0]" python])) + "Ruby" (.,, (.these ["[1]/[0]" ruby])) + (.,, (.these))))] ]))) (def for_bit @@ -287,7 +287,7 @@ (code.symbol ["" "i8"]))) (/.' [+9.0 "9" i8])) (not (code#= (code.nat example_nat) - (/.' (~ (code.nat example_nat))))) + (/.' (, (code.nat example_nat))))) )))) (def for_code/` @@ -317,7 +317,7 @@ (code.symbol [..current_module "i8"]))) (/.` [+9.0 "9" i8])) (code#= (code.nat example_nat) - (/.` (~ (code.nat example_nat)))))))) + (/.` (, (code.nat example_nat)))))))) (def for_code/`' Test @@ -346,7 +346,7 @@ (code.symbol ["" "i8"]))) (/.`' [+9.0 "9" i8])) (code#= (code.nat example_nat) - (/.`' (~ (code.nat example_nat)))))))) + (/.`' (, (code.nat example_nat)))))))) (def for_code Test @@ -397,7 +397,7 @@ (same? (is Any macro)))) (_.coverage [/.macro] (same? expected (..identity_macro expected))) - (~~ (for @.old (~~ (these)) + (,, (for @.old (,, (these)) (_.coverage [/.Source] (..found_crosshair?)))) (_.coverage [/.require] @@ -419,21 +419,21 @@ <m2/1> (template.text [<module/2> "/" <module/1>]) <m0/1/2> (template.text [<module/0> "/" <module/1> "/" <module/2>]) <open/0> (template.text [<module/0> "#[0]"])] - (and (~~ (with_template [<input> <module> <referrals>] + (and (,, (with_template [<input> <module> <referrals>] [(with_expansions [<input>' (macro.final <input>)] (let [scenario (is (-> Any Bit) (function (_ _) ... TODO: Remove this hack once Jython is no longer being used as the Python interpreter. (`` (for @.python (case (' [<input>']) (^.` [<module> - ("lux def" (~ [_ {.#Symbol ["" _]}]) [] #0) - (~~ (template.spliced <referrals>))]) + ("lux def" (, [_ {.#Symbol ["" _]}]) [] #0) + (,, (template.spliced <referrals>))]) true _ false) (case (' [<input>']) - (^.` [<module> (~~ (template.spliced <referrals>))]) + (^.` [<module> (,, (template.spliced <referrals>))]) true _ @@ -655,7 +655,7 @@ Test (`` (all _.and (_.coverage [/.with_template] - (let [bits (list (~~ (/.with_template [_] + (let [bits (list (,, (/.with_template [_] [true] [0] [1] [2] @@ -686,7 +686,7 @@ (pattern (/.static option/1)) true _ false)) (_.coverage [/.char] - (|> (`` (/.char (~~ (/.static static_char)))) + (|> (`` (/.char (,, (/.static static_char)))) text.of_char (text#= static_char))) ))) @@ -815,7 +815,7 @@ .let [expected (n.+ left right)]] (all _.and (_.coverage [/.these] - (`` (and (~~ (these true + (`` (and (,, (these true true true))))) (_.coverage [/.with_expansions] @@ -830,8 +830,8 @@ (_.coverage [/.``] (n.= expected (/.`` (all n.+ - (~~ (these left right)) - (~~ (/.comment dummy)))))) + (,, (these left right)) + (,, (/.comment dummy)))))) (_.coverage [/.for] (and (n.= expected (/.for "fake host" dummy @@ -1196,8 +1196,8 @@ ..for_def ..for_meta ..for_export - (~~ (for @.old (~~ (these)) - (~~ (these ..for_bindings)))) + (,, (for @.old (,, (these)) + (,, (these ..for_bindings)))) )))) (def test @@ -1226,16 +1226,16 @@ /world.test /ffi.test - (~~ (for @.old (~~ (these)) - (~~ (these /extension.test)))) + (,, (for @.old (,, (these)) + (,, (these /extension.test)))) /target.test - (~~ (for @.jvm (~~ (these /target/jvm.test)) - @.old (~~ (these /target/jvm.test)) - @.js (~~ (these /target/js.test)) - @.lua (~~ (these /target/lua.test)) - @.python (~~ (these /target/python.test)) - @.ruby (~~ (these /target/ruby.test)))) + (,, (for @.jvm (,, (these /target/jvm.test)) + @.old (,, (these /target/jvm.test)) + @.js (,, (these /target/js.test)) + @.lua (,, (these /target/lua.test)) + @.python (,, (these /target/python.test)) + @.ruby (,, (these /target/ruby.test)))) )))))) (program: args diff --git a/stdlib/source/test/lux/control/concatenative.lux b/stdlib/source/test/lux/control/concatenative.lux index ced371a06..7634e19fe 100644 --- a/stdlib/source/test/lux/control/concatenative.lux +++ b/stdlib/source/test/lux/control/concatenative.lux @@ -65,7 +65,7 @@ /.&&))] (and (n.= sample left) (n.= dummy right)))) - (~~ (with_template [<function> <tag>] + (,, (with_template [<function> <tag>] [(_.coverage [<function>] ((sum.equivalence n.= n.=) {<tag> sample} @@ -100,7 +100,7 @@ [parameter (|> <generator> (random.only <only>)) subject <generator>] (`` (all _.and - (~~ (with_template [<concatenative> <functional>] + (,, (with_template [<concatenative> <functional>] [(_.coverage [<concatenative>] (<=> (<functional> parameter subject) (/.value (|>> (/.push subject) @@ -108,7 +108,7 @@ <concatenative>))))] <arithmetic>')) - (~~ (with_template [<concatenative> <functional>] + (,, (with_template [<concatenative> <functional>] [(_.coverage [<concatenative>] (bit#= (<functional> parameter subject) (/.value (|>> (/.push subject) diff --git a/stdlib/source/test/lux/control/parser.lux b/stdlib/source/test/lux/control/parser.lux index 738a8b739..6cecb66d4 100644 --- a/stdlib/source/test/lux/control/parser.lux +++ b/stdlib/source/test/lux/control/parser.lux @@ -68,11 +68,11 @@ (syntax (_ [pattern <code>.any then <code>.any input <code>.any]) - (in (list (` (case (~ input) - (pattern {try.#Success [(~' _) (~ pattern)]}) - (~ then) + (in (list (` (case (, input) + (pattern {try.#Success [(,' _) (, pattern)]}) + (, then) - (~' _) + (,' _) #0)))))) (def combinators_0 diff --git a/stdlib/source/test/lux/control/remember.lux b/stdlib/source/test/lux/control/remember.lux index 8d6c21767..17440088a 100644 --- a/stdlib/source/test/lux/control/remember.lux +++ b/stdlib/source/test/lux/control/remember.lux @@ -33,10 +33,10 @@ (def (memory macro deadline message focus) (-> Symbol Date Text (Maybe Code) Code) - (` ((~ (code.symbol macro)) - (~ (code.text (%.date deadline))) - (~ (code.text message)) - (~+ (case focus + (` ((, (code.symbol macro)) + (, (code.text (%.date deadline))) + (, (code.text message)) + (,* (case focus {.#None} (list) {.#Some focus} (list focus)))))) diff --git a/stdlib/source/test/lux/data/binary.lux b/stdlib/source/test/lux/data/binary.lux index 4fde0e1f9..d3fcc968a 100644 --- a/stdlib/source/test/lux/data/binary.lux +++ b/stdlib/source/test/lux/data/binary.lux @@ -135,7 +135,7 @@ Test (<| (_.for [\\parser.Size]) (`` (all _.and - (~~ (with_template [<size> <parser> <format>] + (,, (with_template [<size> <parser> <format>] [(do [! random.monad] [expected (at ! each (i64.and (i64.mask <size>)) random.nat)] @@ -155,7 +155,7 @@ (def binary Test (`` (all _.and - (~~ (with_template [<parser> <format>] + (,, (with_template [<parser> <format>] [(do [! random.monad] [expected (at ! each (at utf8.codec encoded) (random.ascii ..segment_size))] (_.coverage [<parser> <format>] @@ -173,7 +173,7 @@ (def utf8 Test (`` (all _.and - (~~ (with_template [<parser> <format>] + (,, (with_template [<parser> <format>] [(do [! random.monad] [expected (random.ascii ..segment_size)] (_.coverage [<parser> <format>] @@ -192,7 +192,7 @@ (def sequence Test (`` (all _.and - (~~ (with_template [<parser> <format>] + (,, (with_template [<parser> <format>] [(do [! random.monad] [expected (random.sequence ..segment_size random.nat)] (_.coverage [<parser> <format>] @@ -211,7 +211,7 @@ (def simple Test (`` (all _.and - (~~ (with_template [<parser> <format> <random> <equivalence>] + (,, (with_template [<parser> <format> <random> <equivalence>] [(do [! random.monad] [expected <random>] (_.coverage [<parser> <format>] @@ -250,7 +250,7 @@ (def complex Test (`` (all _.and - (~~ (with_template [<parser> <format> <random> <equivalence>] + (,, (with_template [<parser> <format> <random> <equivalence>] [(do [! random.monad] [expected <random>] (_.coverage [<parser> <format>] @@ -264,7 +264,7 @@ [\\parser.code \\format.code random_code code.equivalence] [\\parser.type \\format.type random_type type.equivalence] )) - (~~ (with_template [<parser_coverage> <parser> <coverage_format> <format> <random> <equivalence>] + (,, (with_template [<parser_coverage> <parser> <coverage_format> <format> <random> <equivalence>] [(do [! random.monad] [expected <random>] (_.coverage [<parser_coverage> <coverage_format>] @@ -494,7 +494,7 @@ (!.= (!.empty size) (!.empty size))) (_.coverage [!.size] (|> (!.empty size) !.size (n.= size))) - (~~ (with_template [<power> <bytes/?> <has/?>] + (,, (with_template [<power> <bytes/?> <has/?>] [(_.coverage [<bytes/?> <has/?>] (let [bytes (i64.left_shifted <power> 1) binary (!.empty bytes) diff --git a/stdlib/source/test/lux/data/collection/list.lux b/stdlib/source/test/lux/data/collection/list.lux index c90d09e27..2e5734c23 100644 --- a/stdlib/source/test/lux/data/collection/list.lux +++ b/stdlib/source/test/lux/data/collection/list.lux @@ -246,7 +246,7 @@ (_.coverage [/.member?] (/.every? (/.member? n.equivalence sample) sample)) - (~~ (with_template [<head> <tail> <pre>] + (,, (with_template [<head> <tail> <pre>] [(all _.and (_.coverage [<head>] (case [(<pre> sample) (<head> sample)] diff --git a/stdlib/source/test/lux/data/collection/set/multi.lux b/stdlib/source/test/lux/data/collection/set/multi.lux index a0dd01e06..64b07d09c 100644 --- a/stdlib/source/test/lux/data/collection/set/multi.lux +++ b/stdlib/source/test/lux/data/collection/set/multi.lux @@ -59,7 +59,7 @@ sample (..random diversity n.hash ..count random.nat) another (..random diversity n.hash ..count random.nat)] (`` (all _.and - (~~ (with_template [<name> <composition>] + (,, (with_template [<name> <composition>] [(_.coverage [<name>] (let [|sample| (/.support sample) |another| (/.support another) diff --git a/stdlib/source/test/lux/data/collection/set/ordered.lux b/stdlib/source/test/lux/data/collection/set/ordered.lux index 8827b719f..51688a128 100644 --- a/stdlib/source/test/lux/data/collection/set/ordered.lux +++ b/stdlib/source/test/lux/data/collection/set/ordered.lux @@ -71,7 +71,7 @@ (|> setL /.list (/.of_list n.order) (/#= setL))) - (~~ (with_template [<coverage> <comparison>] + (,, (with_template [<coverage> <comparison>] [(_.coverage [<coverage>] (case (<coverage> setL) {.#Some value} @@ -123,7 +123,7 @@ (and self! empty! symmetry!))) - (~~ (with_template [<coverage> <relation> <empty?>] + (,, (with_template [<coverage> <relation> <empty?>] [(_.coverage [<coverage>] (let [self! (at /.equivalence = diff --git a/stdlib/source/test/lux/data/collection/tree.lux b/stdlib/source/test/lux/data/collection/tree.lux index f03c2725f..aec7a93e5 100644 --- a/stdlib/source/test/lux/data/collection/tree.lux +++ b/stdlib/source/test/lux/data/collection/tree.lux @@ -171,7 +171,7 @@ (do [! random.monad] [dummy random.nat] (_.coverage [\\parser.cannot_move_further] - (`` (and (~~ (with_template [<parser>] + (`` (and (,, (with_template [<parser>] [(|> (\\parser.result <parser> (/.leaf dummy)) (!expect (^.multi {try.#Failure error} diff --git a/stdlib/source/test/lux/data/color.lux b/stdlib/source/test/lux/data/color.lux index aa77f88f9..fa4d1f9d3 100644 --- a/stdlib/source/test/lux/data/color.lux +++ b/stdlib/source/test/lux/data/color.lux @@ -140,7 +140,7 @@ spread (at ! each (|>> f.abs (f.% spread_space) (f.+ min_spread)) random.safe_frac)] (`` (all _.and - (~~ (with_template [<brightness> <palette>] + (,, (with_template [<brightness> <palette>] [(_.coverage [<palette>] (let [eB <brightness> expected (/.of_hsb [eH eS eB]) @@ -150,7 +150,7 @@ [+1.0 /.analogous] [+0.5 /.monochromatic] )) - (~~ (with_template [<palette>] + (,, (with_template [<palette>] [(_.coverage [<palette>] (let [expected (/.of_hsb [eH eS +0.5]) [c0 c1 c2] (<palette> expected)] @@ -161,7 +161,7 @@ [/.triad] [/.clash] [/.split_complement])) - (~~ (with_template [<palette>] + (,, (with_template [<palette>] [(_.coverage [<palette>] (let [expected (/.of_hsb [eH eS +0.5]) [c0 c1 c2 c3] (<palette> expected)] diff --git a/stdlib/source/test/lux/data/color/named.lux b/stdlib/source/test/lux/data/color/named.lux index 49aeb9f7f..d98340a31 100644 --- a/stdlib/source/test/lux/data/color/named.lux +++ b/stdlib/source/test/lux/data/color/named.lux @@ -201,10 +201,10 @@ /.yellow_green]] )] (def all_colors - (list.together (`` (list (~~ (with_template [<definition> <by_letter>] + (list.together (`` (list (,, (with_template [<definition> <by_letter>] [((is (-> Any (List //.Color)) (function (_ _) - (`` (list (~~ (template.spliced <by_letter>)))))) + (`` (list (,, (template.spliced <by_letter>)))))) 123)] <colors>)))))) @@ -228,7 +228,7 @@ Test (<| (_.covering /._) (`` (all _.and - (~~ (with_template [<definition> <by_letter>] + (,, (with_template [<definition> <by_letter>] [<definition>] <colors>)) diff --git a/stdlib/source/test/lux/data/format/json.lux b/stdlib/source/test/lux/data/format/json.lux index 7177b268d..bfc2b7d89 100644 --- a/stdlib/source/test/lux/data/format/json.lux +++ b/stdlib/source/test/lux/data/format/json.lux @@ -77,7 +77,7 @@ (_.coverage [\\parser.null] (|> (\\parser.result \\parser.null {/.#Null}) (!expect {try.#Success _}))) - (~~ (with_template [<query> <test> <check> <random> <json> <equivalence>] + (,, (with_template [<query> <test> <check> <random> <json> <equivalence>] [(do [! random.monad] [expected <random> dummy (|> <random> (random.only (|>> (at <equivalence> = expected) not)))] @@ -368,7 +368,7 @@ true)]] (in (and can_find_known_key! cannot_find_unknown_key!)))))) - (~~ (with_template [<type> <field> <tag> <random> <equivalence>] + (,, (with_template [<type> <field> <tag> <random> <equivalence>] [(do random.monad [key (random.alphabetic 1) value <random>] @@ -400,7 +400,7 @@ <key6> (string)] (_.coverage [/.json] (and (/#= {/.#Null} (/.json ())) - (~~ (with_template [<tag> <value>] + (,, (with_template [<tag> <value>] [(/#= {<tag> <value>} (/.json <value>))] [/.#Boolean <boolean>] diff --git a/stdlib/source/test/lux/data/format/tar.lux b/stdlib/source/test/lux/data/format/tar.lux index 349149b22..4a4426fd9 100644 --- a/stdlib/source/test/lux/data/format/tar.lux +++ b/stdlib/source/test/lux/data/format/tar.lux @@ -166,7 +166,7 @@ text.together (at utf8.codec encoded))]] (`` (all _.and - (~~ (with_template [<type> <tag>] + (,, (with_template [<type> <tag>] [(_.coverage [<type>] (|> (do try.monad [expected_path (/.path expected_path) @@ -187,7 +187,7 @@ )) (_.for [/.File /.Content /.content /.data] (all _.and - (~~ (with_template [<type> <tag>] + (,, (with_template [<type> <tag>] [(_.coverage [<type>] (|> (do try.monad [expected_path (/.path expected_path) @@ -268,7 +268,7 @@ _ false))) (try.else false))) - (~~ (with_template [<expected_mode>] + (,, (with_template [<expected_mode>] [(_.coverage [<expected_mode>] (|> (do try.monad [path (/.path path) diff --git a/stdlib/source/test/lux/data/format/xml.lux b/stdlib/source/test/lux/data/format/xml.lux index a01fab3e8..dfdc7ac0e 100644 --- a/stdlib/source/test/lux/data/format/xml.lux +++ b/stdlib/source/test/lux/data/format/xml.lux @@ -47,7 +47,7 @@ (do [! random.monad] [expected (random.alphabetic 1)] (_.coverage [<exception>] - (`` (and (~~ (with_template [<parser> <input>] + (`` (and (,, (with_template [<parser> <input>] [(|> (\\parser.result <parser> (list <input>)) (!expect (^.multi {try.#Failure error} (exception.match? <exception> error))))] @@ -237,7 +237,7 @@ (do [! random.monad] [(^.let symbol [namespace name]) ..symbol] (`` (all _.and - (~~ (with_template [<type> <format>] + (,, (with_template [<type> <format>] [(_.coverage [<type> <format>] (and (text#= name (<format> ["" name])) (let [symbol (<format> symbol)] diff --git a/stdlib/source/test/lux/data/text.lux b/stdlib/source/test/lux/data/text.lux index 04c67ac15..ef8bf11ec 100644 --- a/stdlib/source/test/lux/data/text.lux +++ b/stdlib/source/test/lux/data/text.lux @@ -99,7 +99,7 @@ (def codec Test (`` (all _.and - (~~ (with_template [<format> <codec> <random>] + (,, (with_template [<format> <codec> <random>] [(do random.monad [sample <random>] (_.coverage [<format>] @@ -165,7 +165,7 @@ (/#= (\\format.format left mid right) (all "lux text concat" left mid right)))) ..codec - (~~ (with_template [<format> <alias> <random>] + (,, (with_template [<format> <alias> <random>] [(do random.monad [sample <random>] (_.coverage [<format>] @@ -651,7 +651,7 @@ .let [full (at /.monoid composite inner outer) fake_index (-- 0)]] (`` (all _.and - (~~ (with_template [<affix> <predicate>] + (,, (with_template [<affix> <predicate>] [(_.coverage [<affix> <predicate>] (<predicate> outer (<affix> outer inner)))] @@ -721,7 +721,7 @@ (all _.and (_.for [/.Char /.of_char] (`` (all _.and - (~~ (with_template [<short> <long>] + (,, (with_template [<short> <long>] [(_.coverage [<short> <long>] (at /.equivalence = <short> <long>))] @@ -755,8 +755,8 @@ {.#None} false))) (_.coverage [/.space /.space?] - (`` (and (~~ (with_template [<char>] - [(/.space? (`` (.char (~~ (static <char>)))))] + (`` (and (,, (with_template [<char>] + [(/.space? (`` (.char (,, (static <char>)))))] [/.tab] [/.vertical_tab] diff --git a/stdlib/source/test/lux/data/text/encoding.lux b/stdlib/source/test/lux/data/text/encoding.lux index 15c1b5bbb..47a1ddbb7 100644 --- a/stdlib/source/test/lux/data/text/encoding.lux +++ b/stdlib/source/test/lux/data/text/encoding.lux @@ -185,7 +185,7 @@ <named> (with_template [<definition> <by_letter>] [((is (-> Any (List /.Encoding)) (function (_ _) - (`` (list (~~ (template.spliced <by_letter>)))))) + (`` (list (,, (template.spliced <by_letter>)))))) [])] <encodings>)] @@ -205,7 +205,7 @@ (with_template [<definition> <by_letter>] [(def <definition> Test - (`` (_.coverage [/.name (~~ (template.spliced <by_letter>))] + (`` (_.coverage [/.name (,, (template.spliced <by_letter>))] ..verdict)))] <encodings>) @@ -222,7 +222,7 @@ (<| (_.covering /._) (_.for [/.Encoding]) (`` (all _.and - (~~ (with_template [<definition> <by_letter>] + (,, (with_template [<definition> <by_letter>] [<definition>] <encodings>)) diff --git a/stdlib/source/test/lux/data/text/escape.lux b/stdlib/source/test/lux/data/text/escape.lux index 94808d95b..da90e8f24 100644 --- a/stdlib/source/test/lux/data/text/escape.lux +++ b/stdlib/source/test/lux/data/text/escape.lux @@ -88,7 +88,7 @@ (do random.monad [ascii ..ascii_range] (_.coverage [/.escapable?] - (`` (if (or (~~ (with_template [<char>] + (`` (if (or (,, (with_template [<char>] [(n.= (debug.private <char>) ascii)] [/.\0] [/.\a] [/.\b] [/.\t] @@ -155,5 +155,5 @@ (!invalid code))))) (_.coverage [/.literal] (with_expansions [<example> (..static_sample)] - (text#= <example> (`` (/.literal (~~ (..static_escaped <example>))))))) + (text#= <example> (`` (/.literal (,, (..static_escaped <example>))))))) ))) diff --git a/stdlib/source/test/lux/data/text/regex.lux b/stdlib/source/test/lux/data/text/regex.lux index 4d480632b..5dabc0a9b 100644 --- a/stdlib/source/test/lux/data/text/regex.lux +++ b/stdlib/source/test/lux/data/text/regex.lux @@ -60,13 +60,13 @@ regex <code>.any input <code>.any]) (macro.with_symbols [g!message g!_] - (in (list (` (|> (~ input) - (<text>.result (~ regex)) + (in (list (` (|> (, input) + (<text>.result (, regex)) (pipe.case - (pattern {try.#Success (~ pattern)}) + (pattern {try.#Success (, pattern)}) true - (~ g!_) + (, g!_) false)))))))) (def basics diff --git a/stdlib/source/test/lux/data/text/unicode/block.lux b/stdlib/source/test/lux/data/text/unicode/block.lux index ff4c5b773..7149a441c 100644 --- a/stdlib/source/test/lux/data/text/unicode/block.lux +++ b/stdlib/source/test/lux/data/text/unicode/block.lux @@ -149,14 +149,14 @@ <named> (with_template [<definition> <part>] [((is (-> Any (List /.Block)) (function (_ _) - (`` (list (~~ (template.spliced <part>)))))) + (`` (list (,, (template.spliced <part>)))))) [])] <blocks>)] (with_template [<definition> <part>] [(def <definition> Test - (`` (_.coverage [(~~ (template.spliced <part>))] + (`` (_.coverage [(,, (template.spliced <part>))] (let [all (list.together (list <named>)) unique (set.of_list /.hash all)] (n.= (list.size all) @@ -205,7 +205,7 @@ (and (/.within? sample inside) (not (/.within? sample (-- (/.start sample)))) (not (/.within? sample (++ (/.end sample)))))) - (~~ (with_template [<definition> <part>] + (,, (with_template [<definition> <part>] [<definition>] <blocks>)))) diff --git a/stdlib/source/test/lux/data/text/unicode/set.lux b/stdlib/source/test/lux/data/text/unicode/set.lux index da4ea8e60..bdca45423 100644 --- a/stdlib/source/test/lux/data/text/unicode/set.lux +++ b/stdlib/source/test/lux/data/text/unicode/set.lux @@ -73,7 +73,7 @@ (n.= (n.max (block.end left) (block.end right)) (/.end composed))))) - (~~ (with_template [<set>] + (,, (with_template [<set>] [(do random.monad [char (random.char <set>) .let [start (/.start <set>) diff --git a/stdlib/source/test/lux/debug.lux b/stdlib/source/test/lux/debug.lux index 245f5bdba..cda9456f2 100644 --- a/stdlib/source/test/lux/debug.lux +++ b/stdlib/source/test/lux/debug.lux @@ -56,7 +56,7 @@ sample_text (random.upper_case 10) sample_nat random.nat sample_rev random.rev] - (in (`` (and (~~ (with_template [<type> <format> <sample>] + (in (`` (and (,, (with_template [<type> <format> <sample>] [(|> (/.representation <type> <sample>) (try#each (text#= (<format> <sample>))) (try.else false))] @@ -87,7 +87,7 @@ {try.#Failure error} false) ... TODO: Uncomment after switching from the old (tag+last?) to the new (lefts+right?) representation for variants - ... (~~ (with_template [<lefts> <right?> <value> <format>] + ... (,, (with_template [<lefts> <right?> <value> <format>] ... [(|> (/.representation (type_literal (Or Bit Int Frac)) ... (is (Or Bit Int Frac) ... (<lefts> <right?> <value>))) @@ -112,7 +112,7 @@ sample_code $//code.random sample_xml $//xml.random sample_json $//json.random] - (in (`` (and (~~ (with_template [<type> <format> <sample>] + (in (`` (and (,, (with_template [<type> <format> <sample>] [(|> (/.representation <type> <sample>) (try#each (text#= (<format> <sample>))) (try.else false))] @@ -135,7 +135,7 @@ sample_month random.month sample_time random.time sample_day random.day] - (in (`` (and (~~ (with_template [<type> <format> <sample>] + (in (`` (and (,, (with_template [<type> <format> <sample>] [(|> (/.representation <type> <sample>) (try#each (text#= (<format> <sample>))) (try.else false))] @@ -173,7 +173,7 @@ (|> (/.representation (type_literal (List Nat)) (is (List Nat) (list sample_nat))) (try#each (text#= (%.list %.nat (list sample_nat)))) (try.else false)) - (~~ (with_template [<sample>] + (,, (with_template [<sample>] [(|> (/.representation (type_literal (Maybe Nat)) (is (Maybe Nat) <sample>)) (try#each (text#= (%.maybe %.nat <sample>))) (try.else false))] @@ -199,7 +199,7 @@ sample_frac random.frac sample_text (random.upper_case 10)] (_.coverage [/.inspection] - (`` (and (~~ (with_template [<format> <sample>] + (`` (and (,, (with_template [<format> <sample>] [(text#= (<format> <sample>) (/.inspection <sample>))] [%.bit sample_bit] @@ -245,8 +245,8 @@ bar random.nat baz random.bit] (_.coverage [/.here] - (with_expansions [<no_parameters> (for @.js (~~ (these)) - (~~ (these (/.here))))] + (with_expansions [<no_parameters> (for @.js (,, (these)) + (,, (these (/.here))))] (`` (exec <no_parameters> (/.here foo diff --git a/stdlib/source/test/lux/documentation.lux b/stdlib/source/test/lux/documentation.lux index bac10e185..9a22ca625 100644 --- a/stdlib/source/test/lux/documentation.lux +++ b/stdlib/source/test/lux/documentation.lux @@ -54,7 +54,7 @@ (_.for [/.Definition] (all _.and (_.coverage [/.default] - (case (`` (/.default (~~ (template.symbol [.._] [g!default])))) + (case (`` (/.default (,, (template.symbol [.._] [g!default])))) (pattern (list definition)) (and (|> definition (the /.#definition) @@ -85,11 +85,11 @@ (all _.and (_.coverage [/.module /.markdown] (let [sub (`` (/.module /._ - (~~ (template.text ['sub_description'])) + (,, (template.text ['sub_description'])) [] [])) super (`` (/.module .._ - (~~ (template.text ['super_description'])) + (,, (template.text ['super_description'])) [..documentation] [sub]))] (and (text.contains? (template.text ['sub_description']) @@ -107,12 +107,12 @@ false)))) )) (_.coverage [/.unqualified_symbol] - (`` (and (~~ (with_template [<example>] + (`` (and (,, (with_template [<example>] [(macro_error <example>)] [(/.default g!default)] [(/.documentation g!default - (~~ (template.text ['definition_description'])))] + (,, (template.text ['definition_description'])))] [(/.module g!default "" [..documentation] diff --git a/stdlib/source/test/lux/extension.lux b/stdlib/source/test/lux/extension.lux index 27a8a4cc8..a50ff37ac 100644 --- a/stdlib/source/test/lux/extension.lux +++ b/stdlib/source/test/lux/extension.lux @@ -10,12 +10,12 @@ ["[0]" php] ["[0]" scheme] ["[0]" jvm - (.~~ (.for "JVM" (.~~ (.these ["[1]" bytecode] + (.,, (.for "JVM" (.,, (.these ["[1]" bytecode] ["[0]" class] ["[0]" version] [encoding ["[0]" name]])) - (.~~ (.these))))]] + (.,, (.these))))]] [abstract ["[0]" monad (.only do)]] [control @@ -56,9 +56,9 @@ ["<[1]>" \\parser]] [phase [generation - (.~~ (.for "JVM" (.~~ (.these ["[0]" jvm + (.,, (.for "JVM" (.,, (.these ["[0]" jvm ["[1]/[0]" runtime]])) - (.~~ (.these))))]]]]]] + (.,, (.these))))]]]]]] ["_" test (.only Test)]]] [\\library ["[0]" / (.only analysis synthesis generation declaration)]]))) @@ -68,7 +68,7 @@ (with_template [<name>] [(def <name> Text - (`` (%.symbol (symbol (~~ (template.symbol [.._ <name>]))))))] + (`` (%.symbol (symbol (,, (template.symbol [.._ <name>]))))))] [my_analysis] [my_synthesis] @@ -179,7 +179,7 @@ (generation.log! commentary))))] (in declaration.no_requirements))) - (`` ((~~ (static ..my_declaration)) (n.* 2 3))) + (`` ((,, (static ..my_declaration)) (n.* 2 3))) )) (def .public test @@ -188,20 +188,20 @@ (do random.monad [expected random.nat] (`` (all _.and - (~~ (with_template [<macro> <extension>] + (,, (with_template [<macro> <extension>] [(_.coverage [<macro>] (for @.old false (n.= expected - (`` ((~~ (static <extension>)) expected)))))] + (`` ((,, (static <extension>)) expected)))))] [/.analysis ..my_analysis] [/.synthesis ..my_synthesis])) (_.coverage [/.generation] (for @.old false (and (n.= expected - (`` ((~~ (static ..my_generation)) expected))) + (`` ((,, (static ..my_generation)) expected))) (text#= ..dummy_generation - (`` ((~~ (static ..dummy_generation)))))))) + (`` ((,, (static ..dummy_generation)))))))) (_.coverage [/.declaration] true) ))))) diff --git a/stdlib/source/test/lux/ffi.js.lux b/stdlib/source/test/lux/ffi.js.lux index 658afb55b..2312f1d9f 100644 --- a/stdlib/source/test/lux/ffi.js.lux +++ b/stdlib/source/test/lux/ffi.js.lux @@ -59,7 +59,7 @@ object random.nat] (<| (_.covering /._) (`` (all _.and - (~~ (with_template [<type> <value>] + (,, (with_template [<type> <value>] [(_.coverage [<type>] (exec (is <type> <value>) @@ -71,7 +71,7 @@ )) (_.for [/.Object] (all _.and - (~~ (with_template [<type>] + (,, (with_template [<type>] [(_.coverage [<type>] (exec (is (Ex (_ a) (/.Object a)) diff --git a/stdlib/source/test/lux/ffi.jvm.lux b/stdlib/source/test/lux/ffi.jvm.lux index 375de540a..642075157 100644 --- a/stdlib/source/test/lux/ffi.jvm.lux +++ b/stdlib/source/test/lux/ffi.jvm.lux @@ -94,7 +94,7 @@ (random.only (|>> f.not_a_number? not)) (at ! each (|>> /.as_float)))] (`` (all _.and - (~~ (with_template [<sample> <=> <to> <from>] + (,, (with_template [<sample> <=> <to> <from>] [(_.coverage [<to> <from>] (or (|> <sample> <to> <from> (<=> <sample>)) (let [capped (|> <sample> <to> <from>)] @@ -197,7 +197,7 @@ /.!!! /.null? not))) - (~~ (with_template [<object> <primitive> <jvm#value> <jvm#=> + (,, (with_template [<object> <primitive> <jvm#value> <jvm#=> <lux#value> <as> <of> <lux#=>] [(_.coverage [<object> <primitive>] (|> <jvm#value> diff --git a/stdlib/source/test/lux/ffi.lua.lux b/stdlib/source/test/lux/ffi.lua.lux index 7fa095e17..a78f7c516 100644 --- a/stdlib/source/test/lux/ffi.lua.lux +++ b/stdlib/source/test/lux/ffi.lua.lux @@ -24,7 +24,7 @@ string (random.lower_case 1)] (<| (_.covering /._) (`` (all _.and - (~~ (with_template [<type> <sample>] + (,, (with_template [<type> <sample>] [(_.coverage [<type>] (exec (is <type> <sample>) @@ -37,7 +37,7 @@ )) (_.for [/.Object] (all _.and - (~~ (with_template [<type>] + (,, (with_template [<type>] [(_.coverage [<type>] (exec (|> [] diff --git a/stdlib/source/test/lux/ffi.old.lux b/stdlib/source/test/lux/ffi.old.lux index e768fbff8..b8d9ea20a 100644 --- a/stdlib/source/test/lux/ffi.old.lux +++ b/stdlib/source/test/lux/ffi.old.lux @@ -100,7 +100,7 @@ (random.only (|>> f.not_a_number? not)) (at ! each (|>> /.double_to_float)))] (`` (all _.and - (~~ (with_template [<=> <sample> <to> <from>] + (,, (with_template [<=> <sample> <to> <from>] [(_.coverage [<to> <from>] (or (|> <sample> <to> <from> (<=> <sample>)) (let [capped (|> <sample> <to> <from>)] @@ -115,7 +115,7 @@ [f.= double /.double_to_float /.float_to_double] [f.= double /.double_to_int /.int_to_double] )) - (~~ (with_template [<to> <from>] + (,, (with_template [<to> <from>] [(_.coverage [<to>] (or (|> int <to> <from> (i.= (/.int_to_long int))) (let [capped (|> int <to> <from>)] @@ -125,7 +125,7 @@ [/.int_to_short /.short_to_long] [/.int_to_char /.char_to_long] )) - (~~ (with_template [<sample> <to> <from>] + (,, (with_template [<sample> <to> <from>] [(_.coverage [<to> <from>] (or (|> <sample> <to> <from> /.float_to_double (f.= (/.float_to_double <sample>))) (let [capped (|> <sample> <to> <from>)] @@ -133,7 +133,7 @@ [float /.float_to_int /.int_to_float] )) - (~~ (with_template [<to> <from>] + (,, (with_template [<to> <from>] [(_.coverage [<to>] (or (|> char <to> <from> (i.= (|> char /.char_to_int /.int_to_long))) (let [capped (|> char <to> <from>)] diff --git a/stdlib/source/test/lux/ffi.py.lux b/stdlib/source/test/lux/ffi.py.lux index 55a2597ca..3a8529e2e 100644 --- a/stdlib/source/test/lux/ffi.py.lux +++ b/stdlib/source/test/lux/ffi.py.lux @@ -27,7 +27,7 @@ string (random.lower_case 1)] (<| (_.covering /._) (`` (all _.and - (~~ (with_template [<type> <sample>] + (,, (with_template [<type> <sample>] [(_.coverage [<type>] (exec (is <type> <sample>) @@ -40,7 +40,7 @@ )) (_.for [/.Object] (all _.and - (~~ (with_template [<type>] + (,, (with_template [<type>] [(_.coverage [<type>] (exec (|> [] diff --git a/stdlib/source/test/lux/ffi.rb.lux b/stdlib/source/test/lux/ffi.rb.lux index 1fc224a9d..305de1e59 100644 --- a/stdlib/source/test/lux/ffi.rb.lux +++ b/stdlib/source/test/lux/ffi.rb.lux @@ -24,7 +24,7 @@ string (random.lower_case 1)] (<| (_.covering /._) (`` (all _.and - (~~ (with_template [<type> <sample>] + (,, (with_template [<type> <sample>] [(_.coverage [<type>] (exec (is <type> <sample>) @@ -37,7 +37,7 @@ )) (_.for [/.Object] (all _.and - (~~ (with_template [<type>] + (,, (with_template [<type>] [(_.coverage [<type>] (exec (|> [] diff --git a/stdlib/source/test/lux/ffi/export.jvm.lux b/stdlib/source/test/lux/ffi/export.jvm.lux index 8ad59d6ed..a567e8df4 100644 --- a/stdlib/source/test/lux/ffi/export.jvm.lux +++ b/stdlib/source/test/lux/ffi/export.jvm.lux @@ -46,14 +46,14 @@ (actual_double double ..expected_double) ... Methods - (~~ (with_template [<type> <+>] - [(((~~ (template.symbol [<type> "_method"])) + (,, (with_template [<type> <+>] + [(((,, (template.symbol [<type> "_method"])) [left <type> right <type>]) <type> - ((~~ (template.symbol [//._] ["as_" <type>])) - (<+> ((~~ (template.symbol [//._] ["of_" <type>])) left) - ((~~ (template.symbol [//._] ["of_" <type>])) right))))] + ((,, (template.symbol [//._] ["as_" <type>])) + (<+> ((,, (template.symbol [//._] ["of_" <type>])) left) + ((,, (template.symbol [//._] ["of_" <type>])) right))))] [boolean and] [byte int.+] @@ -77,8 +77,8 @@ ("read_only" "static" actual_float float) ("read_only" "static" actual_double double) - (~~ (with_template [<type>] - [("static" (~~ (template.symbol [<type> "_method"])) [<type> <type>] <type>)] + (,, (with_template [<type>] + [("static" (,, (template.symbol [<type> "_method"])) [<type> <type>] <type>)] [boolean] [byte] @@ -126,9 +126,9 @@ Test (<| (_.covering /._) (do [! random.monad] - [(~~ (with_template [<type> <as> <random>] - [(~~ (template.symbol [left_ <type>])) (at ! each (|>> <as>) <random>) - (~~ (template.symbol [right_ <type>])) (at ! each (|>> <as>) <random>)] + [(,, (with_template [<type> <as> <random>] + [(,, (template.symbol [left_ <type>])) (at ! each (|>> <as>) <random>) + (,, (template.symbol [right_ <type>])) (at ! each (|>> <as>) <random>)] [boolean //.as_boolean random.bit] [byte //.as_byte ..tiny_int] @@ -151,7 +151,7 @@ (frac#= (//.of_float ..expected_float) (//.of_float (Primitives::actual_float))) (frac#= (//.of_double ..expected_double) (//.of_double (Primitives::actual_double))) - (~~ (with_template [<=> <+> <type>] + (,, (with_template [<=> <+> <type>] [(with_expansions [<left> (template.symbol ["left_" <type>]) <right> (template.symbol ["right_" <type>]) <of> (template.symbol [//._] ["of_" <type>]) diff --git a/stdlib/source/test/lux/locale/language.lux b/stdlib/source/test/lux/locale/language.lux index 12603ae23..4c4f2d62e 100644 --- a/stdlib/source/test/lux/locale/language.lux +++ b/stdlib/source/test/lux/locale/language.lux @@ -36,7 +36,7 @@ Bundle (let [amount (template.amount <languages>) languages (is (List /.Language) - (`` (list (~~ (template.spliced <languages>)))))] + (`` (list (,, (template.spliced <languages>)))))] [#amount amount #names (|> languages (list#each /.name) (set.of_list text.hash)) #codes (|> languages (list#each /.code) (set.of_list text.hash)) @@ -202,7 +202,7 @@ (list#each (the #test)) (list#mix _.and (`` (all _.and - (~~ (with_template [<lens> <tag> <hash>] + (,, (with_template [<lens> <tag> <hash>] [(let [[amount set] (..aggregate (the <tag>) <hash> ..languages)] (_.coverage [<lens>] (n.= amount (set.size set))))] @@ -217,7 +217,7 @@ (template (_ <reference> <aliases>) [(_.coverage <aliases> (list.every? (at /.equivalence = <reference>) - (`` (list (~~ (template.spliced <aliases>))))))])) + (`` (list (,, (template.spliced <aliases>))))))])) (def aliases_test/0 Test diff --git a/stdlib/source/test/lux/locale/territory.lux b/stdlib/source/test/lux/locale/territory.lux index 16483d620..514009dc0 100644 --- a/stdlib/source/test/lux/locale/territory.lux +++ b/stdlib/source/test/lux/locale/territory.lux @@ -37,7 +37,7 @@ [(def <bundle> Bundle (let [amount (template.amount <territories>) - territories (`` (list (~~ (template.spliced <territories>))))] + territories (`` (list (,, (template.spliced <territories>))))] [#amount amount #names (|> territories (list#each /.name) (set.of_list text.hash)) #shorts (|> territories (list#each /.short_code) (set.of_list text.hash)) @@ -157,7 +157,7 @@ (list#each (the #test)) (list#mix _.and (`` (all _.and - (~~ (with_template [<lens> <tag> <hash>] + (,, (with_template [<lens> <tag> <hash>] [(let [[amount set] (..aggregate (the <tag>) <hash> ..territories)] (_.coverage [<lens>] (n.= amount (set.size set))))] @@ -174,7 +174,7 @@ (template (_ <reference> <aliases>) [(_.coverage <aliases> (list.every? (at /.equivalence = <reference>) - (`` (list (~~ (template.spliced <aliases>))))))])) + (`` (list (,, (template.spliced <aliases>))))))])) (def aliases_test Test diff --git a/stdlib/source/test/lux/macro.lux b/stdlib/source/test/lux/macro.lux index 555a47c03..948acd4cd 100644 --- a/stdlib/source/test/lux/macro.lux +++ b/stdlib/source/test/lux/macro.lux @@ -48,11 +48,11 @@ (def pow/2 (syntax (_ [number <code>.any]) - (in (list (` (n.* (~ number) (~ number))))))) + (in (list (` (n.* (, number) (, number))))))) (def pow/4 (syntax (_ [number <code>.any]) - (in (list (` (..pow/2 (..pow/2 (~ number)))))))) + (in (list (` (..pow/2 (..pow/2 (, number)))))))) (def repeated (syntax (_ [times <code>.nat @@ -115,7 +115,7 @@ it <code>.any]) (in (list (case cycle 0 it - _ (` (..iterated (~ (code.nat (-- cycle))) (~ it)))))))) + _ (` (..iterated (, (code.nat (-- cycle))) (, it)))))))) (def test|expansion Test @@ -125,26 +125,26 @@ pow/1 (at ! each code.nat random.nat) repetitions (at ! each (n.% 10) random.nat) - .let [single_expansion (` (..pow/2 (..pow/2 (~ pow/1)))) - expansion (` (n.* (..pow/2 (~ pow/1)) - (..pow/2 (~ pow/1)))) - full_expansion (` (n.* (n.* (~ pow/1) (~ pow/1)) - (n.* (~ pow/1) (~ pow/1))))]] + .let [single_expansion (` (..pow/2 (..pow/2 (, pow/1)))) + expansion (` (n.* (..pow/2 (, pow/1)) + (..pow/2 (, pow/1)))) + full_expansion (` (n.* (n.* (, pow/1) (, pow/1)) + (n.* (, pow/1) (, pow/1))))]] (`` (all _.and - (~~ (with_template [<expander> <logger> <expansion>] + (,, (with_template [<expander> <logger> <expansion>] [(_.coverage [<expander>] - (|> (<expander> (` (..pow/4 (~ pow/1)))) + (|> (<expander> (` (..pow/4 (, pow/1)))) (meta.result lux) (try#each (at (list.equivalence code.equivalence) = (list <expansion>))) (try.else false))) (_.coverage [<logger>] - (and (|> (/.single_expansion (` (<logger> "omit" (..pow/4 (~ pow/1))))) + (and (|> (/.single_expansion (` (<logger> "omit" (..pow/4 (, pow/1))))) (meta.result lux) (try#each (at (list.equivalence code.equivalence) = (list))) (try.else false)) - (|> (/.single_expansion (` (<logger> (..pow/4 (~ pow/1))))) + (|> (/.single_expansion (` (<logger> (..pow/4 (, pow/1))))) (meta.result lux) (try#each (at (list.equivalence code.equivalence) = (list <expansion>))) (try.else false))))] @@ -155,7 +155,7 @@ )) (_.coverage [/.one_expansion] (bit#= (not (n.= 1 repetitions)) - (|> (/.one_expansion (` (..repeated (~ (code.nat repetitions)) (~ pow/1)))) + (|> (/.one_expansion (` (..repeated (, (code.nat repetitions)) (, pow/1)))) (meta.result lux) (!expect {try.#Failure _})))) (_.coverage [/.final] @@ -178,7 +178,7 @@ <actual> (/.times <cycles> (..iterated <max> <expected>))] (let [expected_remaining (n.- <cycles> <max>)] (case (` <actual>) - (^.` (..iterated (~ [_ {.#Nat actual_remaining}]) (~ [_ {.#Nat actual}]))) + (^.` (..iterated (, [_ {.#Nat actual_remaining}]) (, [_ {.#Nat actual}]))) (and (n.= expected_remaining actual_remaining) (n.= <expected> actual)) diff --git a/stdlib/source/test/lux/macro/local.lux b/stdlib/source/test/lux/macro/local.lux index eb904eed8..75b8b68ca 100644 --- a/stdlib/source/test/lux/macro/local.lux +++ b/stdlib/source/test/lux/macro/local.lux @@ -64,9 +64,10 @@ {try.#Success [(revised .#modules (property.revised module remove_macro!) lux) []]})) (in []))] - (let [pre_expansion (` (let [(~ g!output) (~ body)] - (exec (~ pop!) - (~ g!output))))] + (let [pre_expansion (` (let [(, g!output) (, body)] + (exec + (, pop!) + (, g!output))))] (if pre_remove (macro.full_expansion pre_expansion) (in (list pre_expansion)))))))) diff --git a/stdlib/source/test/lux/macro/syntax.lux b/stdlib/source/test/lux/macro/syntax.lux index 84304452c..5c6b392f1 100644 --- a/stdlib/source/test/lux/macro/syntax.lux +++ b/stdlib/source/test/lux/macro/syntax.lux @@ -26,7 +26,7 @@ (/.syntax (_ [a <code>.any b <code>.any c <code>.any]) - (in (list (` (all n.+ (~ a) (~ b) (~ c))))))) + (in (list (` (all n.+ (, a) (, b) (, c))))))) (def .public test Test diff --git a/stdlib/source/test/lux/macro/template.lux b/stdlib/source/test/lux/macro/template.lux index d279edfeb..1269484f8 100644 --- a/stdlib/source/test/lux/macro/template.lux +++ b/stdlib/source/test/lux/macro/template.lux @@ -53,7 +53,7 @@ (_.coverage [/.spliced] (at (list.equivalence nat.equivalence) = (list left mid right) - (`` (list (~~ (/.spliced [left mid right])))))) + (`` (list (,, (/.spliced [left mid right])))))) (_.coverage [/.amount] (case (/.amount [left mid right]) 3 true @@ -63,10 +63,10 @@ <short>' true _ false)) (_.coverage [/.symbol] - (and (case (`` (symbol (~~ (/.symbol <short>)))) + (and (case (`` (symbol (,, (/.symbol <short>)))) ["" <short>'] true _ false) - (case (`` (symbol (~~ (/.symbol <module> <short>)))) + (case (`` (symbol (,, (/.symbol <module> <short>)))) [<module>' <short>'] true _ false) )) diff --git a/stdlib/source/test/lux/math.lux b/stdlib/source/test/lux/math.lux index ad1107e49..382b84009 100644 --- a/stdlib/source/test/lux/math.lux +++ b/stdlib/source/test/lux/math.lux @@ -58,10 +58,10 @@ parameterC (random.only (|>> (complex.= complex/0) not) random.complex) subjectC random.complex]) (`` (all _.and - (~~ (with_template [</> <scenarios>'] + (,, (with_template [</> <scenarios>'] [(_.coverage [</>] (with_expansions [<scenarios> (template.spliced <scenarios>')] - (`` (and (~~ (with_template [<=> <//> <parameter> <subject>] + (`` (and (,, (with_template [<=> <//> <parameter> <subject>] [(<=> (<//> <parameter> <subject>) (</> <parameter> <subject>))] @@ -98,10 +98,10 @@ [ratio.= ratio.% parameter/ subject/] [complex.= complex.% parameterC subjectC]]] )) - (~~ (with_template [</> <scenarios>'] + (,, (with_template [</> <scenarios>'] [(_.coverage [</>] (with_expansions [<scenarios> (template.spliced <scenarios>')] - (`` (and (~~ (with_template [<//> <parameter> <subject>] + (`` (and (,, (with_template [<//> <parameter> <subject>] [(bit#= (<//> <parameter> <subject>) (</> <parameter> <subject>))] diff --git a/stdlib/source/test/lux/math/logic/continuous.lux b/stdlib/source/test/lux/math/logic/continuous.lux index b16d7d3db..d0f0a33a1 100644 --- a/stdlib/source/test/lux/math/logic/continuous.lux +++ b/stdlib/source/test/lux/math/logic/continuous.lux @@ -21,7 +21,7 @@ mid random.rev right random.rev] (`` (all _.and - (~~ (with_template [<monoid>] + (,, (with_template [<monoid>] [(_.for [<monoid>] ($monoid.spec r.= <monoid> random.rev))] diff --git a/stdlib/source/test/lux/math/modular.lux b/stdlib/source/test/lux/math/modular.lux index 60734f83d..5393d75ef 100644 --- a/stdlib/source/test/lux/math/modular.lux +++ b/stdlib/source/test/lux/math/modular.lux @@ -54,7 +54,7 @@ ($equivalence.spec /.equivalence (..random subject::%))) (_.for [/.order /.<] ($order.spec /.order (..random subject::%))) - (~~ (with_template [<composite> <monoid>] + (,, (with_template [<composite> <monoid>] [(_.for [<monoid> <composite>] ($monoid.spec /.equivalence (<monoid> subject::%) (..random subject::%)))] diff --git a/stdlib/source/test/lux/math/number.lux b/stdlib/source/test/lux/math/number.lux index eee2638dc..d0142f7bf 100644 --- a/stdlib/source/test/lux/math/number.lux +++ b/stdlib/source/test/lux/math/number.lux @@ -33,7 +33,7 @@ (<| (_.covering /._) (all _.and (_.coverage [/.bin] - (`` (and (~~ (with_template [<=> <codec> <number>] + (`` (and (,, (with_template [<=> <codec> <number>] [(case (at <codec> decoded (..clean_commas <number>)) {try.#Success actual} (<=> (/.bin <number>) actual) @@ -52,7 +52,7 @@ [f.= f.binary "-11,00.10,01"] ))))) (_.coverage [/.oct] - (`` (and (~~ (with_template [<=> <codec> <number>] + (`` (and (,, (with_template [<=> <codec> <number>] [(case (at <codec> decoded (..clean_commas <number>)) {try.#Success actual} (<=> (/.oct <number>) actual) @@ -71,7 +71,7 @@ [f.= f.octal "-61,52.43"] ))))) (_.coverage [/.hex] - (`` (and (~~ (with_template [<=> <codec> <number>] + (`` (and (,, (with_template [<=> <codec> <number>] [(case (at <codec> decoded (..clean_commas <number>)) {try.#Success actual} (<=> (/.hex <number>) actual) diff --git a/stdlib/source/test/lux/math/number/frac.lux b/stdlib/source/test/lux/math/number/frac.lux index 6dd688c59..adefb43e7 100644 --- a/stdlib/source/test/lux/math/number/frac.lux +++ b/stdlib/source/test/lux/math/number/frac.lux @@ -102,7 +102,7 @@ ($hash.spec /.hash random.frac)) (_.for [/.order /.<] ($order.spec /.order random.safe_frac)) - (~~ (with_template [<composite> <monoid>] + (,, (with_template [<composite> <monoid>] [(_.for [<monoid> <composite>] ($monoid.spec /.equivalence <monoid> ..random))] @@ -112,7 +112,7 @@ [/.min /.minimum] [/.max /.maximum] )) - (~~ (with_template [<codec>] + (,, (with_template [<codec>] [(_.for [<codec>] ($codec.spec /.equivalence <codec> random.safe_frac))] diff --git a/stdlib/source/test/lux/math/number/int.lux b/stdlib/source/test/lux/math/number/int.lux index c5fb9e6a2..27f66d3a2 100644 --- a/stdlib/source/test/lux/math/number/int.lux +++ b/stdlib/source/test/lux/math/number/int.lux @@ -36,7 +36,7 @@ ($enum.spec /.enum random.int)) (_.for [/.interval] ($interval.spec /.interval random.int)) - (~~ (with_template [<monoid>] + (,, (with_template [<monoid>] [(_.for [<monoid>] ($monoid.spec /.equivalence <monoid> random.int))] @@ -46,7 +46,7 @@ [/.minimum] [/.maximum] )) - (~~ (with_template [<codec>] + (,, (with_template [<codec>] [(_.for [<codec>] ($codec.spec /.equivalence <codec> random.int))] diff --git a/stdlib/source/test/lux/math/number/nat.lux b/stdlib/source/test/lux/math/number/nat.lux index a2ac6589b..cb31da701 100644 --- a/stdlib/source/test/lux/math/number/nat.lux +++ b/stdlib/source/test/lux/math/number/nat.lux @@ -34,7 +34,7 @@ ($enum.spec /.enum random.nat)) (_.for [/.interval] ($interval.spec /.interval random.nat)) - (~~ (with_template [<composite> <monoid>] + (,, (with_template [<composite> <monoid>] [(_.for [<monoid> <composite>] ($monoid.spec /.equivalence <monoid> random.nat))] @@ -44,7 +44,7 @@ [/.min /.minimum] [/.max /.maximum] )) - (~~ (with_template [<codec>] + (,, (with_template [<codec>] [(_.for [<codec>] ($codec.spec /.equivalence <codec> random.nat))] diff --git a/stdlib/source/test/lux/math/number/ratio.lux b/stdlib/source/test/lux/math/number/ratio.lux index 9865db7ed..ec4f2e7d5 100644 --- a/stdlib/source/test/lux/math/number/ratio.lux +++ b/stdlib/source/test/lux/math/number/ratio.lux @@ -43,7 +43,7 @@ ($equivalence.spec /.equivalence ..random)) (_.for [/.order /.<] ($order.spec /.order ..random)) - (~~ (with_template [<composite> <monoid>] + (,, (with_template [<composite> <monoid>] [(_.for [<monoid> <composite>] ($monoid.spec /.equivalence <monoid> ..random))] diff --git a/stdlib/source/test/lux/math/number/rev.lux b/stdlib/source/test/lux/math/number/rev.lux index 570013717..ae6de035a 100644 --- a/stdlib/source/test/lux/math/number/rev.lux +++ b/stdlib/source/test/lux/math/number/rev.lux @@ -36,7 +36,7 @@ ($enum.spec /.enum random.rev)) (_.for [/.interval] ($interval.spec /.interval random.rev)) - (~~ (with_template [<composite> <monoid>] + (,, (with_template [<composite> <monoid>] [(_.for [<monoid> <composite>] ($monoid.spec /.equivalence <monoid> random.rev))] @@ -45,7 +45,7 @@ [/.min /.minimum] [/.max /.maximum] )) - (~~ (with_template [<codec>] + (,, (with_template [<codec>] [(_.for [<codec>] ($codec.spec /.equivalence <codec> random.rev))] @@ -58,7 +58,7 @@ (<| (_.covering /._) (_.for [.Rev]) (`` (all _.and - (~~ (with_template [<half> <whole>] + (,, (with_template [<half> <whole>] [(_.coverage [<half>] (/.= <whole> (/.+ <half> <half>)))] diff --git a/stdlib/source/test/lux/meta/code.lux b/stdlib/source/test/lux/meta/code.lux index a566b030d..49db56a18 100644 --- a/stdlib/source/test/lux/meta/code.lux +++ b/stdlib/source/test/lux/meta/code.lux @@ -77,7 +77,7 @@ (!expect {try.#Success _})) (|> (\\parser.result \\parser.any (list)) (!expect {try.#Failure _}))))) - (~~ (with_template [<query> <check> <random> <code> <equivalence>] + (,, (with_template [<query> <check> <random> <code> <equivalence>] [(do [! random.monad] [expected <random> dummy (|> <random> (random.only (|>> (at <equivalence> = expected) not)))] @@ -104,7 +104,7 @@ [\\parser.global \\parser.this_global ..global /.symbol symbol.equivalence] [\\parser.symbol \\parser.this_symbol ..any_symbol /.symbol symbol.equivalence] )) - (~~ (with_template [<query> <code>] + (,, (with_template [<query> <code>] [(do [! random.monad] [expected_left random.nat expected_right random.int] @@ -246,7 +246,7 @@ (def for_format Test (`` (all _.and - (~~ (with_template [<coverage> <random> <tag>] + (,, (with_template [<coverage> <random> <tag>] [(do [! random.monad] [expected <random>] (_.coverage [<coverage>] @@ -272,7 +272,7 @@ [/.form (..random_sequence ..random) .#Form] [/.variant (..random_sequence ..random) .#Variant] [/.tuple (..random_sequence ..random) .#Tuple])) - (~~ (with_template [<coverage> <random> <tag>] + (,, (with_template [<coverage> <random> <tag>] [(do [! random.monad] [expected <random>] (_.coverage [<coverage>] diff --git a/stdlib/source/test/lux/meta/type.lux b/stdlib/source/test/lux/meta/type.lux index 59ca03061..86359c7de 100644 --- a/stdlib/source/test/lux/meta/type.lux +++ b/stdlib/source/test/lux/meta/type.lux @@ -100,7 +100,7 @@ expected_middle ..primitive expected_right ..primitive] (`` (all _.and - (~~ (with_template [<parser> <exception> <good_constructor> <bad_constructor>] + (,, (with_template [<parser> <exception> <good_constructor> <bad_constructor>] [(_.coverage [<parser> <exception>] (and (|> (\\parser.result (<parser> (all <>.and \\parser.any \\parser.any \\parser.any)) (<good_constructor> (list expected_left expected_middle expected_right))) @@ -282,7 +282,7 @@ (do [! random.monad] [expected ..primitive] (_.coverage [\\parser.empty_input] - (`` (and (~~ (with_template [<parser>] + (`` (and (,, (with_template [<parser>] [(|> (\\parser.result (do <>.monad [_ \\parser.any] <parser>) @@ -411,7 +411,7 @@ .let [(open "/#[0]") /.equivalence (open "list#[0]") (list.equivalence /.equivalence)]] (`` (all _.and - (~~ (with_template [<ctor> <dtor> <unit>] + (,, (with_template [<ctor> <dtor> <unit>] [(_.coverage [<ctor> <dtor>] (let [flat (|> members <ctor> <dtor>)] (or (list#= members flat) @@ -464,7 +464,7 @@ #1)))) .let [(open "/#[0]") /.equivalence]] (`` (all _.and - (~~ (with_template [<ctor> <dtor>] + (,, (with_template [<ctor> <dtor>] [(_.coverage [<ctor> <dtor>] (let [[flat_size flat_body] (|> body_type (<ctor> size) <dtor>)] (and (n.= size flat_size) diff --git a/stdlib/source/test/lux/meta/type/check.lux b/stdlib/source/test/lux/meta/type/check.lux index b630d37a1..d568d5b76 100644 --- a/stdlib/source/test/lux/meta/type/check.lux +++ b/stdlib/source/test/lux/meta/type/check.lux @@ -695,7 +695,7 @@ anonymousT dirty_type] (in (function (_ holeT) {.#Named [module short] (anonymousT holeT)}))) - (~~ (with_template [<tag>] + (,, (with_template [<tag>] [(do random.monad [leftT dirty_type rightT dirty_type] @@ -712,7 +712,7 @@ parameterT dirty_type] (in (function (_ holeT) {.#Primitive name (list (parameterT holeT))}))) - (~~ (with_template [<tag>] + (,, (with_template [<tag>] [(do [! random.monad] [funcT dirty_type argT dirty_type diff --git a/stdlib/source/test/lux/meta/type/resource.lux b/stdlib/source/test/lux/meta/type/resource.lux index f7d04d659..00bb863c3 100644 --- a/stdlib/source/test/lux/meta/type/resource.lux +++ b/stdlib/source/test/lux/meta/type/resource.lux @@ -33,7 +33,7 @@ .let [! identity.monad]] (_.for [/.Linear /.run! /.monad] (`` (all _.and - (~~ (with_template [<coverage> <bindings>] + (,, (with_template [<coverage> <bindings>] [(_.coverage <coverage> (<| (text#= (format pre post)) (is (Identity Text)) @@ -75,7 +75,7 @@ .let [! io.monad]] (_.for [/.Linear /.run! /.monad] (`` (all _.and - (~~ (with_template [<coverage> <bindings>] + (,, (with_template [<coverage> <bindings>] [(_.coverage <coverage> (<| (text#= (format pre post)) io.run! @@ -118,7 +118,7 @@ .let [! async.monad]] (_.for [/.Linear /.run! /.monad] (`` (all _.and - (~~ (with_template [<coverage> <bindings>] + (,, (with_template [<coverage> <bindings>] [(in (monad.do ! [outcome (<| (is (Async Text)) (/.run! !) @@ -178,7 +178,7 @@ ..async (_.coverage [/.amount_cannot_be_zero] - (`` (and (~~ (with_template [<group|un_group>] + (`` (and (,, (with_template [<group|un_group>] [(with_error /.amount_cannot_be_zero (<group|un_group> 0))] diff --git a/stdlib/source/test/lux/meta/type/unit.lux b/stdlib/source/test/lux/meta/type/unit.lux index b52ddd921..8be5095df 100644 --- a/stdlib/source/test/lux/meta/type/unit.lux +++ b/stdlib/source/test/lux/meta/type/unit.lux @@ -50,7 +50,7 @@ [expected random.int] (_.for [/.Unit] (`` (all _.and - (~~ (with_template [<type> <unit>] + (,, (with_template [<type> <unit>] [(_.coverage [<type> <unit>] (|> expected (at <unit> in) @@ -85,7 +85,7 @@ right (..meter 1,000) extra (..second 1,000)] (`` (all _.and - (~~ (with_template [<q> <i>] + (,, (with_template [<q> <i>] [(_.coverage [<q>] (i.= (<i> (at /.meter out left) (at /.meter out right)) (at /.meter out (<q> left right))))] diff --git a/stdlib/source/test/lux/meta/type/unit/scale.lux b/stdlib/source/test/lux/meta/type/unit/scale.lux index 0c305912b..15b5dab9a 100644 --- a/stdlib/source/test/lux/meta/type/unit/scale.lux +++ b/stdlib/source/test/lux/meta/type/unit/scale.lux @@ -52,7 +52,7 @@ (at ! each (i.* (.int how::to))) (at ! each (at //.meter in)))] (`` (all _.and - (~~ (with_template [<type> <scale>] + (,, (with_template [<type> <scale>] [(_.coverage [<type> <scale>] (|> small (at <scale> up) @@ -65,7 +65,7 @@ [/.Mega /.mega] [/.Giga /.giga] )) - (~~ (with_template [<type> <scale>] + (,, (with_template [<type> <scale>] [(_.coverage [<type> <scale>] (|> large (at <scale> up) diff --git a/stdlib/source/test/lux/static.lux b/stdlib/source/test/lux/static.lux index 5748958f4..d67af6a0b 100644 --- a/stdlib/source/test/lux/static.lux +++ b/stdlib/source/test/lux/static.lux @@ -26,7 +26,7 @@ (for @.old (_.property "PLACEHOLDER" true)) (_.for [meta.eval]) (`` (all _.and - (~~ (with_template [<static> <random> <=> <+> <tag>] + (,, (with_template [<static> <random> <=> <+> <tag>] [(_.coverage [<static> <random>] (with_expansions [<left> (<random>) <right> (<random>) diff --git a/stdlib/source/test/lux/target/js.lux b/stdlib/source/test/lux/target/js.lux index 2494bf9b3..739381cf4 100644 --- a/stdlib/source/test/lux/target/js.lux +++ b/stdlib/source/test/lux/target/js.lux @@ -48,10 +48,10 @@ (try.else false))) (with_template [<range>] - [(`` (def (~~ (template.symbol ["as_int_" <range>])) + [(`` (def (,, (template.symbol ["as_int_" <range>])) (-> Int Int) (|>> (i64.and (static.nat (-- (i64.left_shifted <range> 1))))))) - (`` (def (~~ (template.symbol ["int_" <range>])) + (`` (def (,, (template.symbol ["int_" <range>])) (Random Int) (do [! random.monad] [negative? random.bit @@ -102,7 +102,7 @@ [left random.bit right random.bit] (`` (all _.and - (~~ (with_template [<js> <lux>] + (,, (with_template [<js> <lux>] [(_.coverage [<js>] (let [expected (<lux> left right)] (expression (|>> (as Bit) (bit#= expected)) @@ -123,7 +123,7 @@ random.safe_frac) subject random.safe_frac] (`` (all _.and - (~~ (with_template [<js> <lux>] + (,, (with_template [<js> <lux>] [(_.coverage [<js>] (let [expected (<lux> parameter subject)] (expression (|>> (as Frac) (f.= expected)) @@ -135,7 +135,7 @@ [/./ f./] [/.% f.%] )) - (~~ (with_template [<js> <lux>] + (,, (with_template [<js> <lux>] [(_.coverage [<js>] (let [expected (<lux> parameter subject)] (expression (|>> (as Bit) (bit#= expected)) @@ -159,7 +159,7 @@ i16 ..int_16 shift (at ! each (n.% 16) random.nat)] (`` (all _.and - (~~ (with_template [<js> <lux>] + (,, (with_template [<js> <lux>] [(_.coverage [<js>] (let [expected (<lux> left right)] (expression (|>> (as Frac) f.int (i.= expected)) @@ -411,7 +411,7 @@ (list (/.number number/0))))) )) (_.coverage [/.Access] - (`` (and (~~ (with_template [<js> <lux>] + (`` (and (,, (with_template [<js> <lux>] [(expression (|>> (as Frac) f.int (i.= (<lux> int/0))) (/.apply (/.closure (list $foreign) (all /.then @@ -781,7 +781,7 @@ (/.statement (/.+ $arg/0 $arg/0)) (/.return $arg/0))) (/.number number/0)))) - (~~ (with_template [<js> <lux>] + (,, (with_template [<js> <lux>] [(_.coverage [<js>] (expression (|>> (as Frac) f.int (i.= (<lux> int))) (/.apply_1 (/.closure (list $arg/0) diff --git a/stdlib/source/test/lux/target/lua.lux b/stdlib/source/test/lux/target/lua.lux index 738eb18c4..318f8ae57 100644 --- a/stdlib/source/test/lux/target/lua.lux +++ b/stdlib/source/test/lux/target/lua.lux @@ -79,7 +79,7 @@ [left random.bit right random.bit] (`` (all _.and - (~~ (with_template [</> <lux>] + (,, (with_template [</> <lux>] [(_.coverage [</>] (let [expected (<lux> left right)] (expression (|>> (as Bit) (bit#= expected)) @@ -94,7 +94,7 @@ )))) (with_template [<bits>] - [(`` (def (~~ (template.symbol [int_ <bits>])) + [(`` (def (,, (template.symbol [int_ <bits>])) (Random Int) (let [mask (|> 1 (i64.left_shifted (-- <bits>)) --)] (random#each (|>> (i64.and mask) .int) random.nat))))] @@ -114,7 +114,7 @@ random.int) subject random.int] (`` (all _.and - (~~ (with_template [</> <lux>] + (,, (with_template [</> <lux>] [(_.coverage [</>] (let [expected (<lux> left right)] (expression (|>> (as Int) (i.= expected)) @@ -153,7 +153,7 @@ random.safe_frac) subject random.safe_frac] (`` (all _.and - (~~ (with_template [</> <lux> <pre>] + (,, (with_template [</> <lux> <pre>] [(_.coverage [</>] (let [expected (<lux> (<pre> parameter) (<pre> subject))] (expression (|>> (as Frac) (f.= expected)) @@ -166,7 +166,7 @@ [/.% f.mod |>] [/.^ f.pow f.abs] )) - (~~ (with_template [</> <lux>] + (,, (with_template [</> <lux>] [(_.coverage [</>] (let [expected (<lux> parameter subject)] (expression (|>> (as Bit) (bit#= expected)) diff --git a/stdlib/source/test/lux/target/python.lux b/stdlib/source/test/lux/target/python.lux index 8e3fb3472..ac1d84974 100644 --- a/stdlib/source/test/lux/target/python.lux +++ b/stdlib/source/test/lux/target/python.lux @@ -86,7 +86,7 @@ [left random.bit right random.bit] (`` (all _.and - (~~ (with_template [</> <lux>] + (,, (with_template [</> <lux>] [(_.coverage [</>] (let [expected (<lux> left right)] (expression (|>> (as Bit) (bit#= expected)) @@ -107,7 +107,7 @@ random.safe_frac) subject random.safe_frac] (`` (all _.and - (~~ (with_template [</> <lux> <pre>] + (,, (with_template [</> <lux> <pre>] [(_.coverage [</>] (let [expected (<lux> (<pre> parameter) (<pre> subject))] (expression (|>> (as Frac) (f.= expected)) @@ -120,7 +120,7 @@ [/.% f.mod |>] [/.** f.pow f.abs] )) - (~~ (with_template [</> <lux>] + (,, (with_template [</> <lux>] [(_.coverage [</>] (let [expected (<lux> parameter subject)] (expression (|>> (as Bit) (bit#= expected)) @@ -160,7 +160,7 @@ i16 (at ! each ..int_16 random.int) shift (at ! each (n.% 16) random.nat)] (`` (all _.and - (~~ (with_template [</> <lux>] + (,, (with_template [</> <lux>] [(_.coverage [</>] (let [expected (<lux> left right)] (expression (|>> (as Frac) f.int (i.= expected)) @@ -170,7 +170,7 @@ [/.bit_xor i64.xor] [/.bit_and i64.and] )) - (~~ (with_template [</> <lux>] + (,, (with_template [</> <lux>] [(_.coverage [</>] (let [left (.int shift) right (i.* (.int shift) i16) @@ -451,7 +451,7 @@ field (at ! each /.string (random.upper_case 1))] (all _.and (_.coverage [/.item] - (`` (and (~~ (with_template [<seq>] + (`` (and (,, (with_template [<seq>] [(expression (|>> (as Frac) (f.= expected/0)) (/.item (/.int +0) (<seq> (list (/.float expected/0)))))] @@ -500,7 +500,7 @@ (as Frac) (f.= expected/0))) (_.coverage [/.multi] - (`` (and (~~ (with_template [<var> <value>] + (`` (and (,, (with_template [<var> <value>] [(|> (..statement (function (_ $output) (all /.then @@ -561,7 +561,7 @@ (function (_ $output) (all /.then (/.def $def (list $var/0) - (/.return (/.in? /.globals/0 (/.string (/.code $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)))) (/.set (list $var/0) (/.float dummy/0)) @@ -573,7 +573,7 @@ (function (_ $output) (all /.then (/.def $def (list $var/0) - (/.return (/.in? /.locals/0 (/.string (/.code $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))) (/.set (list $var/0) (/.float dummy/0)) @@ -758,7 +758,7 @@ (function (_ $output) (all /.then (/.def $def (list $input/0) - (/.return $input/0)) + (/.return $input/0)) (/.set (list $output) (/.apply (list (/.float expected/0)) $def))))) (as Frac) (f.= expected/0))) @@ -767,9 +767,9 @@ (function (_ $output) (all /.then (/.def $def (list) - (/.if (/.bool test) - (/.return (/.float then)) - (/.return (/.float else)))) + (/.if (/.bool test) + (/.return (/.float then)) + (/.return (/.float else)))) (/.set (list $output) (/.apply (list) $def))))) (as Frac) (f.= expected/?))) @@ -778,10 +778,10 @@ (function (_ $output) (all /.then (/.def $def (list) - (all /.then - (/.when (/.bool test) - (/.return (/.float then))) - (/.return (/.float else)))) + (all /.then + (/.when (/.bool test) + (/.return (/.float then))) + (/.return (/.float else)))) (/.set (list $output) (/.apply (list) $def))))) (as Frac) (f.= expected/?))) @@ -790,9 +790,9 @@ (function (_ $output) (all /.then (/.def $def (list) - (all /.then - (/.statement (/.+ (/.float expected/0) (/.float expected/0))) - (/.return (/.float expected/0)))) + (all /.then + (/.statement (/.+ (/.float expected/0) (/.float expected/0))) + (/.return (/.float expected/0)))) (/.set (list $output) (/.apply (list) $def))))) (as Frac) (f.= expected/0))) diff --git a/stdlib/source/test/lux/target/ruby.lux b/stdlib/source/test/lux/target/ruby.lux index 234fef0ef..d8c7d1605 100644 --- a/stdlib/source/test/lux/target/ruby.lux +++ b/stdlib/source/test/lux/target/ruby.lux @@ -90,7 +90,7 @@ [left random.bit right random.bit] (`` (all _.and - (~~ (with_template [</> <lux>] + (,, (with_template [</> <lux>] [(_.coverage [</>] (let [expected (<lux> left right)] (expression (|>> (as Bit) (bit#= expected)) @@ -111,7 +111,7 @@ random.safe_frac) subject random.safe_frac] (`` (all _.and - (~~ (with_template [</> <lux> <pre>] + (,, (with_template [</> <lux> <pre>] [(_.coverage [</>] (let [expected (<lux> (<pre> parameter) (<pre> subject))] (expression (|>> (as Frac) (f.= expected)) @@ -124,7 +124,7 @@ [/.% f.mod |>] [/.pow f.pow f.abs] )) - (~~ (with_template [</> <lux>] + (,, (with_template [</> <lux>] [(_.coverage [</>] (let [expected (<lux> parameter subject)] (expression (|>> (as Bit) (bit#= expected)) @@ -151,7 +151,7 @@ i16 (at ! each ..int_16 random.int) shift (at ! each (n.% 16) random.nat)] (`` (all _.and - (~~ (with_template [</> <lux>] + (,, (with_template [</> <lux>] [(_.coverage [</>] (let [expected (<lux> left right)] (expression (|>> (as Frac) f.int (i.= expected)) diff --git a/stdlib/source/test/lux/time.lux b/stdlib/source/test/lux/time.lux index 656dfcdbd..62c3ec43c 100644 --- a/stdlib/source/test/lux/time.lux +++ b/stdlib/source/test/lux/time.lux @@ -67,7 +67,7 @@ invalid_minute (|> valid_minute (n.+ /.minutes) (n.min 99)) invalid_second (|> valid_second (n.+ /.seconds) (n.min 99))]] (`` (all _.and - (~~ (with_template [<cap> <exception> <prefix> <suffix> <valid> <invalid>] + (,, (with_template [<cap> <exception> <prefix> <suffix> <valid> <invalid>] [(_.coverage [<cap> <exception>] (let [valid! (|> <valid> diff --git a/stdlib/source/test/lux/time/duration.lux b/stdlib/source/test/lux/time/duration.lux index c46204175..e73108548 100644 --- a/stdlib/source/test/lux/time/duration.lux +++ b/stdlib/source/test/lux/time/duration.lux @@ -83,7 +83,7 @@ (i.= +1 (/.ticks sample sample))) (_.coverage [/.milli_second] (#= /.empty (at /.enum pred /.milli_second))) - (~~ (with_template [<factor> <big> <small>] + (,, (with_template [<factor> <big> <small>] [(_.coverage [<big>] (|> <big> (/.ticks <small>) (i.= <factor>)))] diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/analysis.lux b/stdlib/source/test/lux/tool/compiler/language/lux/analysis.lux index 6fb6ebd02..487daeb16 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/analysis.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/analysis.lux @@ -97,7 +97,7 @@ {try.#Failure _} false)))) - (~~ (with_template [<query> <check> <random> <analysis> <=>] + (,, (with_template [<query> <check> <random> <analysis> <=>] [(do [! random.monad] [expected <random>] (_.coverage [<query>] @@ -248,7 +248,7 @@ _ false)) - (~~ (with_template [<tag> <expected>] + (,, (with_template [<tag> <expected>] [(_.coverage [<tag>] (case (<tag> <expected>) (pattern (<tag> actual)) @@ -302,7 +302,7 @@ expected_constant (/symbol.random 1 1) expected_variable /variable.random] (`` (all _.and - (~~ (with_template [<tag> <expected>] + (,, (with_template [<tag> <expected>] [(_.coverage [<tag>] (case (<tag> <expected>) (pattern (<tag> actual)) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/coverage.lux b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/coverage.lux index e6eb4333c..49dd92a3b 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/coverage.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/coverage.lux @@ -85,7 +85,7 @@ [it random.bit] (in [{/.#Bit it} {//pattern.#Simple {//simple.#Bit it}}])) - (~~ (with_template [<random> <hash> <coverage> <pattern>] + (,, (with_template [<random> <hash> <coverage> <pattern>] [(do random.monad [it <random>] (in [{<coverage> (set.of_list <hash> (list it))} @@ -267,7 +267,7 @@ (/.composite {/.#Exhaustive}) (try#each (/#= {/.#Exhaustive})) (try.else false)) - (~~ (with_template [<tag> <hash> <value> <next>] + (,, (with_template [<tag> <hash> <value> <next>] [(|> (/.composite {<tag> (set.of_list <hash> (list <value>))} {<tag> (set.of_list <hash> (list (|> <value> <next>)))}) (try#each (/#= {<tag> (set.of_list <hash> (list <value> (|> <value> <next>)))})) @@ -417,7 +417,7 @@ (_.coverage [/.redundancy] (let [redundant? (..failure? /.redundancy)] (`` (and (redundant? (/.composite {/.#Exhaustive} {/.#Exhaustive})) - (~~ (with_template [<it>] + (,, (with_template [<it>] [(redundant? (/.composite <it> <it>)) (redundant? (/.composite <it> {/.#Exhaustive}))] diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/inference.lux b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/inference.lux index 7387ce1bc..a1bae7897 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/inference.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/inference.lux @@ -84,7 +84,7 @@ (def .public simple_parameter (Random [Type Code]) (`` (all random.either - (~~ (with_template [<type> <random> <code>] + (,, (with_template [<type> <random> <code>] [(random#each (|>> <code> [<type>]) <random>)] [.Bit random.bit code.bit] @@ -270,7 +270,7 @@ (not (variant? (type_literal (Maybe type/0)) 0 #1 term/1))) only_bottom_conforms_to_tags_outside_of_range! - (`` (and (~~ (with_template [<verdict> <term>] + (`` (and (,, (with_template [<verdict> <term>] [(bit#= <verdict> (variant? variantT arity arbitrary_right? <term>))] [#0 term/0] @@ -293,7 +293,7 @@ 0 #0 (' [])) existential_types_affect_dependent_cases! - (`` (and (~~ (with_template [<verdict> <term>] + (`` (and (,, (with_template [<verdict> <term>] [(bit#= <verdict> (variant?' (type_literal (Ex (_ a) (Maybe a))) {.#None} 0 #1 <term>))] [#0 term/0] diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/module.lux b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/module.lux index 6880c5ad4..567992ebc 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/module.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/module.lux @@ -94,7 +94,7 @@ (try#each (..new? hash)) (try.else false))) (_.coverage [/.import] - (`` (and (~~ (with_template [<expected>] + (`` (and (,, (with_template [<expected>] [(|> (do [! /phase.monad] [_ (/.create hash expected_import) [it ?] (/.with hash name @@ -140,7 +140,7 @@ name (random.lower_case 1) hash random.nat] (`` (all _.and - (~~ (with_template [<set> <query> <not/0> <not/1>] + (,, (with_template [<set> <query> <not/0> <not/1>] [(_.coverage [<set> <query>] (|> (do [! /phase.monad] [[it ?] (/.with hash name @@ -159,7 +159,7 @@ [/.set_cached /.cached? /.active? /.compiled?] )) (_.coverage [/.can_only_change_state_of_active_module] - (and (~~ (with_template [<pre> <post>] + (and (,, (with_template [<pre> <post>] [(|> (/.with hash name (do /phase.monad [_ (<pre> name)] @@ -180,7 +180,7 @@ [/.set_cached /.set_cached] )))) (_.coverage [/.unknown_module] - (and (~~ (with_template [<set>] + (and (,, (with_template [<set>] [(|> (<set> name) (/phase.result state) (pipe.case @@ -220,7 +220,7 @@ alias {.#Alias [module_name def_name]}]] (all _.and (_.coverage [/.define] - (`` (and (~~ (with_template [<global>] + (`` (and (,, (with_template [<global>] [(|> (/.with hash module_name (/.define def_name <global>)) (/phase.result state) @@ -242,7 +242,7 @@ {try.#Success _} true {try.#Failure _} false))))) (_.coverage [/.cannot_define_more_than_once] - (`` (and (~~ (with_template [<global>] + (`` (and (,, (with_template [<global>] [(|> (/.with hash module_name (do /phase.monad [_ (/.define def_name <global>)] @@ -289,7 +289,7 @@ (at ! each set.list))] (all _.and (_.coverage [/.declare_labels] - (`` (and (~~ (with_template [<side> <record?> <query> <on_success>] + (`` (and (,, (with_template [<side> <record?> <query> <on_success>] [(|> (/.with hash module_name (do [! /phase.monad] [.let [it {.#Named [module_name def_name] def_type}] @@ -307,7 +307,7 @@ [.#Right true meta.slot true] [.#Right true meta.tag false]))))) (_.coverage [/.cannot_declare_labels_for_anonymous_type] - (`` (and (~~ (with_template [<side> <record?>] + (`` (and (,, (with_template [<side> <record?>] [(|> (/.with hash module_name (do [! /phase.monad] [.let [it def_type] @@ -324,7 +324,7 @@ [.#Left false] [.#Right true]))))) (_.coverage [/.cannot_declare_labels_for_foreign_type] - (`` (and (~~ (with_template [<side> <record?>] + (`` (and (,, (with_template [<side> <record?>] [(|> (/.with hash module_name (do [! /phase.monad] [.let [it {.#Named [foreign_module def_name] def_type}] diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/pattern.lux b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/pattern.lux index c79fae369..7c1ab849a 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/pattern.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/pattern.lux @@ -61,7 +61,7 @@ _ false)) - (~~ (with_template [<tag> <value>] + (,, (with_template [<tag> <value>] [(_.coverage [<tag>] (case (<tag> <value>) (pattern (<tag> actual)) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis.lux index 0c68a9690..fd16878b1 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis.lux @@ -80,7 +80,7 @@ (-> Lux Text [.Bit .Nat .Int .Rev .Frac .Text] Bit) (let [state [extension.#bundle (extension/analysis.bundle ..eval) extension.#state lux]] - (`` (and (~~ (with_template [<expected> <code> <type> <analysis>] + (`` (and (,, (with_template [<expected> <code> <type> <analysis>] [(|> (do phase.monad [[:it: it] (|> <expected> <code> @@ -139,7 +139,7 @@ (phase#each (|>> product.right product.right)) (phase.result state) (try.else false)) - (~~ (with_template [<lefts> <right> <expected> <tag> <code> <analysis>] + (,, (with_template [<lefts> <right> <expected> <tag> <code> <analysis>] [(|> (do phase.monad [it (|> (code.variant (list (code.nat <lefts>) (code.bit <right>) (<code> <expected>))) (/.phase ..expander archive.empty) @@ -253,7 +253,7 @@ (phase#each (|>> product.right product.right)) (phase.result state) (try.else false)) - (~~ (with_template [<lefts> <right> <expected> <tag> <code> <analysis>] + (,, (with_template [<lefts> <right> <expected> <tag> <code> <analysis>] [(|> (do phase.monad [_ (//module.declare_labels false tags/* false :variant:) [:it: it] (|> (code.variant (list (code.local <tag>) (<code> <expected>))) @@ -437,7 +437,7 @@ can_make_abstraction! (|> (do phase.monad - [[:it: it] (|> (` ([(~ $abstraction/0) (~ $parameter/0)] (~ (code.nat nat/0)))) + [[:it: it] (|> (` ([(, $abstraction/0) (, $parameter/0)] (, (code.nat nat/0)))) (/.phase ..expander archive.empty) //type.inferring)] (in (and (type#= (All (_ a) (-> a .Nat)) @@ -456,9 +456,9 @@ can_nest_abstraction! (|> (do phase.monad - [[:it: it] (|> (` ([(~ $abstraction/0) (~ $parameter/0)] - ([(~ $abstraction/1) (~ $parameter/1)] - (~ (code.nat nat/0))))) + [[:it: it] (|> (` ([(, $abstraction/0) (, $parameter/0)] + ([(, $abstraction/1) (, $parameter/1)] + (, (code.nat nat/0))))) (/.phase ..expander archive.empty) //type.inferring)] (in (and (type#= (All (_ a) (-> a (All (_ b) (-> b .Nat)))) @@ -477,9 +477,9 @@ can_refer_to_parameter! (|> (do phase.monad - [[:it: it] (|> (` ([(~ $abstraction/0) (~ $parameter/0)] - ([(~ $abstraction/1) (~ $parameter/1)] - (~ $parameter/1)))) + [[:it: it] (|> (` ([(, $abstraction/0) (, $parameter/0)] + ([(, $abstraction/1) (, $parameter/1)] + (, $parameter/1)))) (/.phase ..expander archive.empty) //type.inferring)] (in (and (type#= (All (_ a) (-> a (All (_ b) (-> b b)))) @@ -498,9 +498,9 @@ can_refer_to_closure! (|> (do phase.monad - [[:it: it] (|> (` ([(~ $abstraction/0) (~ $parameter/0)] - ([(~ $abstraction/1) (~ $parameter/1)] - (~ $parameter/0)))) + [[:it: it] (|> (` ([(, $abstraction/0) (, $parameter/0)] + ([(, $abstraction/1) (, $parameter/1)] + (, $parameter/0)))) (/.phase ..expander archive.empty) //type.inferring)] (in (and (case it @@ -524,9 +524,9 @@ can_refer_to_closure! ... TODO: Un-comment ... (|> (do phase.monad - ... [[:it: it] (|> (` ([(~ $abstraction/0) (~ $parameter/0)] - ... ([(~ $abstraction/1) (~ $parameter/1)] - ... (~ $abstraction/1)))) + ... [[:it: it] (|> (` ([(, $abstraction/0) (, $parameter/0)] + ... ([(, $abstraction/1) (, $parameter/1)] + ... (, $abstraction/1)))) ... (/.phase ..expander archive.empty) ... //type.inferring)] ... (in (case it @@ -542,9 +542,9 @@ ... (try.else false)) ... TODO: Un-comment ... (|> (do phase.monad - ... [[:it: it] (|> (` ([(~ $abstraction/0) (~ $parameter/0)] - ... ([(~ $abstraction/1) (~ $parameter/1)] - ... (~ $abstraction/0)))) + ... [[:it: it] (|> (` ([(, $abstraction/0) (, $parameter/0)] + ... ([(, $abstraction/1) (, $parameter/1)] + ... (, $abstraction/0)))) ... (/.phase ..expander archive.empty) ... //type.inferring)] ... (in (case it @@ -567,8 +567,8 @@ constant! (|> (do phase.monad - [[:it: it] (|> (` (([(~ $abstraction/0) (~ $parameter/0)] (~ (code.bit bit/0))) - (~ (code.nat nat/0)))) + [[:it: it] (|> (` (([(, $abstraction/0) (, $parameter/0)] (, (code.bit bit/0))) + (, (code.nat nat/0)))) (/.phase ..expander archive.empty) //type.inferring)] (in (and (type#= .Bit :it:) @@ -588,8 +588,8 @@ variable! (|> (do phase.monad - [[:it: it] (|> (` (([(~ $abstraction/0) (~ $parameter/0)] (~ $parameter/0)) - (~ (code.nat nat/0)))) + [[:it: it] (|> (` (([(, $abstraction/0) (, $parameter/0)] (, $parameter/0)) + (, (code.nat nat/0)))) (/.phase ..expander archive.empty) //type.inferring)] (in (and (type#= .Nat :it:) @@ -608,10 +608,10 @@ partial! (|> (do phase.monad - [[:it: it] (|> (` (([(~ $abstraction/0) (~ $parameter/0)] - ([(~ $abstraction/1) (~ $parameter/1)] - (~ (code.bit bit/0)))) - (~ (code.nat nat/0)))) + [[:it: it] (|> (` (([(, $abstraction/0) (, $parameter/0)] + ([(, $abstraction/1) (, $parameter/1)] + (, (code.bit bit/0)))) + (, (code.nat nat/0)))) (/.phase ..expander archive.empty) //type.inferring)] (in (and (check.subsumes? (All (_ a) (-> a Bit)) :it:) @@ -638,7 +638,7 @@ (let [state [extension.#bundle (extension/analysis.bundle ..eval) extension.#state lux]] (|> (do phase.monad - [[:it: it] (|> (` ("lux text concat" (~ (code.text text/0)) (~ (code.text text/0)))) + [[:it: it] (|> (` ("lux text concat" (, (code.text text/0)) (, (code.text text/0)))) (/.phase ..expander archive.empty) //type.inferring)] (in (and (type#= .Text :it:) @@ -669,9 +669,9 @@ slots/* (list @any @bit @nat @int @rev @frac @text) simple! - (`` (and (~~ (with_template [<input> <code> <analysis> <pattern>] + (`` (and (,, (with_template [<input> <code> <analysis> <pattern>] [(|> (do phase.monad - [[:it: it] (|> (` ({(~ $parameter/0) (~ (code.frac frac/0))} (~ (<code> <input>)))) + [[:it: it] (|> (` ({(, $parameter/0) (, (code.frac frac/0))} (, (<code> <input>)))) (/.phase ..expander archive.empty) //type.inferring)] (in (and (type#= .Frac :it:) @@ -691,12 +691,12 @@ (phase.result state) (try.else false)) (|> (do phase.monad - [[:it: it] (|> (` ({(~ (<code> <input>)) - (~ (code.frac frac/0)) + [[:it: it] (|> (` ({(, (<code> <input>)) + (, (code.frac frac/0)) - (~ $parameter/0) - (~ (code.frac frac/0))} - (~ (<code> <input>)))) + (, $parameter/0) + (, (code.frac frac/0))} + (, (<code> <input>)))) (/.phase ..expander archive.empty) //type.inferring)] (in (and (type#= .Frac :it:) @@ -729,11 +729,11 @@ bit! (|> (do phase.monad [[:it: it] (|> (` ({#0 - (~ (code.frac frac/0)) + (, (code.frac frac/0)) #1 - (~ (code.frac frac/0))} - (~ (code.bit bit/0)))) + (, (code.frac frac/0))} + (, (code.bit bit/0)))) (/.phase ..expander archive.empty) //type.inferring)] (in (and (type#= .Frac :it:) @@ -756,15 +756,15 @@ (try.else false)) variant! - (`` (and (~~ (with_template [<lefts> <right?> <expected> <tag> <code> <analysis> <pattern>] + (`` (and (,, (with_template [<lefts> <right?> <expected> <tag> <code> <analysis> <pattern>] [(|> (do phase.monad [_ (//module.declare_labels false tags/* false :variant:) - [:it: it] (|> (` ({{(~ (code.local <tag>)) (~ (<code> <expected>))} - (~ (code.frac frac/0)) + [:it: it] (|> (` ({{(, (code.local <tag>)) (, (<code> <expected>))} + (, (code.frac frac/0)) - (~ $parameter/0) - (~ (code.frac frac/0))} - {(~ (code.local <tag>)) (~ (<code> <expected>))})) + (, $parameter/0) + (, (code.frac frac/0))} + {(, (code.local <tag>)) (, (<code> <expected>))})) (/.phase ..expander archive.empty) //type.inferring)] (in (and (type#= .Frac :it:) @@ -797,13 +797,13 @@ tuple! (|> (do phase.monad - [[:it: it] (|> (` ({[#0 (~ $parameter/0)] - (~ (code.frac frac/0)) + [[:it: it] (|> (` ({[#0 (, $parameter/0)] + (, (code.frac frac/0)) - [#1 (~ $parameter/0)] - (~ (code.frac frac/0))} - [(~ (code.bit bit/0)) - (~ (code.nat nat/0))])) + [#1 (, $parameter/0)] + (, (code.frac frac/0))} + [(, (code.bit bit/0)) + (, (code.nat nat/0))])) (/.phase ..expander archive.empty) //type.inferring)] (in (and (type#= .Frac :it:) @@ -829,24 +829,24 @@ record! (|> (do phase.monad [_ (//module.declare_labels true slots/* false :record:) - [:it: it] (|> (` ({[(~ (code.symbol [module/0 @any])) [] - (~ (code.symbol [module/0 @bit])) (~ (code.bit bit/0)) - (~ (code.symbol [module/0 @nat])) (~ (code.nat nat/0)) - (~ (code.symbol [module/0 @int])) (~ (code.int int/0)) - (~ (code.symbol [module/0 @rev])) (~ (code.rev rev/0)) - (~ (code.symbol [module/0 @frac])) (~ (code.frac frac/0)) - (~ (code.symbol [module/0 @text])) (~ (code.text text/0))] - (~ (code.frac frac/0)) - - (~ $parameter/0) - (~ (code.frac frac/0))} - [(~ (code.local @any)) [] - (~ (code.local @bit)) (~ (code.bit bit/0)) - (~ (code.local @nat)) (~ (code.nat nat/0)) - (~ (code.local @int)) (~ (code.int int/0)) - (~ (code.local @rev)) (~ (code.rev rev/0)) - (~ (code.local @frac)) (~ (code.frac frac/0)) - (~ (code.local @text)) (~ (code.text text/0))])) + [:it: it] (|> (` ({[(, (code.symbol [module/0 @any])) [] + (, (code.symbol [module/0 @bit])) (, (code.bit bit/0)) + (, (code.symbol [module/0 @nat])) (, (code.nat nat/0)) + (, (code.symbol [module/0 @int])) (, (code.int int/0)) + (, (code.symbol [module/0 @rev])) (, (code.rev rev/0)) + (, (code.symbol [module/0 @frac])) (, (code.frac frac/0)) + (, (code.symbol [module/0 @text])) (, (code.text text/0))] + (, (code.frac frac/0)) + + (, $parameter/0) + (, (code.frac frac/0))} + [(, (code.local @any)) [] + (, (code.local @bit)) (, (code.bit bit/0)) + (, (code.local @nat)) (, (code.nat nat/0)) + (, (code.local @int)) (, (code.int int/0)) + (, (code.local @rev)) (, (code.rev rev/0)) + (, (code.local @frac)) (, (code.frac frac/0)) + (, (code.local @text)) (, (code.text text/0))])) (/.phase ..expander archive.empty) //type.inferring)] (in (and (type#= .Frac :it:) @@ -936,7 +936,7 @@ (..can_analyse_pattern_matching! lux module/0 [@any @bit @nat @int @rev @frac @text] [bit/0 nat/0 int/0 rev/0 frac/0 text/0] $parameter/0) )) (_.coverage [/.invalid] - (`` (and (~~ (with_template [<syntax>] + (`` (and (,, (with_template [<syntax>] [(|> (do phase.monad [_ (|> <syntax> (/.phase ..expander archive.empty) @@ -948,14 +948,14 @@ (phase.result state) (exception.otherwise (text.contains? (the exception.#label /.invalid))))] - [(` ({#0} (~ (code.bit bit/0))))] - [(` ({#0 [] #1} (~ (code.bit bit/0))))] - [(` {(~ (code.bit bit/0)) (~ (code.nat nat/0)) (~ (code.int int/0)) (~ (code.rev rev/0)) (~ (code.frac frac/0)) (~ (code.text text/0))})] - [(` {(~ (code.nat nat/0)) (~ (code.int int/0)) (~ (code.rev rev/0)) (~ (code.frac frac/0)) (~ (code.text text/0)) (~ (code.bit bit/0))})] - [(` {(~ (code.int int/0)) (~ (code.rev rev/0)) (~ (code.frac frac/0)) (~ (code.text text/0)) (~ (code.bit bit/0)) (~ (code.nat nat/0))})] - [(` {(~ (code.rev rev/0)) (~ (code.frac frac/0)) (~ (code.text text/0)) (~ (code.bit bit/0)) (~ (code.nat nat/0)) (~ (code.int int/0))})] - [(` {(~ (code.frac frac/0)) (~ (code.text text/0)) (~ (code.bit bit/0)) (~ (code.nat nat/0)) (~ (code.int int/0)) (~ (code.rev rev/0))})] - [(` {(~ (code.text text/0)) (~ (code.bit bit/0)) (~ (code.nat nat/0)) (~ (code.int int/0)) (~ (code.rev rev/0)) (~ (code.frac frac/0))})] + [(` ({#0} (, (code.bit bit/0))))] + [(` ({#0 [] #1} (, (code.bit bit/0))))] + [(` {(, (code.bit bit/0)) (, (code.nat nat/0)) (, (code.int int/0)) (, (code.rev rev/0)) (, (code.frac frac/0)) (, (code.text text/0))})] + [(` {(, (code.nat nat/0)) (, (code.int int/0)) (, (code.rev rev/0)) (, (code.frac frac/0)) (, (code.text text/0)) (, (code.bit bit/0))})] + [(` {(, (code.int int/0)) (, (code.rev rev/0)) (, (code.frac frac/0)) (, (code.text text/0)) (, (code.bit bit/0)) (, (code.nat nat/0))})] + [(` {(, (code.rev rev/0)) (, (code.frac frac/0)) (, (code.text text/0)) (, (code.bit bit/0)) (, (code.nat nat/0)) (, (code.int int/0))})] + [(` {(, (code.frac frac/0)) (, (code.text text/0)) (, (code.bit bit/0)) (, (code.nat nat/0)) (, (code.int int/0)) (, (code.rev rev/0))})] + [(` {(, (code.text text/0)) (, (code.bit bit/0)) (, (code.nat nat/0)) (, (code.int int/0)) (, (code.rev rev/0)) (, (code.frac frac/0))})] )) ))) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux index 35da92ea5..b905363d0 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux @@ -170,9 +170,9 @@ [$binding/0 body/0])))) handles_singletons! - (and (case? simple/0 (list [(` [(~ $binding/0)]) body/0])) - (case? simple/0 (list [(` [(~ simple/0)]) body/0] - [(` [(~ $binding/0)]) body/0])) + (and (case? simple/0 (list [(` [(, $binding/0)]) body/0])) + (case? simple/0 (list [(` [(, simple/0)]) body/0] + [(` [(, $binding/0)]) body/0])) (case? (code.bit bit/0) (list [(` [#0]) body/0] [(` [#1]) body/0]))) @@ -225,26 +225,26 @@ (case? simple/0 (list [simple/0 body/0] [$binding/0 body/0])) - (case? (` [(~ simple/0) (~ simple/1) (~ simple/2)]) + (case? (` [(, simple/0) (, simple/1) (, simple/2)]) (list [$binding/0 body/0])) - (case? (` [(~ simple/0) (~ simple/1) (~ simple/2)]) - (list [(` [(~ $binding/0) (~ $binding/1)]) body/0])) - (case? (` [(~ simple/0) (~ simple/1) (~ simple/2)]) - (list [(` [(~ simple/0) (~ simple/1) (~ simple/2)]) body/0] + (case? (` [(, simple/0) (, simple/1) (, simple/2)]) + (list [(` [(, $binding/0) (, $binding/1)]) body/0])) + (case? (` [(, simple/0) (, simple/1) (, simple/2)]) + (list [(` [(, simple/0) (, simple/1) (, simple/2)]) body/0] ... 000 - [(` [(~ $binding/0) (~ simple/1) (~ simple/2)]) body/0] + [(` [(, $binding/0) (, simple/1) (, simple/2)]) body/0] ... 001 - [(` [(~ simple/0) (~ $binding/1) (~ simple/2)]) body/0] + [(` [(, simple/0) (, $binding/1) (, simple/2)]) body/0] ... 010 - [(` [(~ $binding/0) (~ $binding/1) (~ simple/2)]) body/0] + [(` [(, $binding/0) (, $binding/1) (, simple/2)]) body/0] ... 011 - [(` [(~ simple/0) (~ simple/1) (~ $binding/2)]) body/0] + [(` [(, simple/0) (, simple/1) (, $binding/2)]) body/0] ... 100 - [(` [(~ $binding/0) (~ simple/1) (~ $binding/2)]) body/0] + [(` [(, $binding/0) (, simple/1) (, $binding/2)]) body/0] ... 101 - [(` [(~ simple/0) (~ $binding/1) (~ $binding/2)]) body/0] + [(` [(, simple/0) (, $binding/1) (, $binding/2)]) body/0] ... 110 - [(` [(~ $binding/0) (~ $binding/1) (~ $binding/2)]) body/0] + [(` [(, $binding/0) (, $binding/1) (, $binding/2)]) body/0] ... 111 ))))) @@ -285,18 +285,18 @@ [$binding/0 body/0])) (redundant? simple/0 (list [$binding/0 body/0] [simple/0 body/0])) - (redundant? (` [(~ simple/0) (~ simple/1) (~ simple/2)]) + (redundant? (` [(, simple/0) (, simple/1) (, simple/2)]) (list [$binding/0 body/0] [$binding/0 body/0])) - (redundant? (` [(~ simple/0) (~ simple/1) (~ simple/2)]) - (list [(` [(~ $binding/0) (~ $binding/1)]) body/0] - [(` [(~ $binding/0) (~ $binding/1)]) body/0])) - (redundant? (` [(~ simple/0) (~ simple/1) (~ simple/2)]) - (list [(` [(~ $binding/0) (~ $binding/1)]) body/0] + (redundant? (` [(, simple/0) (, simple/1) (, simple/2)]) + (list [(` [(, $binding/0) (, $binding/1)]) body/0] + [(` [(, $binding/0) (, $binding/1)]) body/0])) + (redundant? (` [(, simple/0) (, simple/1) (, simple/2)]) + (list [(` [(, $binding/0) (, $binding/1)]) body/0] [$binding/0 body/0])) - (redundant? (` [(~ simple/0) (~ simple/1) (~ simple/2)]) + (redundant? (` [(, simple/0) (, simple/1) (, simple/2)]) (list [$binding/0 body/0] - [(` [(~ $binding/0) (~ $binding/1)]) body/0]))))) + [(` [(, $binding/0) (, $binding/1)]) body/0]))))) (def (test|variant lux [module/0 name/0] [input/0 simple/0] [input/1 simple/1] [input/2 simple/2] [$binding/0 $binding/1 $binding/2] [output/0 body/0] [output/1 body/1] [bit/0 nat/0]) (-> Lux Symbol [Type Code] [Type Code] [Type Code] [Code Code Code] [Type Code] [Type Code] [Bit Nat] Bit) @@ -328,40 +328,40 @@ (try.else false)))) can_bind! - (and (variant? (` {(~ tag/0) (~ simple/0)}) + (and (variant? (` {(, tag/0) (, simple/0)}) (list [$binding/0 body/0])) - (variant? (` {(~ tag/1) (~ simple/1)}) + (variant? (` {(, tag/1) (, simple/1)}) (list [$binding/0 body/0])) - (variant? (` {(~ tag/2) (~ simple/2)}) + (variant? (` {(, tag/2) (, simple/2)}) (list [$binding/0 body/0]))) can_bind_variant! - (variant? (` {(~ tag/0) (~ simple/0)}) - (list [(` {(~ tag/0) (~ $binding/0)}) body/0] - [(` {(~ tag/1) (~ $binding/1)}) body/0] - [(` {(~ tag/2) (~ $binding/2)}) body/0])) + (variant? (` {(, tag/0) (, simple/0)}) + (list [(` {(, tag/0) (, $binding/0)}) body/0] + [(` {(, tag/1) (, $binding/1)}) body/0] + [(` {(, tag/2) (, $binding/2)}) body/0])) can_bind_sum! - (variant? (` {(~ tag/0) (~ simple/0)}) - (list [(` {0 #0 (~ $binding/0)}) body/0] - [(` {1 #0 (~ $binding/1)}) body/0] - [(` {1 #1 (~ $binding/2)}) body/0])) + (variant? (` {(, tag/0) (, simple/0)}) + (list [(` {0 #0 (, $binding/0)}) body/0] + [(` {1 #0 (, $binding/1)}) body/0] + [(` {1 #1 (, $binding/2)}) body/0])) can_check_exhaustiveness! - (variant? (` {(~ tag/0) (~ simple/0)}) - (list [(` {(~ tag/0) (~ simple/0)}) body/0] - [(` {(~ tag/0) (~ $binding/0)}) body/0] + (variant? (` {(, tag/0) (, simple/0)}) + (list [(` {(, tag/0) (, simple/0)}) body/0] + [(` {(, tag/0) (, $binding/0)}) body/0] - [(` {(~ tag/1) (~ simple/1)}) body/0] - [(` {(~ tag/1) (~ $binding/1)}) body/0] + [(` {(, tag/1) (, simple/1)}) body/0] + [(` {(, tag/1) (, $binding/1)}) body/0] - [(` {(~ tag/2) (~ simple/2)}) body/0] - [(` {(~ tag/2) (~ $binding/2)}) body/0])) + [(` {(, tag/2) (, simple/2)}) body/0] + [(` {(, tag/2) (, $binding/2)}) body/0])) can_bind_partial_variant! - (variant? (` {(~ tag/0) (~ simple/0)}) - (list [(` {(~ tag/0) (~ $binding/0)}) body/0] - [(` {0 #1 (~ $binding/1)}) body/0]))] + (variant? (` {(, tag/0) (, simple/0)}) + (list [(` {(, tag/0) (, $binding/0)}) body/0] + [(` {0 #1 (, $binding/1)}) body/0]))] (and can_bind! can_bind_variant! can_bind_sum! @@ -399,92 +399,92 @@ (try.else false)))) can_bind! - (record? (` [(~ slot/0) (~ simple/0) - (~ slot/1) (~ simple/1) - (~ slot/2) (~ simple/2)]) + (record? (` [(, slot/0) (, simple/0) + (, slot/1) (, simple/1) + (, slot/2) (, simple/2)]) (list [$binding/0 body/0])) can_bind_record! - (record? (` [(~ slot/0) (~ simple/0) - (~ slot/1) (~ simple/1) - (~ slot/2) (~ simple/2)]) - (list [(` [(~ slot/0) (~ $binding/0) - (~ slot/1) (~ $binding/1) - (~ slot/2) (~ $binding/2)]) body/0])) + (record? (` [(, slot/0) (, simple/0) + (, slot/1) (, simple/1) + (, slot/2) (, simple/2)]) + (list [(` [(, slot/0) (, $binding/0) + (, slot/1) (, $binding/1) + (, slot/2) (, $binding/2)]) body/0])) can_bind_tuple! - (record? (` [(~ slot/0) (~ simple/0) - (~ slot/1) (~ simple/1) - (~ slot/2) (~ simple/2)]) - (list [(` [(~ $binding/0) (~ $binding/1) (~ $binding/2)]) body/0])) + (record? (` [(, slot/0) (, simple/0) + (, slot/1) (, simple/1) + (, slot/2) (, simple/2)]) + (list [(` [(, $binding/0) (, $binding/1) (, $binding/2)]) body/0])) can_deduce_record! - (record? (` [(~ simple/0) - (~ simple/1) - (~ simple/2)]) - (list [(` [(~ slot/0) (~ $binding/0) - (~ slot/1) (~ $binding/1) - (~ slot/2) (~ $binding/2)]) body/0])) + (record? (` [(, simple/0) + (, simple/1) + (, simple/2)]) + (list [(` [(, slot/0) (, $binding/0) + (, slot/1) (, $binding/1) + (, slot/2) (, $binding/2)]) body/0])) can_check_exhaustiveness! - (record? (` [(~ slot/0) (~ simple/0) - (~ slot/1) (~ simple/1) - (~ slot/2) (~ simple/2)]) - (list [(` [(~ slot/0) (~ simple/0) - (~ slot/1) (~ simple/1) - (~ slot/2) (~ simple/2)]) body/0] + (record? (` [(, slot/0) (, simple/0) + (, slot/1) (, simple/1) + (, slot/2) (, simple/2)]) + (list [(` [(, slot/0) (, simple/0) + (, slot/1) (, simple/1) + (, slot/2) (, simple/2)]) body/0] ... 000 - [(` [(~ slot/0) (~ $binding/0) - (~ slot/1) (~ simple/1) - (~ slot/2) (~ simple/2)]) body/0] + [(` [(, slot/0) (, $binding/0) + (, slot/1) (, simple/1) + (, slot/2) (, simple/2)]) body/0] ... 001 - [(` [(~ slot/0) (~ simple/0) - (~ slot/1) (~ $binding/1) - (~ slot/2) (~ simple/2)]) body/0] + [(` [(, slot/0) (, simple/0) + (, slot/1) (, $binding/1) + (, slot/2) (, simple/2)]) body/0] ... 010 - [(` [(~ slot/0) (~ $binding/0) - (~ slot/1) (~ $binding/1) - (~ slot/2) (~ simple/2)]) body/0] + [(` [(, slot/0) (, $binding/0) + (, slot/1) (, $binding/1) + (, slot/2) (, simple/2)]) body/0] ... 011 - [(` [(~ slot/0) (~ simple/0) - (~ slot/1) (~ simple/1) - (~ slot/2) (~ $binding/2)]) body/0] + [(` [(, slot/0) (, simple/0) + (, slot/1) (, simple/1) + (, slot/2) (, $binding/2)]) body/0] ... 100 - [(` [(~ slot/0) (~ $binding/0) - (~ slot/1) (~ simple/1) - (~ slot/2) (~ $binding/2)]) body/0] + [(` [(, slot/0) (, $binding/0) + (, slot/1) (, simple/1) + (, slot/2) (, $binding/2)]) body/0] ... 101 - [(` [(~ slot/0) (~ simple/0) - (~ slot/1) (~ $binding/1) - (~ slot/2) (~ $binding/2)]) body/0] + [(` [(, slot/0) (, simple/0) + (, slot/1) (, $binding/1) + (, slot/2) (, $binding/2)]) body/0] ... 110 - [(` [(~ slot/0) (~ $binding/0) - (~ slot/1) (~ $binding/1) - (~ slot/2) (~ $binding/2)]) body/0] + [(` [(, slot/0) (, $binding/0) + (, slot/1) (, $binding/1) + (, slot/2) (, $binding/2)]) body/0] ... 111 )) cannot_repeat_slot! - (not (record? (` [(~ slot/0) (~ simple/0) - (~ slot/1) (~ simple/1) - (~ slot/2) (~ simple/2)]) - (list [(` [(~ slot/0) (~ $binding/0) - (~ slot/1) (~ $binding/1) - (~ slot/2) (~ $binding/2) - (~ slot/2) (~ $binding/2)]) body/0]))) + (not (record? (` [(, slot/0) (, simple/0) + (, slot/1) (, simple/1) + (, slot/2) (, simple/2)]) + (list [(` [(, slot/0) (, $binding/0) + (, slot/1) (, $binding/1) + (, slot/2) (, $binding/2) + (, slot/2) (, $binding/2)]) body/0]))) cannot_omit_slot! - (not (record? (` [(~ slot/0) (~ simple/0) - (~ slot/1) (~ simple/1) - (~ slot/2) (~ simple/2)]) - (list [(` [(~ slot/0) (~ $binding/0) - (~ slot/1) (~ $binding/1)]) body/0]))) + (not (record? (` [(, slot/0) (, simple/0) + (, slot/1) (, simple/1) + (, slot/2) (, simple/2)]) + (list [(` [(, slot/0) (, $binding/0) + (, slot/1) (, $binding/1)]) body/0]))) can_bind_partial_tuple! - (record? (` [(~ slot/0) (~ simple/0) - (~ slot/1) (~ simple/1) - (~ slot/2) (~ simple/2)]) - (list [(` [(~ $binding/0) (~ $binding/1)]) body/0]))] + (record? (` [(, slot/0) (, simple/0) + (, slot/1) (, simple/1) + (, slot/2) (, simple/2)]) + (list [(` [(, $binding/0) (, $binding/1)]) body/0]))] (and can_bind! can_bind_record! can_bind_tuple! @@ -558,11 +558,11 @@ (//phase#each (|>> product.right product.right)) (//phase.result state) (exception.otherwise (text.contains? (the exception.#label /.invalid))))))] - (and (invalid? (list [(` ((~ extension/0) (~ $binding/0) (~ $binding/1) (~ $binding/2))) + (and (invalid? (list [(` ((, extension/0) (, $binding/0) (, $binding/1) (, $binding/2))) body/0])) - (invalid? (list [(` {(~ extension/0) (~ $binding/0) (~ $binding/1) (~ $binding/2)}) + (invalid? (list [(` {(, extension/0) (, $binding/0) (, $binding/1) (, $binding/2)}) body/0])) - (invalid? (list [(` {[] (~ $binding/0) (~ $binding/1) (~ $binding/2)}) + (invalid? (list [(` {[] (, $binding/0) (, $binding/1) (, $binding/2)}) body/0]))))) (_.coverage [/.sum_has_no_case] (let [tag/0 (%.code $binding/0) @@ -577,12 +577,12 @@ tag/2 (code.symbol [module/0 tag/2])] (|> (do //phase.monad [_ (//module.declare_labels false tags/* false :variant:) - analysis (|> (` {(~ tag/0) (~ simple/0)}) + analysis (|> (` {(, tag/0) (, simple/0)}) (/.case ..analysis - (list [(` {0 #0 (~ $binding/0)}) body/0] - [(` {1 #0 (~ $binding/1)}) body/0] - [(` {2 #0 (~ $binding/2)}) body/0] - [(` {2 #1 (~ $binding/2)}) body/0]) + (list [(` {0 #0 (, $binding/0)}) body/0] + [(` {1 #0 (, $binding/1)}) body/0] + [(` {2 #0 (, $binding/2)}) body/0] + [(` {2 #1 (, $binding/2)}) body/0]) archive.empty) (//type.expecting output/0))] (in false)) @@ -603,11 +603,11 @@ slot/1 (code.symbol [module/0 slot/1]) slot/2 (code.symbol [module/0 slot/2])] (and (|> (do //phase.monad - [analysis (|> (` (~ simple/0)) + [analysis (|> (` (, simple/0)) (/.case ..analysis - (list [(` {0 #0 (~ $binding/0)}) body/0] - [(` {1 #0 (~ $binding/1)}) body/0] - [(` {1 #1 (~ $binding/2)}) body/0]) + (list [(` {0 #0 (, $binding/0)}) body/0] + [(` {1 #0 (, $binding/1)}) body/0] + [(` {1 #1 (, $binding/2)}) body/0]) archive.empty) (//type.expecting output/0))] (in false)) @@ -618,11 +618,11 @@ (exception.otherwise (text.contains? (the exception.#label /.mismatch)))) (|> (do //phase.monad [_ (//module.declare_labels true slots/* false :record:) - analysis (|> (` (~ simple/0)) + analysis (|> (` (, simple/0)) (/.case ..analysis - (list [(` [(~ slot/0) (~ $binding/0) - (~ slot/1) (~ $binding/1) - (~ slot/2) (~ $binding/2)]) body/0]) + (list [(` [(, slot/0) (, $binding/0) + (, slot/1) (, $binding/1) + (, slot/2) (, $binding/2)]) body/0]) archive.empty) (//type.expecting output/0))] (in false)) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/complex.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/complex.lux index 29da6a3cd..f8f6e693c 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/complex.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/complex.lux @@ -90,7 +90,7 @@ (def simple_parameter (Random [Type Code]) (`` (all random.either - (~~ (with_template [<type> <random> <code>] + (,, (with_template [<type> <random> <code>] [(random#each (|>> <code> [<type>]) <random>)] [.Bit random.bit code.bit] diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/function.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/function.lux index 421c41900..8c2212df4 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/function.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/function.lux @@ -134,7 +134,7 @@ (function? (type_literal ((Ex (_ a) (-> a a)) output/0)) term/0) (not (function? (type_literal ((Ex (_ a) (-> a a)) output/1)) term/0)) - (function?' (-> input/0 input/1 input/0) (` ([(~ $function/1) (~ $argument/1)] (~ $argument/0))) + (function?' (-> input/0 input/1 input/0) (` ([(, $function/1) (, $argument/1)] (, $argument/0))) (function (_ [outer body]) (and (list.empty? outer) (case body @@ -143,7 +143,7 @@ _ false)))) - (function?' (-> input/0 input/1 input/1) (` ([(~ $function/1) (~ $argument/1)] (~ $argument/1))) + (function?' (-> input/0 input/1 input/1) (` ([(, $function/1) (, $argument/1)] (, $argument/1))) (function (_ [outer body]) (and (list.empty? outer) (case body @@ -173,9 +173,9 @@ (inferring? (All (_ a) (-> a output/0)) term/0) (inferring? (All (_ a) (-> a a)) $argument/0) (inferring? (All (_ @0) (-> @0 @0 (And .Bit @0))) - (` ([(~ $function/1) (~ $argument/1)] - [("lux is" (~ $argument/0) (~ $argument/1)) - (~ $argument/1)])))))) + (` ([(, $function/1) (, $argument/1)] + [("lux is" (, $argument/0) (, $argument/1)) + (, $argument/1)])))))) (_.coverage [/.cannot_analyse] (|> (do //phase.monad [analysis (|> (/.function ..analysis function/0 argument/0 archive.empty diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/simple.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/simple.lux index 5f7769239..6db157abb 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/simple.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/simple.lux @@ -89,7 +89,7 @@ (_.coverage [/.unit] (..analysis state module .Any /.unit (|>> (pipe.case (pattern (/analysis.unit)) true _ false)))) - (~~ (with_template [<analysis> <type> <random> <tag>] + (,, (with_template [<analysis> <type> <random> <tag>] [(do ! [sample <random>] (_.coverage [<analysis>] diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux index a3b9b281d..4876aa0be 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux @@ -37,7 +37,7 @@ (-> Text (List Code) Type Bit) (|> (////scope.with_scope "" (////type.with_type output_type - (_primitive.phase archive.empty (` ((~ (code.text procedure)) (~+ params)))))) + (_primitive.phase archive.empty (` ((, (code.text procedure)) (,* params)))))) (phase.result _primitive.state) (pipe.case {try.#Success _} diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/loop.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/loop.lux index 83fc7eee2..40db9835c 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/loop.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/loop.lux @@ -29,7 +29,7 @@ (def (primitive offset arity next) (Scenario Synthesis) (`` (all random.either - (~~ (with_template [<synthesis> <random>] + (,, (with_template [<synthesis> <random>] [(do [! random.monad] [example (at ! each (|>> <synthesis>) <random>)] (in [next @@ -72,7 +72,7 @@ (def (reference offset arity next) (Scenario Synthesis) (`` (all random.either - (~~ (with_template [<tag> <random>] + (,, (with_template [<tag> <random>] [(do [! random.monad] [[next [exampleE exampleA]] (<random> offset arity next)] (in [next @@ -115,7 +115,7 @@ (random#in [next [//.path/pop //.path/pop]]) - (~~ (with_template [<path> <random>] + (,, (with_template [<path> <random>] [(do [! random.monad] [example (at ! each (|>> <path>) <random>)] (in [next @@ -127,7 +127,7 @@ [//.path/f64 random.frac] [//.path/text (random.unicode 1)] )) - (~~ (with_template [<path>] + (,, (with_template [<path>] [(do [! random.monad] [example (at ! each (|>> <path>) (random.or random.nat diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/primitive.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/primitive.lux index 50526091e..f45fe8dd9 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/primitive.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/primitive.lux @@ -45,7 +45,7 @@ (def .public (corresponds? analysis synthesis) (-> Analysis Synthesis Bit) (`` (case [analysis synthesis] - (~~ (with_template [<analysis> <post_analysis> <synthesis> <post_synthesis>] + (,, (with_template [<analysis> <post_analysis> <synthesis> <post_synthesis>] [[{////analysis.#Primitive {<analysis> expected}} {////synthesis.#Primitive {<synthesis> actual}}] (same? (|> expected <post_analysis>) @@ -75,7 +75,7 @@ Test (<| (_.context (%.symbol (symbol ////synthesis.#Primitive))) (`` (all _.and - (~~ (with_template [<analysis> <synthesis> <generator>] + (,, (with_template [<analysis> <synthesis> <generator>] [(do r.monad [expected <generator>] (_.property (%.symbol (symbol <synthesis>)) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/variable.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/variable.lux index 11b308c86..85cb4dedc 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/variable.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/variable.lux @@ -179,7 +179,7 @@ {synthesis.#Seq {synthesis.#Pop} {synthesis.#Then actual_then}}}]))) (all random.either - (~~ (with_template [<tag> <random>] + (,, (with_template [<tag> <random>] [(do [! random.monad] [test <random> [expected_then actual_then] (scenario context)] diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/syntax.lux b/stdlib/source/test/lux/tool/compiler/language/lux/syntax.lux index 98b9a71fd..a87bcbd66 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/syntax.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/syntax.lux @@ -107,7 +107,7 @@ (def comment_text^ (Random Text) - (let [char_gen (|> r.nat (r.only (|>> (n.= (`` (char (~~ (static text.new_line))))) not)))] + (let [char_gen (|> r.nat (r.only (|>> (n.= (`` (char (,, (static text.new_line))))) not)))] (do r.monad [size (|> r.nat (r#each (n.% 20)))] (r.text char_gen size)))) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/synthesis.lux b/stdlib/source/test/lux/tool/compiler/language/lux/synthesis.lux index f0efbce19..9f69c7972 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/synthesis.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/synthesis.lux @@ -66,7 +66,7 @@ (def simple Test (`` (all _.and - (~~ (with_template [<query> <check> <random> <synthesis> <equivalence>] + (,, (with_template [<query> <check> <random> <synthesis> <equivalence>] [(do [! random.monad] [expected <random> dummy (|> <random> (random.only (|>> (at <equivalence> = expected) not)))] diff --git a/stdlib/source/test/lux/tool/compiler/meta/archive/registry.lux b/stdlib/source/test/lux/tool/compiler/meta/archive/registry.lux index a2d2d77bf..2e863466c 100644 --- a/stdlib/source/test/lux/tool/compiler/meta/archive/registry.lux +++ b/stdlib/source/test/lux/tool/compiler/meta/archive/registry.lux @@ -78,7 +78,7 @@ _ false))) - (~~ (with_template [<new> <expected>' <query> <tag> <wrong_new> <wrong_expected>'] + (,, (with_template [<new> <expected>' <query> <tag> <wrong_new> <wrong_expected>'] [(_.coverage [<new> <query>] (let [<expected> <expected>' <wrong_expected> <wrong_expected>'] @@ -119,7 +119,7 @@ [/.custom expected_name /.customs category.#Custom /.definition (is category.Definition [expected_name {.#None}])] )) (_.coverage [/.id] - (and (~~ (with_template [<new> <expected>' <name>] + (and (,, (with_template [<new> <expected>' <name>] [(let [<expected> <expected>' [@expected registry] (<new> <expected> mandatory? expected_dependencies /.empty)] (|> (/.id (<name> <expected>) registry) @@ -134,7 +134,7 @@ [/.custom expected_name |>] )))) (_.coverage [/.artifacts] - (and (~~ (with_template [<new> <query> <equivalence> <$>] + (and (,, (with_template [<new> <query> <equivalence> <$>] [(let [expected/* (list#each <$> expected_names) [ids registry] (is [(Sequence artifact.ID) /.Registry] (list#mix (function (_ expected [ids registry]) @@ -159,7 +159,7 @@ [/.custom /.customs text.equivalence (|>>)] )))) (_.coverage [/.format /.parser] - (and (~~ (with_template [<new> <expected>' <name>] + (and (,, (with_template [<new> <expected>' <name>] [(let [<expected> <expected>' [@expected before] (<new> <expected> mandatory? expected_dependencies /.empty)] (|> before diff --git a/stdlib/source/test/lux/tool/compiler/meta/cache/module.lux b/stdlib/source/test/lux/tool/compiler/meta/cache/module.lux index 0dd66344f..bce9082e5 100644 --- a/stdlib/source/test/lux/tool/compiler/meta/cache/module.lux +++ b/stdlib/source/test/lux/tool/compiler/meta/cache/module.lux @@ -21,7 +21,7 @@ (`` (def (bad it) (-> (file.System Async) (file.System Async)) (implementation - (~~ (with_template [<name>] + (,, (with_template [<name>] [(def <name> (at it <name>))] diff --git a/stdlib/source/test/lux/tool/compiler/meta/cli.lux b/stdlib/source/test/lux/tool/compiler/meta/cli.lux index dcf28757f..28bc83c3b 100644 --- a/stdlib/source/test/lux/tool/compiler/meta/cli.lux +++ b/stdlib/source/test/lux/tool/compiler/meta/cli.lux @@ -56,7 +56,7 @@ (all _.and (_.for [/.Compilation] (`` (all _.and - (~~ (with_template [<type> <slot> <?>] + (,, (with_template [<type> <slot> <?>] [(_.coverage [<type>] (|> (list.partial "build" compilation') (<program>.result /.service) @@ -80,7 +80,7 @@ )) ))) (_.coverage [/.Interpretation] - (`` (and (~~ (with_template [<slot> <?>] + (`` (and (,, (with_template [<slot> <?>] [(|> (list.partial "repl" compilation') (<program>.result /.service) (try#each (|>> (pipe.case @@ -102,7 +102,7 @@ [/.#configuration (configuration#= configuration)] ))))) (_.coverage [/.Export] - (`` (and (~~ (with_template [<side> <?>] + (`` (and (,, (with_template [<side> <?>] [(|> (list.partial "export" export) (<program>.result /.service) (try#each (|>> (pipe.case @@ -119,7 +119,7 @@ [product.right (same? target)] ))))) (_.coverage [/.target] - (`` (and (~~ (with_template [<it>] + (`` (and (,, (with_template [<it>] [(same? target (/.target <it>))] [{/.#Compilation [/.#host_dependencies host_dependencies diff --git a/stdlib/source/test/lux/tool/compiler/meta/context.lux b/stdlib/source/test/lux/tool/compiler/meta/context.lux index 66837e5a3..d6ecdceec 100644 --- a/stdlib/source/test/lux/tool/compiler/meta/context.lux +++ b/stdlib/source/test/lux/tool/compiler/meta/context.lux @@ -41,7 +41,7 @@ (/.python target) (/.ruby target)) maximum (list.size contexts)] - (`` (and (~~ (with_template [<amount> <slot>] + (`` (and (,, (with_template [<amount> <slot>] [(|> contexts (list#each (the <slot>)) (set.of_list text.hash) diff --git a/stdlib/source/test/lux/tool/compiler/reference.lux b/stdlib/source/test/lux/tool/compiler/reference.lux index 73b499525..9204b53a8 100644 --- a/stdlib/source/test/lux/tool/compiler/reference.lux +++ b/stdlib/source/test/lux/tool/compiler/reference.lux @@ -49,7 +49,7 @@ (_.for [/.hash] ($hash.spec /.hash ..random)) - (~~ (with_template [<tag>] + (,, (with_template [<tag>] [(_.coverage [<tag>] (case (<tag> expected_register) (pattern (<tag> actual_register)) diff --git a/stdlib/source/test/lux/tool/compiler/version.lux b/stdlib/source/test/lux/tool/compiler/version.lux index c2824f567..24e40bd56 100644 --- a/stdlib/source/test/lux/tool/compiler/version.lux +++ b/stdlib/source/test/lux/tool/compiler/version.lux @@ -30,7 +30,7 @@ (_.coverage [/.format] (bit#= (n.= this that) (text#= (/.format this) (/.format that)))) - (~~ (with_template [<level>] + (,, (with_template [<level>] [(_.coverage [<level>] (text.contains? (%.nat (<level> this)) (/.format this)))] diff --git a/stdlib/source/test/lux/world/input/keyboard.lux b/stdlib/source/test/lux/world/input/keyboard.lux index fdb0dda38..25b652db6 100644 --- a/stdlib/source/test/lux/world/input/keyboard.lux +++ b/stdlib/source/test/lux/world/input/keyboard.lux @@ -112,10 +112,10 @@ /.f24]])] (def listing (List /.Key) - (list.together (`` (list (~~ (with_template [<definition> <keys>] + (list.together (`` (list (,, (with_template [<definition> <keys>] [((is (-> Any (List /.Key)) (function (_ _) - (`` (list (~~ (template.spliced <keys>)))))) + (`` (list (,, (template.spliced <keys>)))))) [])] <groups>)))))) @@ -148,14 +148,14 @@ (<| (_.covering /._) (_.for [/.Key]) (`` (all _.and - (~~ (with_template [<definition> <keys>] + (,, (with_template [<definition> <keys>] [<definition>] <groups>)) (_.for [/.Press] (`` (all _.and - (~~ (with_template [<pressed?> <function>] + (,, (with_template [<pressed?> <function>] [(do random.monad [key ..random .let [sample (<function> key)]] diff --git a/stdlib/source/test/lux/world/net/http/client.lux b/stdlib/source/test/lux/world/net/http/client.lux index ee7ed16d2..bd73d7e87 100644 --- a/stdlib/source/test/lux/world/net/http/client.lux +++ b/stdlib/source/test/lux/world/net/http/client.lux @@ -98,7 +98,7 @@ [/.options on_options] [/.trace on_trace])] (`` (all _.and - (~~ (with_template [<definition> <expected>] + (,, (with_template [<definition> <expected>] [(_.coverage [<definition>] (|> (<definition> "" //.empty {.#None} mock) (verification io.monad <expected>) @@ -114,13 +114,13 @@ dictionary.size))) (in (do [! async.monad] [.let [mock (/.async mock)] - (~~ (with_template [<definition> <expected>] + (,, (with_template [<definition> <expected>] [<expected> (|> (<definition> "" //.empty {.#None} mock) (verification ! <expected>))] <cases>))] (_.coverage' [/.async] - (and (~~ (with_template [<definition> <expected>] + (and (,, (with_template [<definition> <expected>] [<expected>] <cases>)))))) diff --git a/stdlib/source/test/lux/world/net/http/status.lux b/stdlib/source/test/lux/world/net/http/status.lux index 1dfd7833b..7e890002b 100644 --- a/stdlib/source/test/lux/world/net/http/status.lux +++ b/stdlib/source/test/lux/world/net/http/status.lux @@ -84,10 +84,10 @@ /.network_authentication_required]])] (def all (List //.Status) - (list.together (`` (list (~~ (with_template [<category> <status+>] + (list.together (`` (list (,, (with_template [<category> <status+>] [((is (-> Any (List //.Status)) (function (_ _) - (`` (list (~~ (template.spliced <status+>)))))) + (`` (list (,, (template.spliced <status+>)))))) 123)] <categories>)))))) @@ -112,7 +112,7 @@ Test (<| (_.covering /._) (`` (.all _.and - (~~ (with_template [<category> <status+>] + (,, (with_template [<category> <status+>] [<category>] <categories>)) |