diff options
Diffstat (limited to '')
-rw-r--r-- | stdlib/source/lux/data/format/css.lux | 2 | ||||
-rw-r--r-- | stdlib/source/lux/data/format/css/property.lux | 6 | ||||
-rw-r--r-- | stdlib/source/lux/data/format/css/query.lux | 8 | ||||
-rw-r--r-- | stdlib/source/lux/data/format/css/selector.lux | 18 | ||||
-rw-r--r-- | stdlib/source/lux/data/format/css/value.lux | 34 |
5 files changed, 34 insertions, 34 deletions
diff --git a/stdlib/source/lux/data/format/css.lux b/stdlib/source/lux/data/format/css.lux index 736a5e6f3..2bee92189 100644 --- a/stdlib/source/lux/data/format/css.lux +++ b/stdlib/source/lux/data/format/css.lux @@ -116,7 +116,7 @@ (!compose (..rule selector style) (..alter combinator selector inner))) - (do-template [<name> <combinator>] + (template [<name> <combinator>] [(def: #export <name> (-> (Selector Any) Style (CSS Common) (CSS Common)) (..dependent <combinator>))] diff --git a/stdlib/source/lux/data/format/css/property.lux b/stdlib/source/lux/data/format/css/property.lux index b9e178ede..214a2f3c7 100644 --- a/stdlib/source/lux/data/format/css/property.lux +++ b/stdlib/source/lux/data/format/css/property.lux @@ -60,8 +60,8 @@ (-> (Property Any) Text) (|>> :representation)) - (do-template [<brand> <alias>+ <property>+] - [(`` (do-template [<alias> <property>] + (template [<brand> <alias>+ <property>+] + [(`` (template [<alias> <property>] [(def: #export <alias> (Property <brand>) (:abstraction <property>))] @@ -69,7 +69,7 @@ (~~ (template.splice <alias>+)))) (with-expansions [<rows> (template.splice <property>+)] - (do-template [<property>] + (template [<property>] [(`` (def: #export (~~ (text-identifier <property>)) (Property <brand>) (:abstraction <property>)))] diff --git a/stdlib/source/lux/data/format/css/query.lux b/stdlib/source/lux/data/format/css/query.lux index 1fb1b74bb..92dea7d19 100644 --- a/stdlib/source/lux/data/format/css/query.lux +++ b/stdlib/source/lux/data/format/css/query.lux @@ -29,7 +29,7 @@ (-> Media Text) (|>> :representation)) - (do-template [<media>] + (template [<media>] [(`` (def: #export (~~ (text-identifier <media>)) Media (:abstraction <media>)))] @@ -49,7 +49,7 @@ (-> Feature Text) (|>> :representation)) - (do-template [<feature> <brand>] + (template [<feature> <brand>] [(`` (def: #export ((~~ (text-identifier <feature>)) input) (-> (Value <brand>) Feature) (:abstraction (format "(" <feature> ": " (//value.value input) ")"))))] @@ -111,7 +111,7 @@ (-> Query Text) (|>> :representation)) - (do-template [<name> <operator>] + (template [<name> <operator>] [(def: #export <name> (-> Media Query) (|>> ..media (format <operator>) :abstraction))] @@ -124,7 +124,7 @@ (-> Feature Query) (|>> ..feature (format "not ") :abstraction)) - (do-template [<name> <operator>] + (template [<name> <operator>] [(def: #export (<name> left right) (-> Query Query Query) (:abstraction (format (:representation left) diff --git a/stdlib/source/lux/data/format/css/selector.lux b/stdlib/source/lux/data/format/css/selector.lux index 7b80e4973..3c01a76a3 100644 --- a/stdlib/source/lux/data/format/css/selector.lux +++ b/stdlib/source/lux/data/format/css/selector.lux @@ -18,7 +18,7 @@ (abstract: #export (Generic brand) {} Any) -(do-template [<generic> <brand>] +(template [<generic> <brand>] [(abstract: <brand> {} Any) (type: #export <generic> (Generic <brand>))] @@ -47,7 +47,7 @@ (-> Tag (Selector Cannot-Chain)) (|>> :abstraction)) - (do-template [<name> <type> <prefix> <kind>] + (template [<name> <type> <prefix> <kind>] [(def: #export <name> (-> <type> (Selector <kind>)) (|>> (format <prefix>) :abstraction))] @@ -56,8 +56,8 @@ [class Class "." Can-Chain] ) - (do-template [<right> <left> <combo> <combinator>+] - [(`` (do-template [<combinator> <name>] + (template [<right> <left> <combo> <combinator>+] + [(`` (template [<combinator> <name>] [(def: #export (<name> right left) (-> (Selector <right>) (Selector <left>) (Selector <combo>)) (:abstraction (format (:representation left) @@ -87,7 +87,7 @@ (-> Attribute (Selector Can-Chain)) (:abstraction (format "[" attribute "]"))) - (do-template [<check> <name>] + (template [<check> <name>] [(def: #export (<name> attribute value) (-> Attribute Text (Selector Can-Chain)) (:abstraction (format "[" attribute <check> value "]")))] @@ -100,8 +100,8 @@ ["*=" contains?] ) - (do-template [<kind> <pseudo>+] - [(`` (do-template [<name> <pseudo>] + (template [<kind> <pseudo>+] + [(`` (template [<name> <pseudo>] [(def: #export <name> (Selector Can-Chain) (:abstraction <pseudo>))] @@ -170,7 +170,7 @@ (-> Nat Index) (|>> %n :abstraction)) - (do-template [<name> <index>] + (template [<name> <index>] [(def: #export <name> Index (:abstraction <index>))] [odd "odd"] @@ -189,7 +189,7 @@ (%n (.nat variable))) (%i constant))))) - (do-template [<name> <pseudo>] + (template [<name> <pseudo>] [(def: #export (<name> index) (-> Index (Selector Can-Chain)) (|> (:representation index) diff --git a/stdlib/source/lux/data/format/css/value.lux b/stdlib/source/lux/data/format/css/value.lux index 8967ed90a..1dae87811 100644 --- a/stdlib/source/lux/data/format/css/value.lux +++ b/stdlib/source/lux/data/format/css/value.lux @@ -34,7 +34,7 @@ (-> <abstraction> <representation>) (|>> :representation)) - (`` (do-template [<name> <value>] + (`` (template [<name> <value>] [(def: #export <name> <abstraction> (:abstraction <value>))] (~~ (template.splice <sample>+)) @@ -65,7 +65,7 @@ (-> (Value Any) Text) (|>> :representation)) - (do-template [<name> <value>] + (template [<name> <value>] [(def: #export <name> Value (:abstraction <value>))] [initial "initial"] @@ -73,10 +73,10 @@ [unset "unset"] ) - (do-template [<brand> <alias>+ <value>+] + (template [<brand> <alias>+ <value>+] [(abstract: #export <brand> {} Any) - (`` (do-template [<name> <value>] + (`` (template [<name> <value>] [(def: #export <name> (Value <brand>) (:abstraction <value>))] @@ -84,7 +84,7 @@ (~~ (template.splice <alias>+)))) (with-expansions [<rows> (template.splice <value>+)] - (do-template [<value>] + (template [<value>] [(`` (def: #export (~~ (text-identifier <value>)) (Value <brand>) (:abstraction <value>)))] @@ -800,7 +800,7 @@ (list;map %number) (..apply "cubic-bezier"))) - (do-template [<name> <brand>] + (template [<name> <brand>] [(def: #export <name> (-> Nat (Value <brand>)) (|>> %n :abstraction))] @@ -833,7 +833,7 @@ "1.0" (format "0" (%r alpha))))))) - (do-template [<name> <suffix>] + (template [<name> <suffix>] [(def: #export (<name> value) (-> Frac (Value Length)) (:abstraction (format (%number value) <suffix>)))] @@ -862,7 +862,7 @@ (%i value) (%n (.nat value)))) - (do-template [<name> <suffix>] + (template [<name> <suffix>] [(def: #export (<name> value) (-> Int (Value Time)) (:abstraction (format (if (i/< +0 value) @@ -948,7 +948,7 @@ (-> Nat Angle) (:abstraction (format (%n (n/% ..degree-limit value)) "deg"))) - (do-template [<degree> <name>] + (template [<degree> <name>] [(def: #export <name> Angle (..degree <degree>))] [000 to-top] @@ -957,7 +957,7 @@ [270 to-left] ) - (do-template [<name> <function>] + (template [<name> <function>] [(def: #export (<name> angle start next) (-> Angle Stop (List/1 [(Maybe Hint) Stop]) (Value Image)) (let [[now after] next] @@ -994,8 +994,8 @@ (:abstraction Value (format (:representation horizontal) ..slice-separator (:representation vertical)))) - (do-template [<input> <pre> <function>+] - [(`` (do-template [<name> <function>] + (template [<input> <pre> <function>+] + [(`` (template [<name> <function>] [(def: #export <name> (-> <input> (Value Filter)) (|>> <pre> (list) (..apply <function>)))] @@ -1039,7 +1039,7 @@ (def: length-separator " ") - (do-template [<name> <type>] + (template [<name> <type>] [(def: #export (<name> horizontal vertical) (-> (Value Length) (Value Length) (Value <type>)) (:abstraction (format (:representation horizontal) @@ -1074,7 +1074,7 @@ [farthest-corner "farthest-corner"]] []) - (do-template [<name> <function>] + (template [<name> <function>] [(def: #export (<name> shape extent location start next) (-> Shape (Maybe Extent) (Value Location) Stop (List/1 [(Maybe Hint) Stop]) @@ -1121,7 +1121,7 @@ (def: #export (clip rectangle) (-> Rectangle (Value Clip)) - (`` (..apply "rect" (list (~~ (do-template [<side>] + (`` (..apply "rect" (list (~~ (template [<side>] [(:representation (get@ <side> rectangle))] [#top] [#right] [#bottom] [#left])))))) @@ -1261,7 +1261,7 @@ (list;map %number) (..apply "matrix3d"))) - (do-template [<name> <function> <input-types> <input-values>] + (template [<name> <function> <input-types> <input-values>] [(`` (def: #export (<name> [(~~ (template.splice <input-values>))]) (-> [(~~ (template.splice <input-types>))] (Value Transform)) (|> (list (~~ (template.splice <input-values>))) @@ -1283,7 +1283,7 @@ [perspective "perspective" [Frac] [value]] ) - (do-template [<name> <function> <input-types> <input-values>] + (template [<name> <function> <input-types> <input-values>] [(`` (def: #export (<name> [(~~ (template.splice <input-values>))]) (-> [(~~ (template.splice <input-types>))] (Value Transform)) (|> (list (~~ (template.splice <input-values>))) |