From 93eb82e1bf6d2f2a6b3b0adb85f4ab93cbb766a9 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Mon, 14 Mar 2022 03:33:01 -0400
Subject: De-sigil-ification: @

---
 stdlib/source/program/aedifex/artifact.lux | 70 +++++++++++++++---------------
 1 file changed, 35 insertions(+), 35 deletions(-)

(limited to 'stdlib/source/program/aedifex/artifact.lux')

diff --git a/stdlib/source/program/aedifex/artifact.lux b/stdlib/source/program/aedifex/artifact.lux
index cc47f081e..b7342a650 100644
--- a/stdlib/source/program/aedifex/artifact.lux
+++ b/stdlib/source/program/aedifex/artifact.lux
@@ -1,20 +1,20 @@
 (.using
-  [library
-   [lux {"-" local}
-    [abstract
-     [equivalence {"+" Equivalence}]
-     [order {"+" Order}]
-     [hash {"+" Hash}]]
-    [data
-     ["[0]" product]
-     ["[0]" text ("[1]#[0]" order)
-      ["%" format {"+" Format}]]
-     [collection
-      ["[0]" list ("[1]#[0]" monoid)]]]
-    [world
-     ["[0]" file {"+" Path}]
-     [net
-      ["[0]" uri {"+" URI}]]]]])
+ [library
+  [lux {"-" local}
+   [abstract
+    [equivalence {"+" Equivalence}]
+    [order {"+" Order}]
+    [hash {"+" Hash}]]
+   [data
+    ["[0]" product]
+    ["[0]" text ("[1]#[0]" order)
+     ["%" format {"+" Format}]]
+    [collection
+     ["[0]" list ("[1]#[0]" monoid)]]]
+   [world
+    ["[0]" file {"+" Path}]
+    [net
+     ["[0]" uri {"+" URI}]]]]])
 
 (type: .public Group
   Text)
@@ -50,18 +50,18 @@
     ..equivalence)
 
   (def: (< reference subject)
-    (<| (or (text#< (value@ #group reference)
-                    (value@ #group subject)))
+    (<| (or (text#< (the #group reference)
+                    (the #group subject)))
 
-        (and (text#= (value@ #group reference)
-                     (value@ #group subject)))
-        (or (text#< (value@ #name reference)
-                    (value@ #name subject)))
+        (and (text#= (the #group reference)
+                     (the #group subject)))
+        (or (text#< (the #name reference)
+                    (the #name subject)))
         
-        (and (text#= (value@ #name reference)
-                     (value@ #name subject)))
-        (text#< (value@ #version reference)
-                (value@ #version subject)))))
+        (and (text#= (the #name reference)
+                     (the #name subject)))
+        (text#< (the #version reference)
+                (the #version subject)))))
 
 (template [<separator> <definition>]
   [(def: <definition>
@@ -75,13 +75,13 @@
 
 (def: .public (identity artifact)
   (-> Artifact Text)
-  (%.format (value@ #name artifact)
+  (%.format (the #name artifact)
             ..version_separator
-            (value@ #version artifact)))
+            (the #version artifact)))
 
 (def: .public (format value)
   (Format Artifact)
-  (%.format (value@ #group value)
+  (%.format (the #group value)
             ..identity_separator
             (..identity value)))
 
@@ -94,16 +94,16 @@
 (def: .public (uri version artifact)
   (-> Version Artifact URI)
   (let [/ uri.separator
-        group (..directory / (value@ #group artifact))
-        name (value@ #name artifact)
-        ... version (value@ #version artifact)
+        group (..directory / (the #group artifact))
+        name (the #name artifact)
+        ... version (the #version artifact)
         identity (..identity artifact)]
     (%.format group / name / version / identity)))
 
 (def: .public (local artifact)
   (-> Artifact (List Text))
   (list#composite (|> artifact
-                      (value@ #group)
+                      (the #group)
                       (text.all_split_by ..group_separator))
-                  (list (value@ #name artifact)
-                        (value@ #version artifact))))
+                  (list (the #name artifact)
+                        (the #version artifact))))
-- 
cgit v1.2.3