diff options
Diffstat (limited to '')
20 files changed, 65 insertions, 65 deletions
diff --git a/stdlib/source/library/lux/target/common_lisp.lux b/stdlib/source/library/lux/target/common_lisp.lux index 06fca5f8c..aeb290691 100644 --- a/stdlib/source/library/lux/target/common_lisp.lux +++ b/stdlib/source/library/lux/target/common_lisp.lux @@ -120,7 +120,7 @@ (def safe (-> Text Text) - (`` (|>> (~~ (with_template [<find> <replace>] + (`` (|>> (,, (with_template [<find> <replace>] [(text.replaced <find> <replace>)] ["\" "\\"] @@ -202,16 +202,16 @@ body))) (with_template [<call> <input_var>+ <input_type>+ <function>+] - [(`` (def .public (<call> [(~~ (template.spliced <input_var>+))] function) - (-> [(~~ (template.spliced <input_type>+))] (Expression Any) (Computation Any)) - (..call/* function (list (~~ (template.spliced <input_var>+)))))) + [(`` (def .public (<call> [(,, (template.spliced <input_var>+))] function) + (-> [(,, (template.spliced <input_type>+))] (Expression Any) (Computation Any)) + (..call/* function (list (,, (template.spliced <input_var>+)))))) (`` (with_template [<lux_name> <host_name>] [(def .public (<lux_name> args) - (-> [(~~ (template.spliced <input_type>+))] (Computation Any)) + (-> [(,, (template.spliced <input_type>+))] (Computation Any)) (<call> args (..var <host_name>)))] - (~~ (template.spliced <function>+))))] + (,, (template.spliced <function>+))))] [call/0 [] [] [[get_universal_time/0 "get-universal-time"] @@ -266,10 +266,10 @@ (with_template [<call> <input_type>+ <function>+] [(`` (with_template [<lux_name> <host_name>] [(def .public (<lux_name> args) - (-> [(~~ (template.spliced <input_type>+))] (Access Any)) + (-> [(,, (template.spliced <input_type>+))] (Access Any)) (transmutation (<call> args (..var <host_name>))))] - (~~ (template.spliced <function>+))))] + (,, (template.spliced <function>+))))] [call/1 [(Expression Any)] [[car/1 "car"] diff --git a/stdlib/source/library/lux/target/js.lux b/stdlib/source/library/lux/target/js.lux index 0c275562d..29816e610 100644 --- a/stdlib/source/library/lux/target/js.lux +++ b/stdlib/source/library/lux/target/js.lux @@ -1,6 +1,6 @@ (.require [library - [lux (.except Location Code Label or and function if undefined for comment not int try ++ -- the type_of at) + [lux (.except Location Code Label or and function if undefined for comment not int try ++ -- the type_of at ,) [control ["[0]" pipe]] [data @@ -44,7 +44,7 @@ (with_template [<type> <super>+] [(with_expansions [<brand> (template.symbol [<type> "'"])] (primitive (<brand> brand) Any) - (`` (type .public <type> (|> Any <brand> (~~ (template.spliced <super>+))))))] + (`` (type .public <type> (|> Any <brand> (,, (template.spliced <super>+))))))] [Expression [Code]] [Computation [Expression' Code]] @@ -55,7 +55,7 @@ (with_template [<type> <super>+] [(with_expansions [<brand> (template.symbol [<type> "'"])] (primitive <brand> Any) - (`` (type .public <type> (|> <brand> (~~ (template.spliced <super>+))))))] + (`` (type .public <type> (|> <brand> (,, (template.spliced <super>+))))))] [Var [Location' Computation' Expression' Code]] [Access [Location' Computation' Expression' Code]] @@ -95,7 +95,7 @@ (def safe (-> Text Text) - (`` (|>> (~~ (with_template [<replace> <find>] + (`` (|>> (,, (with_template [<replace> <find>] [(text.replaced <find> <replace>)] ["\\" "\"] @@ -427,14 +427,14 @@ (with_template [<apply> <arg>+ <type>+ <function>+] [(`` (def .public (<apply> function) - (-> Expression (~~ (template.spliced <type>+)) Computation) - (.function (_ (~~ (template.spliced <arg>+))) - (..apply function (list (~~ (template.spliced <arg>+))))))) + (-> Expression (,, (template.spliced <type>+)) Computation) + (.function (_ (,, (template.spliced <arg>+))) + (..apply function (list (,, (template.spliced <arg>+))))))) (`` (with_template [<definition> <function>] [(def .public <definition> (<apply> (..var <function>)))] - (~~ (template.spliced <function>+))))] + (,, (template.spliced <function>+))))] [apply_1 [_0] [Expression] [[not_a_number? "isNaN"]]] diff --git a/stdlib/source/library/lux/target/jvm/bytecode.lux b/stdlib/source/library/lux/target/jvm/bytecode.lux index 267705aa7..ca0c92f65 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode.lux @@ -696,7 +696,7 @@ (-> Nat (Bytecode Any)) (with_expansions [<specials>' (template.spliced <specials>)] (`` (case local - (~~ (with_template [<case> <instruction> <registry>] + (,, (with_template [<case> <instruction> <registry>] [<case> (..bytecode $0 <size> <registry> <instruction> [])] <specials>')) @@ -736,7 +736,7 @@ (-> Nat (Bytecode Any)) (with_expansions [<specials>' (template.spliced <specials>)] (`` (case local - (~~ (with_template [<case> <instruction> <registry>] + (,, (with_template [<case> <instruction> <registry>] [<case> (..bytecode <size> $0 <registry> <instruction> [])] <specials>')) diff --git a/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux b/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux index 3b613b206..f9e9d4b07 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux @@ -487,7 +487,7 @@ (let [[estimator <arity>'] <arity>] [estimator (function (_ [<input_names>]) - (`` (<arity>' (hex <code>) (~~ (template.spliced <arity_inputs>)))))])))] + (`` (<arity>' (hex <code>) (,, (template.spliced <arity_inputs>)))))])))] <definitions>' ))] diff --git a/stdlib/source/library/lux/target/jvm/class.lux b/stdlib/source/library/lux/target/jvm/class.lux index d018f832f..bd9fdd41b 100644 --- a/stdlib/source/library/lux/target/jvm/class.lux +++ b/stdlib/source/library/lux/target/jvm/class.lux @@ -130,7 +130,7 @@ (def .public (format class) (Format Class) (`` (all binaryF#composite - (~~ (with_template [<format> <slot>] + (,, (with_template [<format> <slot>] [(<format> (the <slot> class))] [//magic.format #magic] @@ -140,7 +140,7 @@ [//modifier.format #modifier] [//index.format #this] [//index.format #super])) - (~~ (with_template [<format> <slot>] + (,, (with_template [<format> <slot>] [((binaryF.sequence_16 <format>) (the <slot> class))] [//index.format #interfaces] diff --git a/stdlib/source/library/lux/target/jvm/constant.lux b/stdlib/source/library/lux/target/jvm/constant.lux index ae57d805f..fbd207bdc 100644 --- a/stdlib/source/library/lux/target/jvm/constant.lux +++ b/stdlib/source/library/lux/target/jvm/constant.lux @@ -117,8 +117,8 @@ [(def <format_name> (Format <type>) (`` (|>> representation - (~~ (template.spliced <write>)) - (~~ (template.spliced <format>)))))] + (,, (template.spliced <write>)) + (,, (template.spliced <format>)))))] [integer_format Integer [] [binaryF.bits_32]] [float_format Float [java/lang/Float::floatToRawIntBits ffi.of_int .i64] [i32.i32 binaryF.bits_32]] diff --git a/stdlib/source/library/lux/target/jvm/field.lux b/stdlib/source/library/lux/target/jvm/field.lux index 44cbaee15..e0561b457 100644 --- a/stdlib/source/library/lux/target/jvm/field.lux +++ b/stdlib/source/library/lux/target/jvm/field.lux @@ -52,7 +52,7 @@ (def .public (format field) (Format Field) (`` (all binaryF#composite - (~~ (with_template [<format> <slot>] + (,, (with_template [<format> <slot>] [(<format> (the <slot> field))] [modifier.format #modifier] diff --git a/stdlib/source/library/lux/target/jvm/method.lux b/stdlib/source/library/lux/target/jvm/method.lux index 7fe3c2d7b..3db1be9bc 100644 --- a/stdlib/source/library/lux/target/jvm/method.lux +++ b/stdlib/source/library/lux/target/jvm/method.lux @@ -101,7 +101,7 @@ (def .public (format field) (Format Method) (`` (all \\format#composite - (~~ (with_template [<format> <slot>] + (,, (with_template [<format> <slot>] [(<format> (the <slot> field))] [//modifier.format #modifier] diff --git a/stdlib/source/library/lux/target/jvm/modifier.lux b/stdlib/source/library/lux/target/jvm/modifier.lux index b12b167cc..b76d05904 100644 --- a/stdlib/source/library/lux/target/jvm/modifier.lux +++ b/stdlib/source/library/lux/target/jvm/modifier.lux @@ -85,9 +85,9 @@ (syntax (_ [ofT <code>.any options (<>.many <code>.any)]) (with_symbols [g!modifier g!code] - (in (list (` (with_template [(~ g!code) (~ g!modifier)] - [(def (~' .public) (~ g!modifier) - (..Modifier (~ ofT)) - ((~! ..modifier) ((~! number.hex) (~ g!code))))] + (in (list (` (with_template [(, g!code) (, g!modifier)] + [(def (,' .public) (, g!modifier) + (..Modifier (, ofT)) + ((,! ..modifier) ((,! number.hex) (, g!code))))] - (~+ options)))))))) + (,* options)))))))) diff --git a/stdlib/source/library/lux/target/jvm/reflection.lux b/stdlib/source/library/lux/target/jvm/reflection.lux index 7a5bdebc0..cf38c5efa 100644 --- a/stdlib/source/library/lux/target/jvm/reflection.lux +++ b/stdlib/source/library/lux/target/jvm/reflection.lux @@ -134,7 +134,7 @@ (let [class_name (|> class (as (java/lang/Class java/lang/Object)) java/lang/Class::getName)] - (`` (if (or (~~ (with_template [<reflection>] + (`` (if (or (,, (with_template [<reflection>] [(text#= (/reflection.reflection <reflection>) class_name)] @@ -225,7 +225,7 @@ (let [class_name (|> reflection (as (java/lang/Class java/lang/Object)) java/lang/Class::getName)] - (`` (cond (~~ (with_template [<reflection> <type>] + (`` (cond (,, (with_template [<reflection> <type>] [(text#= (/reflection.reflection <reflection>) class_name) {try.#Success <type>}] diff --git a/stdlib/source/library/lux/target/jvm/type.lux b/stdlib/source/library/lux/target/jvm/type.lux index 9b90e6c28..f9944b0eb 100644 --- a/stdlib/source/library/lux/target/jvm/type.lux +++ b/stdlib/source/library/lux/target/jvm/type.lux @@ -167,7 +167,7 @@ (def .public (primitive? type) (-> (Type Value) (Either (Type Object) (Type Primitive))) - (if (`` (or (~~ (with_template [<type>] + (if (`` (or (,, (with_template [<type>] [(at ..equivalence = (is (Type Value) <type>) type)] [..boolean] @@ -184,7 +184,7 @@ (def .public (void? type) (-> (Type Return) (Either (Type Value) (Type Void))) - (if (`` (or (~~ (with_template [<type>] + (if (`` (or (,, (with_template [<type>] [(at ..equivalence = (is (Type Return) <type>) type)] [..void])))) diff --git a/stdlib/source/library/lux/target/jvm/type/category.lux b/stdlib/source/library/lux/target/jvm/type/category.lux index bbef2f241..ad293150e 100644 --- a/stdlib/source/library/lux/target/jvm/type/category.lux +++ b/stdlib/source/library/lux/target/jvm/type/category.lux @@ -26,7 +26,7 @@ [(with_expansions [<raw> (template.symbol [<child> "'"])] (primitive <raw> Any) (type .public <child> - (`` (<| Return' Value' (~~ (template.spliced <parents>)) <raw>))))] + (`` (<| Return' Value' (,, (template.spliced <parents>)) <raw>))))] [[] Primitive] [[Object' Parameter'] Var] diff --git a/stdlib/source/library/lux/target/jvm/type/lux.lux b/stdlib/source/library/lux/target/jvm/type/lux.lux index 724092721..10160204c 100644 --- a/stdlib/source/library/lux/target/jvm/type/lux.lux +++ b/stdlib/source/library/lux/target/jvm/type/lux.lux @@ -176,7 +176,7 @@ (|>> (<>#each (check#each (function (_ elementT) (case elementT {.#Primitive name {.#End}} - (if (`` (or (~~ (with_template [<reflection>] + (if (`` (or (,, (with_template [<reflection>] [(text#= (//reflection.reflection <reflection>) name)] [//reflection.boolean] diff --git a/stdlib/source/library/lux/target/jvm/type/reflection.lux b/stdlib/source/library/lux/target/jvm/type/reflection.lux index de151b35d..4ea86a811 100644 --- a/stdlib/source/library/lux/target/jvm/type/reflection.lux +++ b/stdlib/source/library/lux/target/jvm/type/reflection.lux @@ -63,7 +63,7 @@ elementR (`` (cond (text.starts_with? //descriptor.array_prefix element') element' - (~~ (with_template [<primitive> <descriptor>] + (,, (with_template [<primitive> <descriptor>] [(at ..equivalence = <primitive> element) (//descriptor.descriptor <descriptor>)] diff --git a/stdlib/source/library/lux/target/lua.lux b/stdlib/source/library/lux/target/lua.lux index 440c3f4ce..b0432cbdd 100644 --- a/stdlib/source/library/lux/target/lua.lux +++ b/stdlib/source/library/lux/target/lua.lux @@ -66,7 +66,7 @@ (with_template [<type> <super>+] [(with_expansions [<brand> (template.symbol [<type> "'"])] (primitive (<brand> brand) Any) - (`` (type .public <type> (|> Any <brand> (~~ (template.spliced <super>+))))))] + (`` (type .public <type> (|> Any <brand> (,, (template.spliced <super>+))))))] [Expression [Code]] [Computation [Expression' Code]] @@ -77,7 +77,7 @@ (with_template [<type> <super>+] [(with_expansions [<brand> (template.symbol [<type> "'"])] (primitive <brand> Any) - (`` (type .public <type> (|> <brand> (~~ (template.spliced <super>+))))))] + (`` (type .public <type> (|> <brand> (,, (template.spliced <super>+))))))] [Literal [Computation' Expression' Code]] [Var [Location' Computation' Expression' Code]] @@ -123,7 +123,7 @@ (def safe (-> Text Text) - (`` (|>> (~~ (with_template [<find> <replace>] + (`` (|>> (,, (with_template [<find> <replace>] [(text.replaced <find> <replace>)] ["\" "\\"] @@ -390,7 +390,7 @@ <types> (arity_types <arity>) <definitions> (template.spliced <function>+)] (with_template [<function>] - [(`` (def .public ((~~ (template.symbol [<function> "/" <arity>])) <inputs>) + [(`` (def .public ((,, (template.symbol [<function> "/" <arity>])) <inputs>) (-> <types> Computation) (..apply (.list <inputs>) (..var <function>))))] diff --git a/stdlib/source/library/lux/target/php.lux b/stdlib/source/library/lux/target/php.lux index 747a55abf..ef08c945d 100644 --- a/stdlib/source/library/lux/target/php.lux +++ b/stdlib/source/library/lux/target/php.lux @@ -74,7 +74,7 @@ (with_template [<type> <super>+] [(with_expansions [<brand> (template.symbol [<type> "'"])] (primitive (<brand> brand) Any) - (`` (type .public <type> (|> Any <brand> (~~ (template.spliced <super>+))))))] + (`` (type .public <type> (|> Any <brand> (,, (template.spliced <super>+))))))] [Expression [Code]] [Computation [Expression' Code]] @@ -85,7 +85,7 @@ (with_template [<type> <super>+] [(with_expansions [<brand> (template.symbol [<type> "'"])] (primitive .public <brand> Any) - (`` (type .public <type> (|> <brand> (~~ (template.spliced <super>+))))))] + (`` (type .public <type> (|> <brand> (,, (template.spliced <super>+))))))] [Literal [Computation' Expression' Code]] [Var [Location' Computation' Expression' Code]] @@ -164,7 +164,7 @@ (def safe (-> Text Text) - (`` (|>> (~~ (with_template [<find> <replace>] + (`` (|>> (,, (with_template [<find> <replace>] [(text.replaced <find> <replace>)] ["\" "\\"] @@ -254,7 +254,7 @@ (..apply (.list <inputs>) function)) (with_template [<function>] - [(`` (def .public (~~ (template.symbol [<function> "/" <arity>])) + [(`` (def .public (,, (template.symbol [<function> "/" <arity>])) (<apply> (..constant <function>))))] <definitions>))] diff --git a/stdlib/source/library/lux/target/python.lux b/stdlib/source/library/lux/target/python.lux index a297ad529..e1197964b 100644 --- a/stdlib/source/library/lux/target/python.lux +++ b/stdlib/source/library/lux/target/python.lux @@ -147,7 +147,7 @@ (.def .public float (-> Frac Literal) - (`` (|>> (pipe.cond (~~ (with_template [<test> <python>] + (`` (|>> (pipe.cond (,, (with_template [<test> <python>] [[<test>] [(pipe.new (format "float(" text.double_quote <python> text.double_quote ")") [])]] @@ -162,7 +162,7 @@ (.def safe (-> Text Text) - (`` (|>> (~~ (with_template [<find> <replace>] + (`` (|>> (,, (with_template [<find> <replace>] [(text.replaced <find> <replace>)] ["\" "\\"] @@ -467,8 +467,8 @@ [(with_expansions [<inputs> (arity_inputs <arity>) <definitions> (template.spliced <function>+)] (with_template [<function>] - [(`` (.def .public ((~~ (template.symbol [<function> "/" <arity>])) <inputs>) - (-> (~~ (arity_types <arity>)) (Computation Any)) + [(`` (.def .public ((,, (template.symbol [<function> "/" <arity>])) <inputs>) + (-> (,, (arity_types <arity>)) (Computation Any)) (..apply (.list <inputs>) (..var <function>))))] <definitions>))] diff --git a/stdlib/source/library/lux/target/r.lux b/stdlib/source/library/lux/target/r.lux index 574dcb4bf..3ddfac43d 100644 --- a/stdlib/source/library/lux/target/r.lux +++ b/stdlib/source/library/lux/target/r.lux @@ -28,7 +28,7 @@ (with_template [<type> <super>+] [(with_expansions [<kind> (template.symbol [<type> "'"])] (primitive .public (<kind> kind) Any) - (`` (type .public <type> (|> Any <kind> (~~ (template.spliced <super>+))))))] + (`` (type .public <type> (|> Any <kind> (,, (template.spliced <super>+))))))] [Expression [Code]] ) @@ -36,7 +36,7 @@ (with_template [<type> <super>+] [(with_expansions [<kind> (template.symbol [<type> "'"])] (primitive .public (<kind> kind) Any) - (`` (type .public (<type> <brand>) (|> <brand> <kind> (~~ (template.spliced <super>+))))))] + (`` (type .public (<type> <brand>) (|> <brand> <kind> (,, (template.spliced <super>+))))))] [Var [Expression' Code]] ) @@ -139,7 +139,7 @@ (def safe (-> Text Text) - (`` (|>> (~~ (with_template [<find> <replace>] + (`` (|>> (,, (with_template [<find> <replace>] [(text.replaced <find> <replace>)] ["\" "\\"] @@ -231,7 +231,7 @@ (..apply (.list <inputs>) function)) (with_template [<function>] - [(`` (def .public (~~ (template.symbol [<function> "/" <arity>])) + [(`` (def .public (,, (template.symbol [<function> "/" <arity>])) (-> [<types>] Expression) (<apply> (..var <function>))))] diff --git a/stdlib/source/library/lux/target/ruby.lux b/stdlib/source/library/lux/target/ruby.lux index aa92ae9b3..dd99e29f7 100644 --- a/stdlib/source/library/lux/target/ruby.lux +++ b/stdlib/source/library/lux/target/ruby.lux @@ -60,7 +60,7 @@ (with_template [<type> <super>+] [(with_expansions [<brand> (template.symbol [<type> "'"])] (primitive (<brand> brand) Any) - (`` (type .public <type> (|> Any <brand> (~~ (template.spliced <super>+))))))] + (`` (type .public <type> (|> Any <brand> (,, (template.spliced <super>+))))))] [Expression [Code]] [Computation [Expression' Code]] @@ -73,7 +73,7 @@ (with_template [<type> <super>+] [(with_expansions [<brand> (template.symbol [<type> "'"])] (primitive <brand> Any) - (`` (type .public <type> (|> <brand> (~~ (template.spliced <super>+))))))] + (`` (type .public <type> (|> <brand> (,, (template.spliced <super>+))))))] [Literal [Computation' Expression' Code]] [Access [Location' Computation' Expression' Code]] @@ -160,7 +160,7 @@ (def safe (-> Text Text) - (`` (|>> (~~ (with_template [<find> <replace>] + (`` (|>> (,, (with_template [<find> <replace>] [(text.replaced <find> <replace>)] ["\" "\\"] @@ -448,7 +448,7 @@ (representation on)))) (with_template [<name>] - [(`` (def .public ((~~ (template.symbol [<name> "/*"])) attributes) + [(`` (def .public ((,, (template.symbol [<name> "/*"])) attributes) (-> (List Text) Statement) (..statement (..apply (list#each ..string attributes) {.#None} (..manual <name>)))))] @@ -499,7 +499,7 @@ <types> (arity_types <arity>) <definitions> (template.spliced <function>+)] (with_template [<function>] - [(`` (def .public ((~~ (template.symbol [<function> "/" <arity>])) <inputs>) + [(`` (def .public ((,, (template.symbol [<function> "/" <arity>])) <inputs>) (-> <types> Computation) (..apply (.list <inputs>) {.#None} (..manual <function>))))] diff --git a/stdlib/source/library/lux/target/scheme.lux b/stdlib/source/library/lux/target/scheme.lux index 4173b4241..6918a872c 100644 --- a/stdlib/source/library/lux/target/scheme.lux +++ b/stdlib/source/library/lux/target/scheme.lux @@ -49,14 +49,14 @@ (with_template [<type> <brand> <super>+] [(primitive .public (<brand> brand) Any) - (`` (type .public <type> (|> Any <brand> (~~ (template.spliced <super>+)))))] + (`` (type .public <type> (|> Any <brand> (,, (template.spliced <super>+)))))] [Expression Expression' [Code]] ) (with_template [<type> <brand> <super>+] [(primitive .public <brand> Any) - (`` (type .public <type> (|> <brand> (~~ (template.spliced <super>+)))))] + (`` (type .public <type> (|> <brand> (,, (template.spliced <super>+)))))] [Var Var' [Expression' Code]] [Computation Computation' [Expression' Code]] @@ -138,7 +138,7 @@ (def safe (-> Text Text) - (`` (|>> (~~ (with_template [<find> <replace>] + (`` (|>> (,, (with_template [<find> <replace>] [(text.replaced <find> <replace>)] ["\" "\\"] @@ -201,14 +201,14 @@ (with_template [<apply> <arg>+ <type>+ <function>+] [(`` (def .public (<apply> procedure) - (-> Expression (~~ (template.spliced <type>+)) Computation) - (function (_ (~~ (template.spliced <arg>+))) - (..apply (list (~~ (template.spliced <arg>+))) procedure)))) + (-> Expression (,, (template.spliced <type>+)) Computation) + (function (_ (,, (template.spliced <arg>+))) + (..apply (list (,, (template.spliced <arg>+))) procedure)))) (`` (with_template [<definition> <function>] [(def .public <definition> (<apply> (..var <function>)))] - (~~ (template.spliced <function>+))))] + (,, (template.spliced <function>+))))] [apply/1 [_0] [Expression] [[exact/1 "exact"] |