3 files changed, 52 insertions, 52 deletions
diff --git a/stdlib/source/program/aedifex/dependency/deployment.lux b/stdlib/source/program/aedifex/dependency/deployment.lux
index d63c5a0a2..5abc9979a 100644
--- a/stdlib/source/program/aedifex/dependency/deployment.lux
+++ b/stdlib/source/program/aedifex/dependency/deployment.lux
@@ -1,44 +1,44 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [codec (#+ Codec)]
-     ["." monad (#+ do)]]
+     [codec {"+" [Codec]}]
+     ["." monad {"+" [do]}]]
     [control
-     ["." try (#+ Try)]
+     ["." try {"+" [Try]}]
      [concurrency
-      ["." async (#+ Async)]]]
+      ["." async {"+" [Async]}]]]
     [data
-     [binary (#+ Binary)]
+     [binary {"+" [Binary]}]
      ["." product]
      [text
-      ["%" format (#+ format)]
+      ["%" format {"+" [format]}]
       [encoding
        ["." utf8]]]
      [collection
       ["." dictionary]
-      ["." set (#+ Set)]
+      ["." set {"+" [Set]}]
       ["." list ("#\." monoid)]]]
     [time
-     ["." instant (#+ Instant)]]]]
-  ["." /// #_
-   [repository (#+ Repository)]
-   ["#." hash (#+ Hash)]
-   ["#." package (#+ Package)]
-   ["#." artifact (#+ Artifact)
+     ["." instant {"+" [Instant]}]]]]
+  ["." /// "_"
+   [repository {"+" [Repository]}]
+   ["#." hash {"+" [Hash]}]
+   ["#." package {"+" [Package]}]
+   ["#." artifact {"+" [Artifact]}
     ["#/." time]
     ["#/." type]
-    ["#/." extension (#+ Extension)]
+    ["#/." extension {"+" [Extension]}]
     ["#/." versioning]
     ["#/." snapshot
      ["#/." version
       ["#/." value]]]]
-   ["#." metadata #_
+   ["#." metadata "_"
     ["#/." artifact]
-    ["#/." snapshot (#+ Metadata)]]
-   ["#." dependency (#+ Dependency)
-    [resolution (#+ Resolution)]
-    ["#/." status (#+ Status)]]])
+    ["#/." snapshot {"+" [Metadata]}]]
+   ["#." dependency {"+" [Dependency]}
+    [resolution {"+" [Resolution]}]
+    ["#/." status {"+" [Status]}]]])
 
 (def: (with_status repository version_template [artifact type] [data status])
   (-> (Repository Async) ///artifact.Version Dependency [Binary Status] (Async (Try Any)))
diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux
index 20f4cff71..99e8b9adf 100644
--- a/stdlib/source/program/aedifex/dependency/resolution.lux
+++ b/stdlib/source/program/aedifex/dependency/resolution.lux
@@ -1,33 +1,33 @@
 (.module:
   [library
-   [lux (#- Name)
+   [lux {"-" [Name]}
     ["@" target]
     ["." debug]
-    ["." ffi (#+ import:)]
+    ["." ffi {"+" [import:]}]
     [abstract
-     [codec (#+ Codec)]
-     [equivalence (#+ Equivalence)]
-     [monad (#+ do)]
-     ["." predicate (#+ Predicate)]]
+     [codec {"+" [Codec]}]
+     [equivalence {"+" [Equivalence]}]
+     [monad {"+" [do]}]
+     ["." predicate {"+" [Predicate]}]]
     [control
      ["." maybe]
-     ["." try (#+ Try) ("#\." functor)]
-     ["." exception (#+ Exception exception:)]
+     ["." try {"+" [Try]} ("#\." functor)]
+     ["." exception {"+" [Exception exception:]}]
      ["<>" parser
-      ["<.>" xml (#+ Parser)]]
+      ["<.>" xml {"+" [Parser]}]]
      [concurrency
-      ["." async (#+ Async)]]]
+      ["." async {"+" [Async]}]]]
     [data
-     ["." binary (#+ Binary)]
+     ["." binary {"+" [Binary]}]
      ["." name]
      ["." text
-      ["%" format (#+ format)]
+      ["%" format {"+" [format]}]
       [encoding
        ["." utf8]]]
      [format
-      ["." xml (#+ Tag XML)]]
+      ["." xml {"+" [Tag XML]}]]
      [collection
-      ["." dictionary (#+ Dictionary)]
+      ["." dictionary {"+" [Dictionary]}]
       ["." set]
       ["." list ("#\." functor monoid)]]]
     [math
@@ -35,27 +35,27 @@
       ["n" nat]
       ["." i64]]]
     [world
-     [console (#+ Console)]
-     [net (#+ URL)
+     [console {"+" [Console]}]
+     [net {"+" [URL]}
       ["." uri]
-      ["." http #_
+      ["." http "_"
        ["#" client]]]]]]
-  ["." // (#+ Dependency)
-   ["#." status (#+ Status)]
-   ["/#" // #_
+  ["." // {"+" [Dependency]}
+   ["#." status {"+" [Status]}]
+   ["/#" // "_"
     ["/" profile]
-    ["#." hash (#+ Hash SHA-1 MD5)]
+    ["#." hash {"+" [Hash SHA-1 MD5]}]
     ["#." pom]
-    ["#." package (#+ Package)]
-    ["#." artifact (#+ Version Artifact)
-     ["#/." extension (#+ Extension)]
+    ["#." package {"+" [Package]}]
+    ["#." artifact {"+" [Version Artifact]}
+     ["#/." extension {"+" [Extension]}]
      ["#/." versioning]
      ["." snapshot
       [version
        ["." value]]]]
-    ["#." repository (#+ Repository)
-     ["#/." remote (#+ Address)]
-     ["#/." origin (#+ Origin)]]
+    ["#." repository {"+" [Repository]}
+     ["#/." remote {"+" [Address]}]
+     ["#/." origin {"+" [Origin]}]]
     ["#." metadata
      ["#/." snapshot]]]])
 
diff --git a/stdlib/source/program/aedifex/dependency/status.lux b/stdlib/source/program/aedifex/dependency/status.lux
index eac5c9fd0..8d5f8ecc4 100644
--- a/stdlib/source/program/aedifex/dependency/status.lux
+++ b/stdlib/source/program/aedifex/dependency/status.lux
@@ -1,14 +1,14 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [equivalence (#+ Equivalence)]]
+     [equivalence {"+" [Equivalence]}]]
     [data
-     [binary (#+ Binary)]
+     [binary {"+" [Binary]}]
      ["." sum]
      ["." product]]]]
-  ["." /// #_
-   ["#." hash (#+ Hash SHA-1 MD5)]])
+  ["." /// "_"
+   ["#." hash {"+" [Hash SHA-1 MD5]}]])
 
 (type: .public Status
   (Variant