De-sigil-ification: suffix : [Part 3]

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 6a0a3acf0..d1115fbfa 100644
--- a/stdlib/source/specification/compositor/analysis/type.lux
+++ b/stdlib/source/specification/compositor/analysis/type.lux
@@ -36,7 +36,7 @@
 (def: check
   (Random [Code Type Code])
   (`` (all r.either
-           (~~ (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 05e58e21f..a6d57034f 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]))
-               (~~ (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 8012798f8..4aefbce72 100644
--- a/stdlib/source/specification/compositor/generation/common.lux
+++ b/stdlib/source/specification/compositor/generation/common.lux
@@ -39,7 +39,7 @@
   (do r.monad
     [param r.i64
      subject r.i64]
-    (with_expansions [<binary> (template [<extension> <reference> <param_expr>]
+    (with_expansions [<binary> (with_template [<extension> <reference> <param_expr>]
                                  [(_.property <extension>
                                     (|> {synthesis.#Extension <extension> (list (synthesis.i64 param)
                                                                                 (synthesis.i64 subject))}
@@ -82,7 +82,7 @@
     [param (|> r.i64 (r.only (|>> ("lux i64 =" 0) not)))
      subject r.i64]
     (`` (all _.and
-             (~~ (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))]
                    ))
-             (~~ (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
-             (~~ (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.=]
                    ))
-             (~~ (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.<]
                    ))
-             (~~ (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 d76f98f0a..226d0c25e 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
-           (~~ (template [<evaluation_name> <synthesis> <gen> <test>]
+           (~~ (with_template [<evaluation_name> <synthesis> <gen> <test>]
                  [(do r.monad
                     [expected <gen>]
                     (_.property (%.symbol (symbol <synthesis>))