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

20 files changed, 32 insertions, 32 deletions

diff --git a/stdlib/source/program/aedifex.lux b/stdlib/source/program/aedifex.lux
index 1de6b7d30..d338fe439 100644
--- a/stdlib/source/program/aedifex.lux
+++ b/stdlib/source/program/aedifex.lux
@@ -133,7 +133,7 @@
 (`` (implementation: write_only
       (Console IO)
 
-      (~~ (template [<name>]
+      (~~ (with_template [<name>]
             [(def: (<name> _)
                (io.io (exception.except ..invalid_operation [])))]
 
diff --git a/stdlib/source/program/aedifex/artifact.lux b/stdlib/source/program/aedifex/artifact.lux
index 35c7bddb3..a6824828a 100644
--- a/stdlib/source/program/aedifex/artifact.lux
+++ b/stdlib/source/program/aedifex/artifact.lux
@@ -63,7 +63,7 @@
         (text#< (the #version reference)
                 (the #version subject)))))
 
-(template [<separator> <definition>]
+(with_template [<separator> <definition>]
   [(def: <definition>
      Text
      <separator>)]
diff --git a/stdlib/source/program/aedifex/artifact/extension.lux b/stdlib/source/program/aedifex/artifact/extension.lux
index 744731370..797f0390f 100644
--- a/stdlib/source/program/aedifex/artifact/extension.lux
+++ b/stdlib/source/program/aedifex/artifact/extension.lux
@@ -23,7 +23,7 @@
   (-> Extension //.Type)
   (text.replaced ..separator ""))
 
-(template [<name>]
+(with_template [<name>]
   [(def: .public <name>
      Extension
      (..extension (template.symbol [//._] [<name>])))]
diff --git a/stdlib/source/program/aedifex/artifact/snapshot.lux b/stdlib/source/program/aedifex/artifact/snapshot.lux
index b8c0f8db4..59053e368 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot.lux
@@ -33,7 +33,7 @@
        /stamp.equivalence
        ))
 
-(template [<definition> <tag>]
+(with_template [<definition> <tag>]
   [(def: <definition> xml.Tag ["" <tag>])]
 
   [<local_copy> "localCopy"]
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/version.lux b/stdlib/source/program/aedifex/artifact/snapshot/version.lux
index a1afbd888..a8ee8cbef 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/version.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/version.lux
@@ -31,7 +31,7 @@
        ///time.equivalence
        ))
 
-(template [<definition> <tag>]
+(with_template [<definition> <tag>]
   [(def: <definition> xml.Tag ["" <tag>])]
 
   [<extension> "extension"]
diff --git a/stdlib/source/program/aedifex/artifact/type.lux b/stdlib/source/program/aedifex/artifact/type.lux
index 21acc64c3..53242c437 100644
--- a/stdlib/source/program/aedifex/artifact/type.lux
+++ b/stdlib/source/program/aedifex/artifact/type.lux
@@ -6,7 +6,7 @@
 (type: .public Type
   Text)
 
-(template [<type> <name>]
+(with_template [<type> <name>]
   [(def: .public <name>
      Type
      <type>)]
diff --git a/stdlib/source/program/aedifex/artifact/versioning.lux b/stdlib/source/program/aedifex/artifact/versioning.lux
index 9c7dab3c6..fb641b897 100644
--- a/stdlib/source/program/aedifex/artifact/versioning.lux
+++ b/stdlib/source/program/aedifex/artifact/versioning.lux
@@ -48,7 +48,7 @@
        (list.equivalence //snapshot/version.equivalence)
        ))
 
-(template [<definition> <tag>]
+(with_template [<definition> <tag>]
   [(def: <definition> xml.Tag ["" <tag>])]
 
   [<last_updated> "lastUpdated"]
diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux
index 363391949..98fa73d75 100644
--- a/stdlib/source/program/aedifex/command/build.lux
+++ b/stdlib/source/program/aedifex/command/build.lux
@@ -69,7 +69,7 @@
   Group
   "com.github.luxlang")
 
-(template [<dependency> <definition>]
+(with_template [<dependency> <definition>]
   [(def: .public <definition>
      Name
      <dependency>)]
@@ -104,7 +104,7 @@
     (case (..dependency_finder lux_group lux_name resolution)
       {.#Some dependency}
       (case lux_name
-        (^.template [<tag> <name>]
+        (^.with_template [<tag> <name>]
           [(pattern (static <name>))
            {try.#Success [(..remove_dependency dependency resolution)
                           {<tag> dependency}]}])
@@ -201,7 +201,7 @@
 (def: .public success "[BUILD ENDED]")
 (def: .public failure "[BUILD FAILED]")
 
-(template [<name> <capability>]
+(with_template [<name> <capability>]
   [(def: .public (<name> console process)
      (-> (Console Async) (Process Async) (Async (Try Any)))
      ... This is a very odd way of implementing this function.
@@ -300,7 +300,7 @@
                           (with_jvm_class_path {.#Item (..path fs home dependency) host_dependencies}))
                       "program.jar"]
                      
-                     (^.template [<tag> <runtime> <program>]
+                     (^.with_template [<tag> <runtime> <program>]
                        [{<tag> dependency}
                         [(|> dependency
                              (..path fs home)
diff --git a/stdlib/source/program/aedifex/command/deploy/release.lux b/stdlib/source/program/aedifex/command/deploy/release.lux
index dcb37ef59..30cc226a4 100644
--- a/stdlib/source/program/aedifex/command/deploy/release.lux
+++ b/stdlib/source/program/aedifex/command/deploy/release.lux
@@ -88,7 +88,7 @@
         {.#Right _}
         (undefined))))
 
-(template [<name> <extension>]
+(with_template [<name> <extension>]
   [(def: <name>
      (-> Text Text)
      (text.suffix <extension>))]
@@ -100,7 +100,7 @@
   [md5 ////artifact/extension.md5]
   )
 
-(template [<name> <suffix>]
+(with_template [<name> <suffix>]
   [(def: <name>
      (-> Text Text)
      (|>> (text.suffix <suffix>) ..jar))]
diff --git a/stdlib/source/program/aedifex/command/test.lux b/stdlib/source/program/aedifex/command/test.lux
index 0c6c03db9..2e9e69ef8 100644
--- a/stdlib/source/program/aedifex/command/test.lux
+++ b/stdlib/source/program/aedifex/command/test.lux
@@ -54,7 +54,7 @@
                                                                           (///runtime.for (the ///.#java profile))
                                                                           (//build.with_jvm_class_path host_dependencies))
 
-                                                                      (^.template [<tag> <runtime>]
+                                                                      (^.with_template [<tag> <runtime>]
                                                                         [{<tag> artifact}
                                                                          (///runtime.for (the <runtime> profile)
                                                                                          program)])
diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux
index cec50d015..f04a95105 100644
--- a/stdlib/source/program/aedifex/dependency/resolution.lux
+++ b/stdlib/source/program/aedifex/dependency/resolution.lux
@@ -58,7 +58,7 @@
    ["[1][0]" metadata
     ["[1]/[0]" snapshot]]]])
 
-(template [<name>]
+(with_template [<name>]
   [(exception: .public (<name> [artifact Artifact
                                 extension Extension
                                 hash Text])
@@ -160,7 +160,7 @@
    "Artifact" (%.text (///artifact.format (the //.#artifact dependency)))
    "Type" (%.text (the //.#type dependency))))
 
-(template [<sigil> <name> <doing> <at>]
+(with_template [<sigil> <name> <doing> <at>]
   [(def: (<name> console repository artifact)
      (-> (Console Async) (Repository Async) Artifact (Async (Try Any)))
      (at console write (format "[" <sigil> "]"
diff --git a/stdlib/source/program/aedifex/format.lux b/stdlib/source/program/aedifex/format.lux
index 456f621e7..6316e6287 100644
--- a/stdlib/source/program/aedifex/format.lux
+++ b/stdlib/source/program/aedifex/format.lux
@@ -174,7 +174,7 @@
           (..on_maybe "program" (the /.#program value) code.text)
           (..on_maybe "test" (the /.#test value) code.text)
           (..on_dictionary "deploy_repositories" (the /.#deploy_repositories value) code.text code.text)
-          (~~ (template [<tag>]
+          (~~ (with_template [<tag>]
                 [(dictionary.has (template.text [<tag>]) (..runtime (the <tag> value)))]
 
                 [/.#java]
diff --git a/stdlib/source/program/aedifex/hash.lux b/stdlib/source/program/aedifex/hash.lux
index 43017034e..8a22579b2 100644
--- a/stdlib/source/program/aedifex/hash.lux
+++ b/stdlib/source/program/aedifex/hash.lux
@@ -44,7 +44,7 @@
     (All (_ h) (-> (Hash h) Binary))
     (|>> representation))
 
-  (template [<name> <kind> <algorithm>]
+  (with_template [<name> <kind> <algorithm>]
     [(def: .public (<name> value)
        (-> Binary (Hash <kind>))
        (|> (java/security/MessageDigest::getInstance [(ffi.as_string <algorithm>)])
@@ -65,7 +65,7 @@
                     (format representation hex)))
                 ""))
 
-  (template [<factor> <name>]
+  (with_template [<factor> <name>]
     [(def: <name>
        Nat
        <factor>)]
@@ -87,7 +87,7 @@
      "Expected size" (%.nat size)
      "Actual size" (%.nat (text.size value))))
   
-  (template [<name> <size>]
+  (with_template [<name> <size>]
     [(exception: .public (<name> [data Binary])
        (exception.report
         "Pseudo hash" (%.text (..encoded data))
@@ -98,7 +98,7 @@
     [not_a_md5 ..md5::size]
     )
 
-  (template [<name> <kind> <size> <exception>]
+  (with_template [<name> <kind> <size> <exception>]
     [(def: .public (<name> data)
        (-> Binary (Try (Hash <kind>)))
        (if (n.= <size> (binary.size data))
@@ -137,7 +137,7 @@
               {.#None}
               (case (..hash_size input)
                 0 (constructor output)
-                (^.template [<size> <write>]
+                (^.with_template [<size> <write>]
                   [<size>
                    (do try.monad
                      [head (at n.hex decoded input)
@@ -149,7 +149,7 @@
                 _ (exception.except ..not_a_hash [(..encoding_size size) encoded])))))
         (exception.except ..not_a_hash [(..encoding_size size) encoded]))))
 
-  (template [<codec> <hash> <nat> <constructor>]
+  (with_template [<codec> <hash> <nat> <constructor>]
     [(implementation: .public <codec>
        (Codec Text (Hash <hash>))
 
diff --git a/stdlib/source/program/aedifex/metadata/artifact.lux b/stdlib/source/program/aedifex/metadata/artifact.lux
index e2e363c16..7f491f3fd 100644
--- a/stdlib/source/program/aedifex/metadata/artifact.lux
+++ b/stdlib/source/program/aedifex/metadata/artifact.lux
@@ -69,7 +69,7 @@
   (%.format (..date_format (instant.date value))
             (..time_format (instant.time value))))
 
-(template [<definition> <tag>]
+(with_template [<definition> <tag>]
   [(def: <definition> xml.Tag ["" <tag>])]
 
   [<group> "groupId"]
@@ -81,7 +81,7 @@
   [<metadata> "metadata"]
   )
 
-(template [<name> <type> <tag> <pre>]
+(with_template [<name> <type> <tag> <pre>]
   [(def: <name>
      (-> <type> XML)
      (|>> <pre> {xml.#Text} list {xml.#Node <tag> xml.attributes}))]
diff --git a/stdlib/source/program/aedifex/metadata/snapshot.lux b/stdlib/source/program/aedifex/metadata/snapshot.lux
index caf25a787..2d68d194b 100644
--- a/stdlib/source/program/aedifex/metadata/snapshot.lux
+++ b/stdlib/source/program/aedifex/metadata/snapshot.lux
@@ -50,7 +50,7 @@
    [#artifact Artifact
     #versioning Versioning]))
 
-(template [<definition> <tag>]
+(with_template [<definition> <tag>]
   [(def: <definition> xml.Tag ["" <tag>])]
 
   [<group> "groupId"]
@@ -59,7 +59,7 @@
   [<metadata> "metadata"]
   )
 
-(template [<name> <type> <tag> <pre>]
+(with_template [<name> <type> <tag> <pre>]
   [(def: <name>
      (-> <type> XML)
      (|>> <pre> {xml.#Text} list {xml.#Node <tag> xml.attributes}))]
diff --git a/stdlib/source/program/aedifex/package.lux b/stdlib/source/program/aedifex/package.lux
index a08033b88..3dc430c9c 100644
--- a/stdlib/source/program/aedifex/package.lux
+++ b/stdlib/source/program/aedifex/package.lux
@@ -34,7 +34,7 @@
     #library [Binary Status]
     #pom [XML Binary Status]]))
 
-(template [<name> <tag>]
+(with_template [<name> <tag>]
   [(def: .public (<name> package)
      (-> Package Bit)
      (case (the #origin package)
diff --git a/stdlib/source/program/aedifex/pom.lux b/stdlib/source/program/aedifex/pom.lux
index 9b9cfd998..f22f80763 100644
--- a/stdlib/source/program/aedifex/pom.lux
+++ b/stdlib/source/program/aedifex/pom.lux
@@ -117,7 +117,7 @@
                 (..property "email" email)
                 (|> organization (maybe#each ..developer_organization) (maybe.else (list)))))
 
-(template [<name> <type> <tag>]
+(with_template [<name> <type> <tag>]
   [(def: <name>
      (-> <type> XML)
      (|>> ..developer' {_.#Node ["" <tag>] _.attributes}))]
diff --git a/stdlib/source/program/aedifex/profile.lux b/stdlib/source/program/aedifex/profile.lux
index 5ed623591..6420d69ac 100644
--- a/stdlib/source/program/aedifex/profile.lux
+++ b/stdlib/source/program/aedifex/profile.lux
@@ -54,7 +54,7 @@
 
   (def: (= reference subject)
     (case [reference subject]
-      (^.template [<tag>]
+      (^.with_template [<tag>]
         [[{<tag>} {<tag>}]
          true])
       ([#Repo]
diff --git a/stdlib/source/program/aedifex/repository/remote.lux b/stdlib/source/program/aedifex/repository/remote.lux
index 8a93e4cfd..29bcbad84 100644
--- a/stdlib/source/program/aedifex/repository/remote.lux
+++ b/stdlib/source/program/aedifex/repository/remote.lux
@@ -32,7 +32,7 @@
 (type: .public Address
   URL)
 
-(template [<name>]
+(with_template [<name>]
   [(exception: .public (<name> [url URL
                                 status Nat])
      (exception.report
diff --git a/stdlib/source/program/aedifex/runtime.lux b/stdlib/source/program/aedifex/runtime.lux
index 7d49725df..b738d220c 100644
--- a/stdlib/source/program/aedifex/runtime.lux
+++ b/stdlib/source/program/aedifex/runtime.lux
@@ -29,7 +29,7 @@
        (list.equivalence text.equivalence)
        ))
 
-(template [<name> <command> <environment> <parameters>]
+(with_template [<name> <command> <environment> <parameters>]
   [(def: .public <name>
      Runtime
      [#environment (dictionary.of_list text.hash (`` (list (~~ (template.spliced <environment>)))))