diff options
Diffstat (limited to 'stdlib/source/library/lux/data/format')
9 files changed, 33 insertions, 33 deletions
diff --git a/stdlib/source/library/lux/data/format/css/class.lux b/stdlib/source/library/lux/data/format/css/class.lux index cf0d3423a..1ddfdfebd 100644 --- a/stdlib/source/library/lux/data/format/css/class.lux +++ b/stdlib/source/library/lux/data/format/css/class.lux @@ -30,6 +30,6 @@ (do meta.monad [module meta.current_module_name class meta.seed] - (in (list (` (..custom (~ (code.text (format "c" (%.nat_16 class) + (in (list (` (..custom (, (code.text (format "c" (%.nat_16 class) "_" (%.nat_16 (text#hash module)))))))))))) ) diff --git a/stdlib/source/library/lux/data/format/css/id.lux b/stdlib/source/library/lux/data/format/css/id.lux index ee61013bf..45746b427 100644 --- a/stdlib/source/library/lux/data/format/css/id.lux +++ b/stdlib/source/library/lux/data/format/css/id.lux @@ -30,6 +30,6 @@ (do meta.monad [module meta.current_module_name id meta.seed] - (in (list (` (..custom (~ (code.text (format "i" (%.nat_16 id) + (in (list (` (..custom (, (code.text (format "i" (%.nat_16 id) "_" (%.nat_16 (text#hash module)))))))))))) ) diff --git a/stdlib/source/library/lux/data/format/css/property.lux b/stdlib/source/library/lux/data/format/css/property.lux index 1a3b8ee02..353efa6c5 100644 --- a/stdlib/source/library/lux/data/format/css/property.lux +++ b/stdlib/source/library/lux/data/format/css/property.lux @@ -71,11 +71,11 @@ (Property <brand>) (abstraction <property>))] - (~~ (template.spliced <alias>+)))) + (,, (template.spliced <alias>+)))) (with_expansions [<rows> (template.spliced <property>+)] (with_template [<property>] - [(`` (def .public (~~ (text_symbol <property>)) + [(`` (def .public (,, (text_symbol <property>)) (Property <brand>) (abstraction <property>)))] diff --git a/stdlib/source/library/lux/data/format/css/query.lux b/stdlib/source/library/lux/data/format/css/query.lux index d3edc6d31..859eb7910 100644 --- a/stdlib/source/library/lux/data/format/css/query.lux +++ b/stdlib/source/library/lux/data/format/css/query.lux @@ -32,7 +32,7 @@ (|>> representation)) (with_template [<media>] - [(`` (def .public (~~ (text_symbol <media>)) + [(`` (def .public (,, (text_symbol <media>)) Media (abstraction <media>)))] @@ -50,7 +50,7 @@ (|>> representation)) (with_template [<feature> <brand>] - [(`` (def .public ((~~ (text_symbol <feature>)) input) + [(`` (def .public ((,, (text_symbol <feature>)) input) (-> (Value <brand>) Feature) (abstraction (format "(" <feature> ": " (//value.value input) ")"))))] diff --git a/stdlib/source/library/lux/data/format/css/selector.lux b/stdlib/source/library/lux/data/format/css/selector.lux index 1e8d3e0b9..a994398fd 100644 --- a/stdlib/source/library/lux/data/format/css/selector.lux +++ b/stdlib/source/library/lux/data/format/css/selector.lux @@ -68,7 +68,7 @@ <combinator> (representation right))))] - (~~ (template.spliced <combinator>+))))] + (,, (template.spliced <combinator>+))))] [Can_Chain (Generic Any) [["" and]]] @@ -113,7 +113,7 @@ (Selector <kind>) (abstraction <pseudo>))] - (~~ (template.spliced <pseudo>+))))] + (,, (template.spliced <pseudo>+))))] [Can_Chain [[active ":active"] diff --git a/stdlib/source/library/lux/data/format/css/value.lux b/stdlib/source/library/lux/data/format/css/value.lux index d4732c5da..877e4f8e6 100644 --- a/stdlib/source/library/lux/data/format/css/value.lux +++ b/stdlib/source/library/lux/data/format/css/value.lux @@ -45,7 +45,7 @@ (`` (with_template [<name> <value>] [(def .public <name> <abstraction> (abstraction <value>))] - (~~ (template.spliced <sample>+)) + (,, (template.spliced <sample>+)) )) (template.spliced <definition>+))])) @@ -94,11 +94,11 @@ (Value <brand>) (abstraction <value>))] - (~~ (template.spliced <alias>+)))) + (,, (template.spliced <alias>+)))) (with_expansions [<rows> (template.spliced <value>+)] (with_template [<value>] - [(`` (def .public (~~ (..text_symbol <value>)) + [(`` (def .public (,, (..text_symbol <value>)) (Value <brand>) (abstraction <value>)))] @@ -990,7 +990,7 @@ (-> <input> (Value Filter)) (|>> <pre> (list) (..apply <function>)))] - (~~ (template.spliced <function>+))))] + (,, (template.spliced <function>+))))] [Nat (<| representation ..px n.frac) [[blur "blur"]]] @@ -1115,7 +1115,7 @@ (def .public (clip rectangle) (-> Rectangle (Value Clip)) - (`` (..apply "rect" (list (~~ (with_template [<side>] + (`` (..apply "rect" (list (,, (with_template [<side>] [(representation (the <side> rectangle))] [#top] [#right] [#bottom] [#left])))))) @@ -1260,9 +1260,9 @@ (..apply "matrix3d"))) (with_template [<name> <function> <input_types> <input_values>] - [(`` (def .public (<name> [(~~ (template.spliced <input_values>))]) - (-> [(~~ (template.spliced <input_types>))] (Value Transform)) - (|> (list (~~ (template.spliced <input_values>))) + [(`` (def .public (<name> [(,, (template.spliced <input_values>))]) + (-> [(,, (template.spliced <input_types>))] (Value Transform)) + (|> (list (,, (template.spliced <input_values>))) (list#each %number) (..apply <function>))))] @@ -1282,9 +1282,9 @@ ) (with_template [<name> <function> <input_types> <input_values>] - [(`` (def .public (<name> [(~~ (template.spliced <input_values>))]) - (-> [(~~ (template.spliced <input_types>))] (Value Transform)) - (|> (list (~~ (template.spliced <input_values>))) + [(`` (def .public (<name> [(,, (template.spliced <input_values>))]) + (-> [(,, (template.spliced <input_types>))] (Value Transform)) + (|> (list (,, (template.spliced <input_values>))) (list#each ..angle) (..apply <function>))))] diff --git a/stdlib/source/library/lux/data/format/html.lux b/stdlib/source/library/lux/data/format/html.lux index d6560ccfe..ba8f5ab31 100644 --- a/stdlib/source/library/lux/data/format/html.lux +++ b/stdlib/source/library/lux/data/format/html.lux @@ -109,7 +109,7 @@ [(primitive <sub_raw> Any) (type .public <sub> (HTML (<super_raw> <sub_raw>)))] - (~~ (template.spliced <sub>+))))] + (,, (template.spliced <sub>+))))] [Element Element' [[Content Content'] diff --git a/stdlib/source/library/lux/data/format/json.lux b/stdlib/source/library/lux/data/format/json.lux index d419ac68f..1af453bb9 100644 --- a/stdlib/source/library/lux/data/format/json.lux +++ b/stdlib/source/library/lux/data/format/json.lux @@ -104,28 +104,28 @@ (^.with_template [<ctor> <input_tag> <output_tag>] [{<input_tag> value} - (` {<output_tag> (~ (<ctor> value))})]) + (` {<output_tag> (, (<ctor> value))})]) ([code.bit ..#Boolean' ..#Boolean] [code.frac ..#Number' ..#Number] [code.text ..#String' ..#String]) {#Array' members} - (` {..#Array ((~! sequence.sequence) (~+ (sequence.list (sequence#each jsonF members))))}) + (` {..#Array ((,! sequence.sequence) (,* (sequence.list (sequence#each jsonF members))))}) {#Object' pairs} - (` {..#Object ((~! dictionary.of_list) - (~! text.hash) - (list (~+ (|> pairs + (` {..#Object ((,! dictionary.of_list) + (,! text.hash) + (list (,* (|> pairs dictionary.entries (list#each (function (_ [key_name value]) - (` [(~ (code.text key_name)) (~ (jsonF value))])))))))}) + (` [(, (code.text key_name)) (, (jsonF value))])))))))}) {#Code' code} code)) (def .public json (syntax (_ [token ..jsonP]) - (in (list (` (is JSON (~ (jsonF token)))))))) + (in (list (` (is JSON (, (jsonF token)))))))) (def .public (fields json) (-> JSON (Try (List String))) diff --git a/stdlib/source/library/lux/data/format/tar.lux b/stdlib/source/library/lux/data/format/tar.lux index e0ed3924f..38746e8eb 100644 --- a/stdlib/source/library/lux/data/format/tar.lux +++ b/stdlib/source/library/lux/data/format/tar.lux @@ -126,12 +126,12 @@ (Parser Any) (do <>.monad [pre_end <binary>.bits_8 - _ (let [expected (`` (char (~~ (static ..blank))))] + _ (let [expected (`` (char (,, (static ..blank))))] (<>.assertion (exception.error ..wrong_character [expected pre_end]) (n.= expected pre_end))) end <binary>.bits_8 - _ (let [expected (`` (char (~~ (static ..null))))] + _ (let [expected (`` (char (,, (static ..null))))] (<>.assertion (exception.error ..wrong_character [expected end]) (n.= expected end)))] (in []))) @@ -153,7 +153,7 @@ [digits (<binary>.segment ..big_size) digits (<>.lifted (at utf8.codec decoded digits)) end <binary>.bits_8 - _ (let [expected (`` (char (~~ (static ..blank))))] + _ (let [expected (`` (char (,, (static ..blank))))] (<>.assertion (exception.error ..wrong_character [expected end]) (n.= expected end)))] (<>.lifted @@ -243,7 +243,7 @@ 0 (at utf8.codec encoded "") _ (let [last_char (binary!.bits_8 end string)] (`` (case (.nat last_char) - (pattern (char (~~ (static ..null)))) + (pattern (char (,, (static ..null)))) (again (-- end)) _ @@ -288,7 +288,7 @@ (do <>.monad [string (<binary>.segment <size>) end <binary>.bits_8 - .let [expected (`` (char (~~ (static ..null))))] + .let [expected (`` (char (,, (static ..null))))] _ (<>.assertion (exception.error ..wrong_character [expected end]) (n.= expected end))] (<>.lifted @@ -330,7 +330,7 @@ (do <>.monad [string (<binary>.segment ..magic_size) end <binary>.bits_8 - .let [expected (`` (char (~~ (static ..null))))] + .let [expected (`` (char (,, (static ..null))))] _ (<>.assertion (exception.error ..wrong_character [expected end]) (n.= expected end))] (<>.lifted |