De-taggification | part 2

3 files changed, 36 insertions, 36 deletions

diff --git a/stdlib/source/test/aedifex/dependency/deployment.lux b/stdlib/source/test/aedifex/dependency/deployment.lux
index f87aca761..e9bcc67a4 100644
--- a/stdlib/source/test/aedifex/dependency/deployment.lux
+++ b/stdlib/source/test/aedifex/dependency/deployment.lux
@@ -1,49 +1,49 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
-     ["." hash (#+ Hash)]]
+     [monad {"+" [do]}]
+     ["." hash {"+" [Hash]}]]
     [control
-     ["." io (#+ IO)]
+     ["." io {"+" [IO]}]
      ["." maybe ("#\." functor)]
      ["." try ("#\." functor)]
      [concurrency
-      ["." atom (#+ Atom)]
+      ["." atom {"+" [Atom]}]
       ["." async]]]
     [data
      ["." product]
-     ["." binary (#+ Binary) ("#\." equivalence)]
+     ["." binary {"+" [Binary]} ("#\." equivalence)]
      ["." text
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
-      ["." dictionary (#+ Dictionary)]
+      ["." dictionary {"+" [Dictionary]}]
       ["." set]
       ["." list ("#\." mix)]]]
     [math
-     ["." random (#+ Random)]
+     ["." random {"+" [Random]}]
      [number
       ["n" nat]]]
     [world
-     [net (#+ URL)
-      ["." uri (#+ URI)]
-      ["." http #_
+     [net {"+" [URL]}
+      ["." uri {"+" [URI]}]
+      ["." http "_"
        ["#" client]
        ["#/." status]
        ["@#" /]]]]]]
   ["$." //
-   ["#/" // #_
+   ["#/" // "_"
     ["#." package]]]
   [\\program
    ["." /
-    [// (#+ Dependency)
+    [// {"+" [Dependency]}
      ["." resolution]
      [//
       ["." profile]
       ["." metadata]
-      ["." package (#+ Package)]
-      ["." artifact (#+ Artifact) ("#\." equivalence)
+      ["." package {"+" [Package]}]
+      ["." artifact {"+" [Artifact]} ("#\." equivalence)
        ["#/." type]
        ["#/." extension]]
       ["." repository
diff --git a/stdlib/source/test/aedifex/dependency/resolution.lux b/stdlib/source/test/aedifex/dependency/resolution.lux
index 9f1826f9c..79e0bde5b 100644
--- a/stdlib/source/test/aedifex/dependency/resolution.lux
+++ b/stdlib/source/test/aedifex/dependency/resolution.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
+     [monad {"+" [do]}]
      ["." predicate]
      [\\specification
       ["$." equivalence]]]
@@ -13,10 +13,10 @@
      [concurrency
       ["." async]]]
     [data
-     [binary (#+ Binary)]
+     [binary {"+" [Binary]}]
      ["." product]
      ["." text
-      ["%" format (#+ format)]
+      ["%" format {"+" [format]}]
       [encoding
        ["." utf8]]]
      [format
@@ -26,8 +26,8 @@
       ["." set]
       ["." list]]]
     [math
-     ["." random (#+ Random)]]]]
-  ["$." /// #_
+     ["." random {"+" [Random]}]]]]
+  ["$." /// "_"
    ["#." package]
    ["#." repository]
    ["#." artifact]
@@ -35,17 +35,17 @@
     ["#." version]]]
   [\\program
    ["." /
-    ["//#" /// #_
+    ["//#" /// "_"
      ["#" profile]
-     ["#." package (#+ Package)]
+     ["#." package {"+" [Package]}]
      ["#." hash]
-     ["#." dependency (#+ Dependency) ("#\." equivalence)
+     ["#." dependency {"+" [Dependency]} ("#\." equivalence)
       ["#/." status]]
      ["#." pom]
-     ["#." artifact (#+ Artifact)
+     ["#." artifact {"+" [Artifact]}
       ["#/." type]
       ["#/." extension]]
-     ["#." repository (#+ Mock)
+     ["#." repository {"+" [Mock]}
       ["#/." origin]]]]])
 
 (def: random
diff --git a/stdlib/source/test/aedifex/dependency/status.lux b/stdlib/source/test/aedifex/dependency/status.lux
index aad21027d..65bd7161e 100644
--- a/stdlib/source/test/aedifex/dependency/status.lux
+++ b/stdlib/source/test/aedifex/dependency/status.lux
@@ -1,21 +1,21 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
+     [monad {"+" [do]}]
      [\\specification
       ["$." equivalence]]]
     [data
-     ["." binary #_
+     ["." binary "_"
       ["#T" \\test]]]
     [math
-     ["." random (#+ Random) ("#\." monad)]]]]
-  ["$." /// #_
+     ["." random {"+" [Random]} ("#\." monad)]]]]
+  ["$." /// "_"
    ["#." hash]]
   [\\program
    ["." /
-    ["//#" /// #_
+    ["//#" /// "_"
      ["#." hash]]]])
 
 (def: .public random