diff options
Diffstat (limited to '')
-rw-r--r-- | stdlib/source/test/lux.lux | 50 | ||||
-rw-r--r-- | stdlib/source/test/lux/data/color/named.lux | 2 | ||||
-rw-r--r-- | stdlib/source/test/lux/data/text/encoding.lux | 2 | ||||
-rw-r--r-- | stdlib/source/test/lux/data/text/unicode/block.lux | 2 | ||||
-rw-r--r-- | stdlib/source/test/lux/debug.lux | 4 | ||||
-rw-r--r-- | stdlib/source/test/lux/documentation.lux | 2 | ||||
-rw-r--r-- | stdlib/source/test/lux/extension.lux | 14 | ||||
-rw-r--r-- | stdlib/source/test/lux/macro/template.lux | 48 | ||||
-rw-r--r-- | stdlib/source/test/lux/math/number/frac.lux | 8 | ||||
-rw-r--r-- | stdlib/source/test/lux/target.lux | 28 | ||||
-rw-r--r-- | stdlib/source/test/lux/type/abstract.lux | 2 | ||||
-rw-r--r-- | stdlib/source/test/lux/type/poly/equivalence.lux | 4 | ||||
-rw-r--r-- | stdlib/source/test/lux/type/poly/functor.lux | 4 | ||||
-rw-r--r-- | stdlib/source/test/lux/type/poly/json.lux | 4 | ||||
-rw-r--r-- | stdlib/source/test/lux/world/input/keyboard.lux | 2 | ||||
-rw-r--r-- | stdlib/source/test/lux/world/net/http/client.lux | 2 | ||||
-rw-r--r-- | stdlib/source/test/lux/world/net/http/status.lux | 2 | ||||
-rw-r--r-- | stdlib/source/test/lux/world/output/video/resolution.lux | 42 |
18 files changed, 111 insertions, 111 deletions
diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux index 576f6e9b9..d7a2ac3eb 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 "_" - (~~ (.for "{old}" (~~ (.as_is ["[1]/[0]" jvm])) - "JVM" (~~ (.as_is ["[1]/[0]" jvm])) - "JavaScript" (~~ (.as_is ["[1]/[0]" js])) - "Lua" (~~ (.as_is ["[1]/[0]" lua])) - "Python" (~~ (.as_is ["[1]/[0]" python])) - "Ruby" (~~ (.as_is ["[1]/[0]" ruby])) - (~~ (.as_is))))]]))) + (~~ (.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 Test @@ -422,7 +422,7 @@ (same? (is Any macro)))) (_.cover [/.macro:] (same? expected (..identity_macro expected))) - (~~ (for @.old (~~ (as_is)) + (~~ (for @.old (~~ (these)) (_.cover [/.Source] (..found_crosshair?)))) (_.cover [/.macro] @@ -844,23 +844,23 @@ dummy random.nat .let [expected (n.+ left right)]] ($_ _.and - (_.cover [/.as_is] - (`` (and (~~ (as_is true + (_.cover [/.these] + (`` (and (~~ (these true true true))))) (_.cover [/.with_expansions] - (/.with_expansions [<operands> (as_is left right)] + (/.with_expansions [<operands> (these left right)] (n.= expected (n.+ <operands>)))) (_.cover [/.comment] (/.with_expansions [<dummy> (/.comment dummy) - <operands> (as_is left right)] + <operands> (these left right)] (n.= expected ($_ n.+ <operands> <dummy>)))) (_.cover [/.``] (n.= expected (/.`` ($_ n.+ - (~~ (as_is left right)) + (~~ (these left right)) (~~ (/.comment dummy)))))) (_.cover [/.for] (and (n.= expected @@ -1116,8 +1116,8 @@ (bit#= /.private /.local))) )) -(for @.old (as_is) - (as_is (syntax: (for_bindings|test [fn/0 <code>.local +(for @.old (these) + (these (syntax: (for_bindings|test [fn/0 <code>.local var/0 <code>.local let/0 <code>.local @@ -1221,8 +1221,8 @@ ..for_def: ..for_meta ..for_export - (~~ (for @.old (~~ (as_is)) - (~~ (as_is ..for_bindings)))) + (~~ (for @.old (~~ (these)) + (~~ (these ..for_bindings)))) )))) (def: test @@ -1254,14 +1254,14 @@ /world.test /ffi.test - (~~ (for @.old (~~ (as_is)) - (~~ (as_is /extension.test)))) - (~~ (for @.jvm (~~ (as_is /target/jvm.test)) - @.old (~~ (as_is /target/jvm.test)) - @.js (~~ (as_is /target/js.test)) - @.lua (~~ (as_is /target/lua.test)) - @.python (~~ (as_is /target/python.test)) - @.ruby (~~ (as_is /target/ruby.test)))) + (~~ (for @.old (~~ (these)) + (~~ (these /extension.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/data/color/named.lux b/stdlib/source/test/lux/data/color/named.lux index e7be0c11e..2c9d336a4 100644 --- a/stdlib/source/test/lux/data/color/named.lux +++ b/stdlib/source/test/lux/data/color/named.lux @@ -18,7 +18,7 @@ ["[0]" / ["/[1]" //]]]) -(with_expansions [<colors> (as_is [letter/a +(with_expansions [<colors> (these [letter/a [/.alice_blue /.antique_white ... /.aqua diff --git a/stdlib/source/test/lux/data/text/encoding.lux b/stdlib/source/test/lux/data/text/encoding.lux index c8410b813..6317fef10 100644 --- a/stdlib/source/test/lux/data/text/encoding.lux +++ b/stdlib/source/test/lux/data/text/encoding.lux @@ -25,7 +25,7 @@ ["[0]" / "_" ["[1][0]" utf8]]) -(with_expansions [<encodings> (as_is [all/a +(with_expansions [<encodings> (these [all/a [/.ascii]] [all/ibm<700 diff --git a/stdlib/source/test/lux/data/text/unicode/block.lux b/stdlib/source/test/lux/data/text/unicode/block.lux index b54ec0d9c..4e3de67c4 100644 --- a/stdlib/source/test/lux/data/text/unicode/block.lux +++ b/stdlib/source/test/lux/data/text/unicode/block.lux @@ -29,7 +29,7 @@ additional (# ! each (n.% 1,000,000) random.nat)] (in (/.block start additional)))) -(with_expansions [<blocks> (as_is [blocks/0 +(with_expansions [<blocks> (these [blocks/0 [/.basic_latin /.latin_1_supplement /.latin_extended_a diff --git a/stdlib/source/test/lux/debug.lux b/stdlib/source/test/lux/debug.lux index fdf83aaa7..d8b81370d 100644 --- a/stdlib/source/test/lux/debug.lux +++ b/stdlib/source/test/lux/debug.lux @@ -245,8 +245,8 @@ bar random.nat baz random.bit] (_.cover [/.here] - (with_expansions [<no_parameters> (for @.js (~~ (as_is)) - (~~ (as_is (/.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 9e6566d91..8e6fd65d2 100644 --- a/stdlib/source/test/lux/documentation.lux +++ b/stdlib/source/test/lux/documentation.lux @@ -38,7 +38,7 @@ (with_expansions ['definition_description' (..description) 'sub_description' (..description) 'super_description' (..description)] - (as_is (def: .public g!default + (these (def: .public g!default Nat 123) diff --git a/stdlib/source/test/lux/extension.lux b/stdlib/source/test/lux/extension.lux index 410d006b4..f07656314 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" (~~ (.as_is ["[1]" bytecode] + (~~ (.for "JVM" (~~ (.these ["[1]" bytecode] ["[0]" class] ["[0]" version] [encoding ["[0]" name]])) - (~~ (.as_is))))]] + (~~ (.these))))]] [abstract ["[0]" monad {"+" do}]] [control @@ -55,9 +55,9 @@ ["[0]" type]] [phase [generation - (~~ (.for "JVM" (~~ (.as_is ["[0]" jvm "_" + (~~ (.for "JVM" (~~ (.these ["[0]" jvm "_" ["[1]/[0]" runtime]])) - (~~ (.as_is))))]]]]]] + (~~ (.these))))]]]]]] ["_" test {"+" Test}]]] [\\library ["[0]" / {"+" analysis: synthesis: generation: directive:}]]))) @@ -77,15 +77,15 @@ ... Generation (for @.old - (as_is) + (these) - (as_is + (these (for @.python ... TODO: Remove this hack once Jython is no longer being used as the Python interpreter. (analysis: ("dummy dum dum" self phase archive []) (undefined)) - (as_is)) + (these)) ... Analysis (analysis: (..analysis self phase archive [pass_through <code>.any]) diff --git a/stdlib/source/test/lux/macro/template.lux b/stdlib/source/test/lux/macro/template.lux index ca5cf4149..6bdbc04fd 100644 --- a/stdlib/source/test/lux/macro/template.lux +++ b/stdlib/source/test/lux/macro/template.lux @@ -1,26 +1,26 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}]] - [control - ["[0]" try] - ["[0]" exception] - [parser - ["<[0]>" code]]] - [data - [collection - ["[0]" list]]] - ["[0]" macro - [syntax {"+" syntax:}] - ["[0]" code]] - [math - ["[0]" random {"+" Random}] - [number - ["[0]" nat]]]]] - [\\library - ["[0]" /]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}]] + [control + ["[0]" try] + ["[0]" exception] + [parser + ["<[0]>" code]]] + [data + [collection + ["[0]" list]]] + ["[0]" macro + [syntax {"+" syntax:}] + ["[0]" code]] + [math + ["[0]" random {"+" Random}] + [number + ["[0]" nat]]]]] + [\\library + ["[0]" /]]) (/.let [(!pow/2 <scalar>) [(nat.* <scalar> <scalar>)]] @@ -44,9 +44,9 @@ [left random.nat mid random.nat right random.nat] - (with_expansions [<module> (as_is [.5 -4 +3 2 #1 #0 c b "a"]) + (with_expansions [<module> (these [.5 -4 +3 2 #1 #0 c b "a"]) <module>' ".5-4+32#1#0cba" - <short> (as_is ["a" b c #0 #1 2 +3 -4 .5]) + <short> (these ["a" b c #0 #1 2 +3 -4 .5]) <short>' "abc#0#12+3-4.5"] ($_ _.and (_.cover [/.spliced] diff --git a/stdlib/source/test/lux/math/number/frac.lux b/stdlib/source/test/lux/math/number/frac.lux index 9f1064796..4aec70f14 100644 --- a/stdlib/source/test/lux/math/number/frac.lux +++ b/stdlib/source/test/lux/math/number/frac.lux @@ -120,13 +120,13 @@ )) ))) -(with_expansions [<jvm> (as_is (ffi.import: java/lang/Double +(with_expansions [<jvm> (these (ffi.import: java/lang/Double "[1]::[0]" ("static" doubleToRawLongBits [double] long) ("static" longBitsToDouble [long] double)))] - (for @.old (as_is <jvm>) - @.jvm (as_is <jvm>) - (as_is))) + (for @.old (these <jvm>) + @.jvm (these <jvm>) + (these))) (def: margin_of_error +0.0000001) diff --git a/stdlib/source/test/lux/target.lux b/stdlib/source/test/lux/target.lux index fd6dd73a0..351271072 100644 --- a/stdlib/source/test/lux/target.lux +++ b/stdlib/source/test/lux/target.lux @@ -1,19 +1,19 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [data - ["[0]" text] - [collection - ["[0]" list] - ["[0]" set {"+" Set}]]] - [math - [number - ["n" nat]]]]] - [\\library - ["[0]" /]]) + [library + [lux "*" + ["_" test {"+" Test}] + [data + ["[0]" text] + [collection + ["[0]" list] + ["[0]" set {"+" Set}]]] + [math + [number + ["n" nat]]]]] + [\\library + ["[0]" /]]) -(with_expansions [<targets> (as_is /.old +(with_expansions [<targets> (these /.old /.js /.jvm /.lua diff --git a/stdlib/source/test/lux/type/abstract.lux b/stdlib/source/test/lux/type/abstract.lux index 8bae5b3bc..27c6e97c4 100644 --- a/stdlib/source/test/lux/type/abstract.lux +++ b/stdlib/source/test/lux/type/abstract.lux @@ -24,7 +24,7 @@ ["[0]" /]]) (template.with_locals [g!Foo g!Bar] - (as_is (template [<syntax> <meta>] + (these (template [<syntax> <meta>] [(syntax: (<syntax> []) (do meta.monad [frame <meta>] diff --git a/stdlib/source/test/lux/type/poly/equivalence.lux b/stdlib/source/test/lux/type/poly/equivalence.lux index 1b1695122..02c94b58e 100644 --- a/stdlib/source/test/lux/type/poly/equivalence.lux +++ b/stdlib/source/test/lux/type/poly/equivalence.lux @@ -76,8 +76,8 @@ (random.unicode size)) gen_recursive))) -(for @.old (as_is) - (as_is (def: equivalence +(for @.old (these) + (these (def: equivalence (Equivalence ..Record) (/.equivalence ..Record)))) diff --git a/stdlib/source/test/lux/type/poly/functor.lux b/stdlib/source/test/lux/type/poly/functor.lux index 727f658af..b7debe316 100644 --- a/stdlib/source/test/lux/type/poly/functor.lux +++ b/stdlib/source/test/lux/type/poly/functor.lux @@ -14,8 +14,8 @@ [data ["[0]" identity]]]]) -(for @.old (as_is) - (as_is (def: maybe_functor +(for @.old (these) + (these (def: maybe_functor (Functor .Maybe) (/.functor .Maybe)) diff --git a/stdlib/source/test/lux/type/poly/json.lux b/stdlib/source/test/lux/type/poly/json.lux index 16300a25d..38b36eecf 100644 --- a/stdlib/source/test/lux/type/poly/json.lux +++ b/stdlib/source/test/lux/type/poly/json.lux @@ -107,8 +107,8 @@ ..qty ))) -(for @.old (as_is) - (as_is (def: equivalence +(for @.old (these) + (these (def: equivalence (Equivalence Record) (poly/equivalence.equivalence Record)) diff --git a/stdlib/source/test/lux/world/input/keyboard.lux b/stdlib/source/test/lux/world/input/keyboard.lux index 97ebb59ac..5553373d7 100644 --- a/stdlib/source/test/lux/world/input/keyboard.lux +++ b/stdlib/source/test/lux/world/input/keyboard.lux @@ -20,7 +20,7 @@ [\\library ["[0]" /]]) -(with_expansions [<groups> (as_is [keys/commands +(with_expansions [<groups> (these [keys/commands [/.back_space /.enter /.shift diff --git a/stdlib/source/test/lux/world/net/http/client.lux b/stdlib/source/test/lux/world/net/http/client.lux index 1ab2b0a1d..aee92d1a0 100644 --- a/stdlib/source/test/lux/world/net/http/client.lux +++ b/stdlib/source/test/lux/world/net/http/client.lux @@ -88,7 +88,7 @@ //.#body (function (_ ?wanted_bytes) (io.io {try.#Success [(binary.size data) data]}))]]})))))]] - (with_expansions [<cases> (as_is [/.post on_post] + (with_expansions [<cases> (these [/.post on_post] [/.get on_get] [/.put on_put] [/.patch on_patch] diff --git a/stdlib/source/test/lux/world/net/http/status.lux b/stdlib/source/test/lux/world/net/http/status.lux index f6c5a32ab..b9018fda1 100644 --- a/stdlib/source/test/lux/world/net/http/status.lux +++ b/stdlib/source/test/lux/world/net/http/status.lux @@ -15,7 +15,7 @@ ["[0]" / ["/[1]" //]]]) -(with_expansions [<categories> (as_is [informational +(with_expansions [<categories> (these [informational [/.continue /.switching_protocols /.processing diff --git a/stdlib/source/test/lux/world/output/video/resolution.lux b/stdlib/source/test/lux/world/output/video/resolution.lux index b4a9cebfd..9e2ac6c29 100644 --- a/stdlib/source/test/lux/world/output/video/resolution.lux +++ b/stdlib/source/test/lux/world/output/video/resolution.lux @@ -1,26 +1,26 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}] - [\\specification - ["$[0]" equivalence] - ["$[0]" hash]]] - [control - ["[0]" maybe]] - [data - [collection - ["[0]" list] - ["[0]" set {"+" Set}]]] - [math - ["[0]" random {"+" Random}] - [number - ["n" nat]]]]] - [\\library - ["[0]" /]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}] + [\\specification + ["$[0]" equivalence] + ["$[0]" hash]]] + [control + ["[0]" maybe]] + [data + [collection + ["[0]" list] + ["[0]" set {"+" Set}]]] + [math + ["[0]" random {"+" Random}] + [number + ["n" nat]]]]] + [\\library + ["[0]" /]]) -(with_expansions [<resolutions> (as_is /.svga +(with_expansions [<resolutions> (these /.svga /.wsvga /.xga /.xga+ |