Merge pull request #58 from LuxLang/hierarchy_normalization

Hierarchy normalization

10 files changed, 184 insertions, 174 deletions

diff --git a/stdlib/source/program/aedifex/command.lux b/stdlib/source/program/aedifex/command.lux
index 5248b0273..c8f8106b4 100644
--- a/stdlib/source/program/aedifex/command.lux
+++ b/stdlib/source/program/aedifex/command.lux
@@ -1,5 +1,6 @@
 (.module:
-  [lux #*]
+  [library
+   [lux #*]]
   ["." // #_
    ["#" profile]
    ["#." action (#+ Action)]])
diff --git a/stdlib/source/program/aedifex/command/auto.lux b/stdlib/source/program/aedifex/command/auto.lux
index ee2ab4bbd..2460215b4 100644
--- a/stdlib/source/program/aedifex/command/auto.lux
+++ b/stdlib/source/program/aedifex/command/auto.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    [concurrency
-     ["." promise (#+ Promise)]]]
-   [data
-    [collection
-     ["." list]
-     ["." set]]]
-   [world
-    [program (#+ Program)]
-    [shell (#+ Exit Shell)]
-    [console (#+ Console)]
-    ["." file
-     ["." watch (#+ Watcher)]]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     [concurrency
+      ["." promise (#+ Promise)]]]
+    [data
+     [collection
+      ["." list]
+      ["." set]]]
+    [world
+     [program (#+ Program)]
+     [shell (#+ Exit Shell)]
+     [console (#+ Console)]
+     ["." file
+      ["." watch (#+ Watcher)]]]]]
   ["." // #_
    ["/#" // #_
     [command (#+ Command)]
diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux
index 34351f636..c0f9566a8 100644
--- a/stdlib/source/program/aedifex/command/build.lux
+++ b/stdlib/source/program/aedifex/command/build.lux
@@ -1,32 +1,33 @@
 (.module:
-  [lux (#- Name)
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["." io (#+ IO)]
-    [concurrency
-     ["." promise (#+ Promise) ("#\." monad)]]]
-   [data
-    ["." product]
-    ["." maybe]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor)]
-     ["." dictionary]
-     ["." set]]]
-   [math
-    [number
-     ["i" int]]]
-   [world
-    ["." program (#+ Program)]
-    ["." file (#+ Path)]
-    ["." shell (#+ Exit Process Shell)]
-    ["." console (#+ Console)]
-    [net
-     ["." uri]]]]
+  [library
+   [lux (#- Name)
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     ["." io (#+ IO)]
+     [concurrency
+      ["." promise (#+ Promise) ("#\." monad)]]]
+    [data
+     ["." product]
+     ["." maybe]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor)]
+      ["." dictionary]
+      ["." set]]]
+    [math
+     [number
+      ["i" int]]]
+    [world
+     ["." program (#+ Program)]
+     ["." file (#+ Path)]
+     ["." shell (#+ Exit Process Shell)]
+     ["." console (#+ Console)]
+     [net
+      ["." uri]]]]]
   ["." /// #_
    ["#" profile]
    ["#." action]
diff --git a/stdlib/source/program/aedifex/command/clean.lux b/stdlib/source/program/aedifex/command/clean.lux
index c37c46367..3a27e400a 100644
--- a/stdlib/source/program/aedifex/command/clean.lux
+++ b/stdlib/source/program/aedifex/command/clean.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    [try (#+ Try)]
-    [concurrency
-     ["." promise (#+ Promise)]]]
-   [data
-    [text
-     ["%" format (#+ format)]]]
-   [world
-    ["." file (#+ Path)]
-    ["." console (#+ Console)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     [try (#+ Try)]
+     [concurrency
+      ["." promise (#+ Promise)]]]
+    [data
+     [text
+      ["%" format (#+ format)]]]
+    [world
+     ["." file (#+ Path)]
+     ["." console (#+ Console)]]]]
   ["." /// #_
    [command (#+ Command)]
    ["#" profile]
diff --git a/stdlib/source/program/aedifex/command/deploy.lux b/stdlib/source/program/aedifex/command/deploy.lux
index 5ec42be78..e70e6f762 100644
--- a/stdlib/source/program/aedifex/command/deploy.lux
+++ b/stdlib/source/program/aedifex/command/deploy.lux
@@ -1,31 +1,32 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    [pipe (#+ do>)]
-    ["." try (#+ Try)]
-    [concurrency
-     ["." promise (#+ Promise) ("#\." monad)]]
-    ["<>" parser
-     ["<.>" xml]]]
-   [data
-    [binary (#+ Binary)]
-    [text
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8]]]
-    [collection
-     ["." set]]
-    [format
-     ["." binary]
-     ["." tar]
-     ["." xml]]]
-   [time
-    ["." instant (#+ Instant)]]
-   [world
-    ["." file]
-    ["." console (#+ Console)]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     [pipe (#+ do>)]
+     ["." try (#+ Try)]
+     [concurrency
+      ["." promise (#+ Promise) ("#\." monad)]]
+     ["<>" parser
+      ["<.>" xml]]]
+    [data
+     [binary (#+ Binary)]
+     [text
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8]]]
+     [collection
+      ["." set]]
+     [format
+      ["." binary]
+      ["." tar]
+      ["." xml]]]
+    [time
+     ["." instant (#+ Instant)]]
+    [world
+     ["." file]
+     ["." console (#+ Console)]]]]
   [program
    [compositor
     ["." export]]]
diff --git a/stdlib/source/program/aedifex/command/deps.lux b/stdlib/source/program/aedifex/command/deps.lux
index 416544e01..c2344ea80 100644
--- a/stdlib/source/program/aedifex/command/deps.lux
+++ b/stdlib/source/program/aedifex/command/deps.lux
@@ -1,23 +1,24 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." exception]
-    [concurrency
-     ["." promise (#+ Promise)]]]
-   [data
-    [collection
-     ["." set (#+ Set)]
-     ["." list ("#\." fold)]
-     ["." dictionary]]
-    [text
-     ["%" format]]]
-   [world
-    [net (#+ URL)]
-    [program (#+ Program)]
-    ["." file]
-    ["." console (#+ Console)]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." exception]
+     [concurrency
+      ["." promise (#+ Promise)]]]
+    [data
+     [collection
+      ["." set (#+ Set)]
+      ["." list ("#\." fold)]
+      ["." dictionary]]
+     [text
+      ["%" format]]]
+    [world
+     [net (#+ URL)]
+     [program (#+ Program)]
+     ["." file]
+     ["." console (#+ Console)]]]]
   ["." // #_
    ["#." clean]
    ["/#" // #_
diff --git a/stdlib/source/program/aedifex/command/install.lux b/stdlib/source/program/aedifex/command/install.lux
index 39bdea8b2..4cc4ede68 100644
--- a/stdlib/source/program/aedifex/command/install.lux
+++ b/stdlib/source/program/aedifex/command/install.lux
@@ -1,27 +1,28 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception]
-    [concurrency
-     ["." promise (#+ Promise)]]]
-   [data
-    [binary (#+ Binary)]
-    [text
-     [encoding
-      ["." utf8]]]
-    [collection
-     ["." set]]
-    [format
-     ["." binary]
-     ["." tar]
-     ["." xml]]]
-   [world
-    [program (#+ Program)]
-    ["." file]
-    ["." console (#+ Console)]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception]
+     [concurrency
+      ["." promise (#+ Promise)]]]
+    [data
+     [binary (#+ Binary)]
+     [text
+      [encoding
+       ["." utf8]]]
+     [collection
+      ["." set]]
+     [format
+      ["." binary]
+      ["." tar]
+      ["." xml]]]
+    [world
+     [program (#+ Program)]
+     ["." file]
+     ["." console (#+ Console)]]]]
   [program
    [compositor
     ["." export]]]
diff --git a/stdlib/source/program/aedifex/command/pom.lux b/stdlib/source/program/aedifex/command/pom.lux
index 00427ee39..6d26f4792 100644
--- a/stdlib/source/program/aedifex/command/pom.lux
+++ b/stdlib/source/program/aedifex/command/pom.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try ("#\." functor)]
-    [concurrency
-     ["." promise (#+ Promise) ("#\." monad)]]]
-   [data
-    [text
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8]]]
-    [format
-     ["." xml]]]
-   [world
-    ["." file]
-    ["." console (#+ Console)]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try ("#\." functor)]
+     [concurrency
+      ["." promise (#+ Promise) ("#\." monad)]]]
+    [data
+     [text
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8]]]
+     [format
+      ["." xml]]]
+    [world
+     ["." file]
+     ["." console (#+ Console)]]]]
   ["." /// #_
    [command (#+ Command)]
    ["#." action]
diff --git a/stdlib/source/program/aedifex/command/test.lux b/stdlib/source/program/aedifex/command/test.lux
index 55614ba80..15f8d6f22 100644
--- a/stdlib/source/program/aedifex/command/test.lux
+++ b/stdlib/source/program/aedifex/command/test.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux (#- Name)
-   [abstract
-    [monad (#+ do)]]
-   [control
-    [concurrency
-     ["." promise (#+ Promise) ("#\." monad)]]]
-   [data
-    [text
-     ["%" format (#+ format)]]]
-   [math
-    [number
-     ["i" int]]]
-   [world
-    ["." program (#+ Program)]
-    ["." file]
-    ["." shell (#+ Exit Shell)]
-    ["." console (#+ Console)]]]
+  [library
+   [lux (#- Name)
+    [abstract
+     [monad (#+ do)]]
+    [control
+     [concurrency
+      ["." promise (#+ Promise) ("#\." monad)]]]
+    [data
+     [text
+      ["%" format (#+ format)]]]
+    [math
+     [number
+      ["i" int]]]
+    [world
+     ["." program (#+ Program)]
+     ["." file]
+     ["." shell (#+ Exit Shell)]
+     ["." console (#+ Console)]]]]
   ["." // #_
    ["#." build]
    ["/#" // #_
diff --git a/stdlib/source/program/aedifex/command/version.lux b/stdlib/source/program/aedifex/command/version.lux
index be40d54eb..cd724843c 100644
--- a/stdlib/source/program/aedifex/command/version.lux
+++ b/stdlib/source/program/aedifex/command/version.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   [control
-    [concurrency
-     ["." promise (#+ Promise)]]]
-   [tool
-    [compiler
-     ["." version]
-     ["." language #_
-      ["#/." lux #_
-       ["#" version]]]]]
-   [world
-    ["." console (#+ Console)]]]
+  [library
+   [lux #*
+    [control
+     [concurrency
+      ["." promise (#+ Promise)]]]
+    [tool
+     [compiler
+      ["." version]
+      ["." language #_
+       ["#/." lux #_
+        ["#" version]]]]]
+    [world
+     ["." console (#+ Console)]]]]
   [///
    [command (#+ Command)]])