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/test/aedifex/cache.lux | 102 +++++++++++++++++------------------
 1 file changed, 51 insertions(+), 51 deletions(-)

(limited to 'stdlib/source/test/aedifex/cache.lux')

diff --git a/stdlib/source/test/aedifex/cache.lux b/stdlib/source/test/aedifex/cache.lux
index a392d6ae5..9888e2f58 100644
--- a/stdlib/source/test/aedifex/cache.lux
+++ b/stdlib/source/test/aedifex/cache.lux
@@ -1,49 +1,49 @@
 (.using
-  [library
-   [lux {"-" Type type}
-    ["_" test {"+" Test}]
-    [abstract
-     ["[0]" monad {"+" do}]]
-    [control
-     ["[0]" try]
-     [concurrency
-      ["[0]" async {"+" Async}]]
-     [parser
-      ["[0]" environment]]]
-    [data
-     [binary {"+" Binary}]
-     ["[0]" text]
-     [format
-      [xml {"+" XML}]]
-     [collection
-      ["[0]" set]
-      ["[0]" dictionary]]]
-    [math
-     ["[0]" random {"+" Random} ("[1]#[0]" monad)]
-     [number
-      ["n" nat]]]
-    [world
-     ["[0]" file]
-     ["[0]" program]]]]
+ [library
+  [lux {"-" Type type}
+   ["_" test {"+" Test}]
+   [abstract
+    ["[0]" monad {"+" do}]]
+   [control
+    ["[0]" try]
+    [concurrency
+     ["[0]" async {"+" Async}]]
+    [parser
+     ["[0]" environment]]]
+   [data
+    [binary {"+" Binary}]
+    ["[0]" text]
+    [format
+     [xml {"+" XML}]]
+    [collection
+     ["[0]" set]
+     ["[0]" dictionary]]]
+   [math
+    ["[0]" random {"+" Random} ("[1]#[0]" monad)]
+    [number
+     ["n" nat]]]
+   [world
+    ["[0]" file]
+    ["[0]" program]]]]
+ [//
+  ["@[0]" profile]
+  ["@[0]" artifact]
   [//
-   ["@[0]" profile]
-   ["@[0]" artifact]
-   [//
-    [lux
-     [data
-      ["_[0]" binary]]]]]
-  [\\program
-   ["[0]" /
-    ["/[1]" // "_"
-     ["[1]" profile {"+" Profile}]
-     ["[1][0]" package {"+" Package}]
-     ["[1][0]" pom]
-     ["[1][0]" dependency {"+" Dependency}
-      ["[1]/[0]" resolution {"+" Resolution}]]
-     ["[1][0]" artifact {"+" Artifact}
-      ["[1]/[0]" type {"+" Type}]]
-     ["[1][0]" repository "_"
-      ["[1]/[0]" origin]]]]])
+   [lux
+    [data
+     ["_[0]" binary]]]]]
+ [\\program
+  ["[0]" /
+   ["/[1]" // "_"
+    ["[1]" profile {"+" Profile}]
+    ["[1][0]" package {"+" Package}]
+    ["[1][0]" pom]
+    ["[1][0]" dependency {"+" Dependency}
+     ["[1]/[0]" resolution {"+" Resolution}]]
+    ["[1][0]" artifact {"+" Artifact}
+     ["[1]/[0]" type {"+" Type}]]
+    ["[1][0]" repository "_"
+     ["[1]/[0]" origin]]]]])
 
 (def: type
   (Random Type)
@@ -57,7 +57,7 @@
                 (try.maybe
                  (do try.monad
                    [pom (//pom.write profile)
-                    identity (try.of_maybe (value@ //.#identity profile))]
+                    identity (try.of_maybe (the //.#identity profile))]
                    (in [identity profile pom]))))
               @profile.random))
 
@@ -75,7 +75,7 @@
      content ..content]
     (in [[//dependency.#artifact identity
           //dependency.#type type]
-         (with@ //package.#origin {//repository/origin.#Remote ""} (//package.local pom content))])))
+         (has //package.#origin {//repository/origin.#Remote ""} (//package.local pom content))])))
 
 (def: resolution
   (Random Resolution)
@@ -88,14 +88,14 @@
                                       (do !
                                         [pom (random.one (function (_ [identity profile pom])
                                                            (|> profile
-                                                               (with@ //.#dependencies (set.empty //dependency.hash))
-                                                               (with@ //.#identity {.#Some (value@ //dependency.#artifact dependency)})
+                                                               (has //.#dependencies (set.empty //dependency.hash))
+                                                               (has //.#identity {.#Some (the //dependency.#artifact dependency)})
                                                                //pom.write
                                                                try.maybe))
                                                          ..profile)
                                          content ..content]
                                         (in [dependency
-                                             (with@ //package.#origin {//repository/origin.#Remote ""} (//package.local pom content))])))))]
+                                             (has //package.#origin {//repository/origin.#Remote ""} (//package.local pom content))])))))]
     (in (dictionary.of_list //dependency.hash (list& [main_dependency main_package] dependencies)))))
 
 (def: singular
@@ -116,7 +116,7 @@
                           [_ wrote!
                            actual_package read!]
                           (in (# //package.equivalence =
-                                 (with@ //package.#origin {//repository/origin.#Local ""} expected_package)
+                                 (has //package.#origin {//repository/origin.#Local ""} expected_package)
                                  actual_package)))))))))
 
 (def: plural
@@ -138,7 +138,7 @@
                            actual read!]
                           (in (# //dependency/resolution.equivalence =
                                  (# dictionary.functor each
-                                    (with@ //package.#origin {//repository/origin.#Local ""})
+                                    (has //package.#origin {//repository/origin.#Local ""})
                                     expected)
                                  actual)))))))))
 
-- 
cgit v1.2.3