De-sigil-ification: $

6 files changed, 56 insertions, 56 deletions

diff --git a/stdlib/source/program/aedifex/artifact.lux b/stdlib/source/program/aedifex/artifact.lux
index cc90d0b78..4d3d9cc87 100644
--- a/stdlib/source/program/aedifex/artifact.lux
+++ b/stdlib/source/program/aedifex/artifact.lux
@@ -33,11 +33,11 @@
 
 (def: .public hash
   (Hash Artifact)
-  ($_ product.hash
-      text.hash
-      text.hash
-      text.hash
-      ))
+  (all product.hash
+       text.hash
+       text.hash
+       text.hash
+       ))
 
 (def: .public equivalence
   (Equivalence Artifact)
diff --git a/stdlib/source/program/aedifex/artifact/snapshot.lux b/stdlib/source/program/aedifex/artifact/snapshot.lux
index 8f06a3817..db9fa0891 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot.lux
@@ -1,19 +1,19 @@
 (.using
-  [library
-   [lux {"-" Type}
-    [abstract
-     [equivalence {"+" Equivalence}]
-     [monad {"+" do}]]
-    [control
-     ["<>" parser
-      ["<[0]>" xml {"+" Parser}]
-      ["<[0]>" text]]]
-    [data
-     ["[0]" sum]
-     [format
-      ["[0]" xml {"+" XML}]]]]]
-  ["[0]" / "_"
-   ["[1][0]" stamp {"+" Stamp}]])
+ [library
+  [lux {"-" Type}
+   [abstract
+    [equivalence {"+" Equivalence}]
+    [monad {"+" do}]]
+   [control
+    ["<>" parser
+     ["<[0]>" xml {"+" Parser}]
+     ["<[0]>" text]]]
+   [data
+    ["[0]" sum]
+    [format
+     ["[0]" xml {"+" XML}]]]]]
+ ["[0]" / "_"
+  ["[1][0]" stamp {"+" Stamp}]])
 
 (type: .public Snapshot
   (Variant
@@ -28,10 +28,10 @@
 
 (def: .public equivalence
   (Equivalence Snapshot)
-  ($_ sum.equivalence
-      ..any_equivalence
-      /stamp.equivalence
-      ))
+  (all sum.equivalence
+       ..any_equivalence
+       /stamp.equivalence
+       ))
 
 (template [<definition> <tag>]
   [(def: <definition> xml.Tag ["" <tag>])]
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux b/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
index f17f27680..55a3957a9 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
@@ -23,10 +23,10 @@
 
 (def: .public equivalence
   (Equivalence Stamp)
-  ($_ product.equivalence
-      //time.equivalence
-      //build.equivalence
-      ))
+  (all product.equivalence
+       //time.equivalence
+       //build.equivalence
+       ))
 
 (def: <timestamp>
   xml.Tag
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/version.lux b/stdlib/source/program/aedifex/artifact/snapshot/version.lux
index 66923459c..e5053ed73 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/version.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/version.lux
@@ -25,11 +25,11 @@
 
 (def: .public equivalence
   (Equivalence Version)
-  ($_ product.equivalence
-      text.equivalence
-      text.equivalence
-      ///time.equivalence
-      ))
+  (all product.equivalence
+       text.equivalence
+       text.equivalence
+       ///time.equivalence
+       ))
 
 (template [<definition> <tag>]
   [(def: <definition> xml.Tag ["" <tag>])]
@@ -60,9 +60,9 @@
 (def: .public parser
   (Parser Version)
   (<| (<xml>.node ..<snapshot_version>)
-      ($_ <>.and
-          (<xml>.somewhere (..text ..<extension>))
-          (<xml>.somewhere (..text ..<value>))
-          (<xml>.somewhere (<text>.then ///time.parser
-                                        (..text ..<updated>)))
-          )))
+      (all <>.and
+           (<xml>.somewhere (..text ..<extension>))
+           (<xml>.somewhere (..text ..<value>))
+           (<xml>.somewhere (<text>.then ///time.parser
+                                         (..text ..<updated>)))
+           )))
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux b/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux
index 65d30acdf..63bed8532 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux
@@ -18,10 +18,10 @@
 
 (def: .public equivalence
   (Equivalence Value)
-  ($_ product.equivalence
-      text.equivalence
-      ///.equivalence
-      ))
+  (all product.equivalence
+       text.equivalence
+       ///.equivalence
+       ))
 
 (def: separator
   "-")
diff --git a/stdlib/source/program/aedifex/artifact/versioning.lux b/stdlib/source/program/aedifex/artifact/versioning.lux
index 377e33a67..16789996f 100644
--- a/stdlib/source/program/aedifex/artifact/versioning.lux
+++ b/stdlib/source/program/aedifex/artifact/versioning.lux
@@ -42,11 +42,11 @@
 
 (def: .public equivalence
   (Equivalence Versioning)
-  ($_ product.equivalence
-      //snapshot.equivalence
-      //time.equivalence
-      (list.equivalence //snapshot/version.equivalence)
-      ))
+  (all product.equivalence
+       //snapshot.equivalence
+       //time.equivalence
+       (list.equivalence //snapshot/version.equivalence)
+       ))
 
 (template [<definition> <tag>]
   [(def: <definition> xml.Tag ["" <tag>])]
@@ -83,11 +83,11 @@
 (def: .public parser
   (Parser Versioning)
   (<| (<xml>.node ..<versioning>)
-      ($_ <>.and
-          (<>.else {//snapshot.#Local} (<xml>.somewhere //snapshot.parser))
-          (<>.else //time.epoch (<xml>.somewhere ..last_updated_parser))
-          (<| (<>.else (list))
-              <xml>.somewhere
-              (<xml>.node ..<snapshot_versions>)
-              (<>.some //snapshot/version.parser))
-          )))
+      (all <>.and
+           (<>.else {//snapshot.#Local} (<xml>.somewhere //snapshot.parser))
+           (<>.else //time.epoch (<xml>.somewhere ..last_updated_parser))
+           (<| (<>.else (list))
+               <xml>.somewhere
+               (<xml>.node ..<snapshot_versions>)
+               (<>.some //snapshot/version.parser))
+           )))