From b48ea68a83d01903554c7696c77eedaaf1035680 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sun, 12 Jun 2022 00:38:20 -0400 Subject: De-sigil-ification: suffix : [Part 3] --- stdlib/source/program/aedifex/artifact.lux | 2 +- stdlib/source/program/aedifex/artifact/extension.lux | 2 +- stdlib/source/program/aedifex/artifact/snapshot.lux | 2 +- stdlib/source/program/aedifex/artifact/snapshot/version.lux | 2 +- stdlib/source/program/aedifex/artifact/type.lux | 2 +- stdlib/source/program/aedifex/artifact/versioning.lux | 2 +- stdlib/source/program/aedifex/command/build.lux | 8 ++++---- stdlib/source/program/aedifex/command/deploy/release.lux | 4 ++-- stdlib/source/program/aedifex/command/test.lux | 2 +- stdlib/source/program/aedifex/dependency/resolution.lux | 4 ++-- stdlib/source/program/aedifex/format.lux | 2 +- stdlib/source/program/aedifex/hash.lux | 12 ++++++------ stdlib/source/program/aedifex/metadata/artifact.lux | 4 ++-- stdlib/source/program/aedifex/metadata/snapshot.lux | 4 ++-- stdlib/source/program/aedifex/package.lux | 2 +- stdlib/source/program/aedifex/pom.lux | 2 +- stdlib/source/program/aedifex/profile.lux | 2 +- stdlib/source/program/aedifex/repository/remote.lux | 2 +- stdlib/source/program/aedifex/runtime.lux | 2 +- 19 files changed, 31 insertions(+), 31 deletions(-) (limited to 'stdlib/source/program/aedifex') 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 [ ] +(with_template [ ] [(def: Text )] 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 [] +(with_template [] [(def: .public Extension (..extension (template.symbol [//._] [])))] 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 [ ] +(with_template [ ] [(def: xml.Tag ["" ])] [ "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 [ ] +(with_template [ ] [(def: xml.Tag ["" ])] [ "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 [ ] +(with_template [ ] [(def: .public 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 [ ] +(with_template [ ] [(def: xml.Tag ["" ])] [ "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 [ ] +(with_template [ ] [(def: .public Name )] @@ -104,7 +104,7 @@ (case (..dependency_finder lux_group lux_name resolution) {.#Some dependency} (case lux_name - (^.template [ ] + (^.with_template [ ] [(pattern (static )) {try.#Success [(..remove_dependency dependency resolution) { dependency}]}]) @@ -201,7 +201,7 @@ (def: .public success "[BUILD ENDED]") (def: .public failure "[BUILD FAILED]") -(template [ ] +(with_template [ ] [(def: .public ( 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 [ ] + (^.with_template [ ] [{ 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 [ ] +(with_template [ ] [(def: (-> Text Text) (text.suffix ))] @@ -100,7 +100,7 @@ [md5 ////artifact/extension.md5] ) -(template [ ] +(with_template [ ] [(def: (-> Text Text) (|>> (text.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 [ ] + (^.with_template [ ] [{ artifact} (///runtime.for (the 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 [] +(with_template [] [(exception: .public ( [artifact Artifact extension Extension hash Text]) @@ -160,7 +160,7 @@ "Artifact" (%.text (///artifact.format (the //.#artifact dependency))) "Type" (%.text (the //.#type dependency)))) -(template [ ] +(with_template [ ] [(def: ( console repository artifact) (-> (Console Async) (Repository Async) Artifact (Async (Try Any))) (at console write (format "[" "]" 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 [] + (~~ (with_template [] [(dictionary.has (template.text []) (..runtime (the 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 [ ] + (with_template [ ] [(def: .public ( value) (-> Binary (Hash )) (|> (java/security/MessageDigest::getInstance [(ffi.as_string )]) @@ -65,7 +65,7 @@ (format representation hex))) "")) - (template [ ] + (with_template [ ] [(def: Nat )] @@ -87,7 +87,7 @@ "Expected size" (%.nat size) "Actual size" (%.nat (text.size value)))) - (template [ ] + (with_template [ ] [(exception: .public ( [data Binary]) (exception.report "Pseudo hash" (%.text (..encoded data)) @@ -98,7 +98,7 @@ [not_a_md5 ..md5::size] ) - (template [ ] + (with_template [ ] [(def: .public ( data) (-> Binary (Try (Hash ))) (if (n.= (binary.size data)) @@ -137,7 +137,7 @@ {.#None} (case (..hash_size input) 0 (constructor output) - (^.template [ ] + (^.with_template [ ] [ (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 [ ] + (with_template [ ] [(implementation: .public (Codec Text (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 [ ] +(with_template [ ] [(def: xml.Tag ["" ])] [ "groupId"] @@ -81,7 +81,7 @@ [ "metadata"] ) -(template [
]
+(with_template [   
]
   [(def: 
      (->  XML)
      (|>> 
 {xml.#Text} list {xml.#Node  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 [ ]
+(with_template [ ]
   [(def:  xml.Tag ["" ])]
 
   [ "groupId"]
@@ -59,7 +59,7 @@
   [ "metadata"]
   )
 
-(template [   
]
+(with_template [   
]
   [(def: 
      (->  XML)
      (|>> 
 {xml.#Text} list {xml.#Node  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 [ ]
+(with_template [ ]
   [(def: .public ( 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 [  ]
+(with_template [  ]
   [(def: 
      (->  XML)
      (|>> ..developer' {_.#Node ["" ] _.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 []
+      (^.with_template []
         [[{} {}]
          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 []
+(with_template []
   [(exception: .public ( [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 [   ]
+(with_template [   ]
   [(def: .public 
      Runtime
      [#environment (dictionary.of_list text.hash (`` (list (~~ (template.spliced )))))
-- 
cgit v1.2.3