From b96beb587c11fcfbce86ce2d62351600cf6cad1b Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sat, 2 Jul 2022 05:38:27 -0400
Subject: More traditional names for unquoting macros.

---
 stdlib/source/program/aedifex.lux         |  2 +-
 stdlib/source/program/aedifex/format.lux  | 46 +++++++++++++++----------------
 stdlib/source/program/aedifex/runtime.lux |  4 +--
 3 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'stdlib/source/program')

diff --git a/stdlib/source/program/aedifex.lux b/stdlib/source/program/aedifex.lux
index 72473bbe9..044ca9e4d 100644
--- a/stdlib/source/program/aedifex.lux
+++ b/stdlib/source/program/aedifex.lux
@@ -133,7 +133,7 @@
 (`` (def write_only
       (Console IO)
       (implementation
-       (~~ (with_template [<name>]
+       (,, (with_template [<name>]
              [(def (<name> _)
                 (io.io (exception.except ..invalid_operation [])))]
 
diff --git a/stdlib/source/program/aedifex/format.lux b/stdlib/source/program/aedifex/format.lux
index 7be3a1752..5ba5ab385 100644
--- a/stdlib/source/program/aedifex/format.lux
+++ b/stdlib/source/program/aedifex/format.lux
@@ -28,9 +28,9 @@
 
 (def (license [name url type])
   (Format /.License)
-  (`' [#name (~ (code.text name))
-       #url (~ (code.text url))
-       #type (~ (case type
+  (`' [#name (, (code.text name))
+       #url (, (code.text url))
+       #type (, (case type
                   {/.#Repo}
                   (' "repo")
 
@@ -39,20 +39,20 @@
 
 (def (organization [name url])
   (Format /.Organization)
-  (`' [#name (~ (code.text name))
-       #url (~ (code.text url))]))
+  (`' [#name (, (code.text name))
+       #url (, (code.text url))]))
 
 (def (developer [name url organization])
   (Format /.Developer)
   (case organization
     {.#None}
-    (`' [#name (~ (code.text name))
-         #url (~ (code.text url))])
+    (`' [#name (, (code.text name))
+         #url (, (code.text url))])
 
     {.#Some value}
-    (`' [#name (~ (code.text name))
-         #url (~ (code.text url))
-         #organization (~ (..organization value))])))
+    (`' [#name (, (code.text name))
+         #url (, (code.text url))
+         #organization (, (..organization value))])))
 
 (def contributor
   (Format /.Contributor)
@@ -91,7 +91,7 @@
     aggregate
 
     value
-    (dictionary.has field (` [(~+ (list#each format value))]) aggregate)))
+    (dictionary.has field (` [(,* (list#each format value))]) aggregate)))
 
 (def (on_set field value format aggregate)
   (All (_ a)
@@ -133,28 +133,28 @@
 
 (def (artifact value)
   (Format Artifact)
-  (` [(~+ (..artifact' value))]))
+  (` [(,* (..artifact' value))]))
 
 (def (dependency [artifact type])
   (Format Dependency)
   (if (text#= //artifact/type.lux_library type)
-    (` [(~+ (..artifact' artifact))])
-    (` [(~+ (..artifact' artifact))
-        (~ (code.text type))])))
+    (` [(,* (..artifact' artifact))])
+    (` [(,* (..artifact' artifact))
+        (, (code.text type))])))
 
 (def (runtime [environment program parameters])
   (Format Runtime)
-  (` [(~+ (list#each (function (_ [var value])
-                       (` [(~ (code.text var))
-                           (~ (code.text value))]))
+  (` [(,* (list#each (function (_ [var value])
+                       (` [(, (code.text var))
+                           (, (code.text value))]))
                      (dictionary.entries environment)))
-      (~ (code.text program))
-      (~+ (list#each code.text parameters))]))
+      (, (code.text program))
+      (,* (list#each code.text parameters))]))
 
 (def (compiler [definition parameters])
   (Format Compiler)
-  (` [(~ (code.symbol definition))
-      (~+ (list#each code.text parameters))]))
+  (` [(, (code.symbol definition))
+      (,* (list#each code.text parameters))]))
 
 (def .public lux_compiler_label
   "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)
-          (~~ (with_template [<tag>]
+          (,, (with_template [<tag>]
                 [(dictionary.has (template.text [<tag>]) (..runtime (the <tag> value)))]
 
                 [/.#java]
diff --git a/stdlib/source/program/aedifex/runtime.lux b/stdlib/source/program/aedifex/runtime.lux
index 6b0a9dbc9..981ca9b12 100644
--- a/stdlib/source/program/aedifex/runtime.lux
+++ b/stdlib/source/program/aedifex/runtime.lux
@@ -32,9 +32,9 @@
 (with_template [<name> <command> <environment> <parameters>]
   [(def .public <name>
      Runtime
-     [#environment (dictionary.of_list text.hash (`` (list (~~ (template.spliced <environment>)))))
+     [#environment (dictionary.of_list text.hash (`` (list (,, (template.spliced <environment>)))))
       #program <command>
-      #parameters (`` (list (~~ (template.spliced <parameters>))))])]
+      #parameters (`` (list (,, (template.spliced <parameters>))))])]
 
   [default_java "java" [] ["-Xss16m" "--add-opens" "java.base/java.lang=ALL-UNNAMED" "-jar"]]
   [default_js "node" [] ["--stack_size=8192"]]
-- 
cgit v1.2.3