aboutsummaryrefslogtreecommitdiff
path: root/stdlib/source/specification/compositor
diff options
context:
space:
mode:
Diffstat (limited to 'stdlib/source/specification/compositor')
-rw-r--r--stdlib/source/specification/compositor/analysis/type.lux4
-rw-r--r--stdlib/source/specification/compositor/generation/case.lux2
-rw-r--r--stdlib/source/specification/compositor/generation/common.lux10
-rw-r--r--stdlib/source/specification/compositor/generation/primitive.lux2
4 files changed, 9 insertions, 9 deletions
diff --git a/stdlib/source/specification/compositor/analysis/type.lux b/stdlib/source/specification/compositor/analysis/type.lux
index abeed68de..edf3cc14b 100644
--- a/stdlib/source/specification/compositor/analysis/type.lux
+++ b/stdlib/source/specification/compositor/analysis/type.lux
@@ -24,7 +24,7 @@
(-> Expander State+ Text (List Code) Type Bit)
(|> (analysis/scope.with_scope ""
(analysis/type.with_type output_type
- (analysis.phase expander (` ((~ (code.text extension)) (~+ params))))))
+ (analysis.phase expander (` ((, (code.text extension)) (,* params))))))
(phase.result state)
(pipe.case
{try.#Success _}
@@ -36,7 +36,7 @@
(def check
(Random [Code Type Code])
(`` (all r.either
- (~~ (with_template [<random> <type> <code>]
+ (,, (with_template [<random> <type> <code>]
[(do r.monad
[value <random>]
(in [(` <type>)
diff --git a/stdlib/source/specification/compositor/generation/case.lux b/stdlib/source/specification/compositor/generation/case.lux
index 86c09da51..8d902977c 100644
--- a/stdlib/source/specification/compositor/generation/case.lux
+++ b/stdlib/source/specification/compositor/generation/case.lux
@@ -55,7 +55,7 @@
[value r.i64]
(in [(synthesis.i64 value)
synthesis.path/pop]))
- (~~ (with_template [<gen> <synth> <path>]
+ (,, (with_template [<gen> <synth> <path>]
[(do r.monad
[value <gen>]
(in [(<synth> value)
diff --git a/stdlib/source/specification/compositor/generation/common.lux b/stdlib/source/specification/compositor/generation/common.lux
index ec8adb582..8c3545262 100644
--- a/stdlib/source/specification/compositor/generation/common.lux
+++ b/stdlib/source/specification/compositor/generation/common.lux
@@ -82,7 +82,7 @@
[param (|> r.i64 (r.only (|>> ("lux i64 =" 0) not)))
subject r.i64]
(`` (all _.and
- (~~ (with_template [<extension> <type> <prepare> <comp> <subject_expr>]
+ (,, (with_template [<extension> <type> <prepare> <comp> <subject_expr>]
[(_.property <extension>
(|> {synthesis.#Extension <extension> (list (synthesis.i64 subject))}
(run (..safe <extension>))
@@ -100,7 +100,7 @@
(n.% (i64.left_shifted 8 1))
(as Int))]
))
- (~~ (with_template [<extension> <reference> <outputT> <comp>]
+ (,, (with_template [<extension> <reference> <outputT> <comp>]
[(_.property <extension>
(|> {synthesis.#Extension <extension> (list (synthesis.i64 param)
(synthesis.i64 subject))}
@@ -132,7 +132,7 @@
[param (|> ..simple_frac (r.only (|>> (f.= +0.0) not)))
subject ..simple_frac]
(`` (all _.and
- (~~ (with_template [<extension> <reference> <comp>]
+ (,, (with_template [<extension> <reference> <comp>]
[(_.property <extension>
(|> {synthesis.#Extension <extension> (list (synthesis.f64 param)
(synthesis.f64 subject))}
@@ -145,7 +145,7 @@
["lux f64 /" f./ f.=]
["lux f64 %" f.% f.=]
))
- (~~ (with_template [<extension> <text>]
+ (,, (with_template [<extension> <text>]
[(_.property <extension>
(|> {synthesis.#Extension <extension> (list (synthesis.f64 param)
(synthesis.f64 subject))}
@@ -161,7 +161,7 @@
["lux f64 =" f.=]
["lux f64 <" f.<]
))
- (~~ (with_template [<extension> <reference>]
+ (,, (with_template [<extension> <reference>]
[(_.property <extension>
(|> {synthesis.#Extension <extension> (list)}
(run (..safe <extension>))
diff --git a/stdlib/source/specification/compositor/generation/primitive.lux b/stdlib/source/specification/compositor/generation/primitive.lux
index 0a21ad67b..f5861b006 100644
--- a/stdlib/source/specification/compositor/generation/primitive.lux
+++ b/stdlib/source/specification/compositor/generation/primitive.lux
@@ -29,7 +29,7 @@
(def .public (spec run)
(-> Runner Test)
(`` (all _.and
- (~~ (with_template [<evaluation_name> <synthesis> <gen> <test>]
+ (,, (with_template [<evaluation_name> <synthesis> <gen> <test>]
[(do r.monad
[expected <gen>]
(_.property (%.symbol (symbol <synthesis>))