Merge pull request #58 from LuxLang/hierarchy_normalization

Hierarchy normalization

12 files changed, 176 insertions, 164 deletions

diff --git a/stdlib/source/test/aedifex/artifact/extension.lux b/stdlib/source/test/aedifex/artifact/extension.lux
index 9ae382975..fd28c5d92 100644
--- a/stdlib/source/test/aedifex/artifact/extension.lux
+++ b/stdlib/source/test/aedifex/artifact/extension.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [data
-    ["." text ("#\." equivalence)]
-    [collection
-     ["." set]
-     ["." list]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [data
+     ["." text ("#\." equivalence)]
+     [collection
+      ["." set]
+      ["." list]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
   [\\program
    ["." /
     ["/#" // #_
diff --git a/stdlib/source/test/aedifex/artifact/snapshot.lux b/stdlib/source/test/aedifex/artifact/snapshot.lux
index 4e968904d..94d98cf22 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    ["." try ("#\." functor)]
-    [parser
-     ["<.>" xml]]]
-   [math
-    ["." random (#+ Random) ("#\." monad)]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     ["." try ("#\." functor)]
+     [parser
+      ["<.>" xml]]]
+    [math
+     ["." random (#+ Random) ("#\." monad)]]]]
   ["$." / #_
    ["#." build]
    ["#." stamp]
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/build.lux b/stdlib/source/test/aedifex/artifact/snapshot/build.lux
index 156be7af4..731219b91 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/build.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/build.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    ["." try ("#\." functor)]
-    [parser
-     ["<.>" xml]]]
-   [math
-    ["." random (#+ Random)]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     ["." try ("#\." functor)]
+     [parser
+      ["<.>" xml]]]
+    [math
+     ["." random (#+ Random)]]]]
   [\\program
    ["." /]])
 
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux b/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
index aa3dbcff1..ba0c9f368 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    ["." try ("#\." functor)]
-    [parser
-     ["<.>" xml]]]
-   [math
-    ["." random (#+ Random)]]
-   [time
-    ["." instant]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     ["." try ("#\." functor)]
+     [parser
+      ["<.>" xml]]]
+    [math
+     ["." random (#+ Random)]]
+    [time
+     ["." instant]]]]
   [\\program
    ["." /]]
   ["$." // #_
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/time.lux b/stdlib/source/test/aedifex/artifact/snapshot/time.lux
index f6861bf9c..9cfe28fb0 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/time.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/time.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    ["." try ("#\." functor)]
-    [parser
-     ["<.>" text]]]
-   [math
-    ["." random (#+ Random)]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     ["." try ("#\." functor)]
+     [parser
+      ["<.>" text]]]
+    [math
+     ["." random (#+ Random)]]]]
   [\\program
    ["." /]]
   ["$." /// #_
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/version.lux b/stdlib/source/test/aedifex/artifact/snapshot/version.lux
index 06adc7239..f0fc26321 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/version.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/version.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    ["." try ("#\." functor)]
-    [parser
-     ["<.>" xml]]]
-   [math
-    ["." random (#+ Random)]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     ["." try ("#\." functor)]
+     [parser
+      ["<.>" xml]]]
+    [math
+     ["." random (#+ Random)]]]]
   [\\program
    ["." /]]
   ["." / #_
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux b/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
index 3ed0b32ce..dcb23646d 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    ["." try ("#\." functor)]
-    [parser
-     ["<.>" text]]]
-   [data
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]]
-   [math
-    ["." random (#+ Random) ("#\." monad)]
-    [number
-     ["n" nat]
-     ["i" int]]]
-   [time
-    ["." instant]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     ["." try ("#\." functor)]
+     [parser
+      ["<.>" text]]]
+    [data
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]]
+    [math
+     ["." random (#+ Random) ("#\." monad)]
+     [number
+      ["n" nat]
+      ["i" int]]]
+    [time
+     ["." instant]]]]
   ["$." /// #_
    ["#." stamp]]
   [\\program
diff --git a/stdlib/source/test/aedifex/artifact/time.lux b/stdlib/source/test/aedifex/artifact/time.lux
index c2ab6a354..f4fc185be 100644
--- a/stdlib/source/test/aedifex/artifact/time.lux
+++ b/stdlib/source/test/aedifex/artifact/time.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    ["." try ("#\." functor)]
-    [parser
-     ["<.>" text]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["i" int]]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     ["." try ("#\." functor)]
+     [parser
+      ["<.>" text]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["i" int]]]]]
   [\\program
    ["." /]]
   ["." / #_
diff --git a/stdlib/source/test/aedifex/artifact/time/date.lux b/stdlib/source/test/aedifex/artifact/time/date.lux
index 494aa5e07..e68645b8a 100644
--- a/stdlib/source/test/aedifex/artifact/time/date.lux
+++ b/stdlib/source/test/aedifex/artifact/time/date.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try ("#\." functor)]
-    [parser
-     ["<.>" text]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]
-     ["i" int]]]
-   [time
-    ["." date]
-    ["." year]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try ("#\." functor)]
+     [parser
+      ["<.>" text]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]
+      ["i" int]]]
+    [time
+     ["." date]
+     ["." year]]]]
   [\\program
    ["." /]])
 
diff --git a/stdlib/source/test/aedifex/artifact/time/time.lux b/stdlib/source/test/aedifex/artifact/time/time.lux
index a17f9c40c..dd4b63904 100644
--- a/stdlib/source/test/aedifex/artifact/time/time.lux
+++ b/stdlib/source/test/aedifex/artifact/time/time.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   ["." time]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try ("#\." functor)]
-    [parser
-     ["<.>" text]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]
-     ["i" int]]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    ["." time]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try ("#\." functor)]
+     [parser
+      ["<.>" text]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]
+      ["i" int]]]]]
   [\\program
    ["." /]])
 
diff --git a/stdlib/source/test/aedifex/artifact/type.lux b/stdlib/source/test/aedifex/artifact/type.lux
index 447b60bac..8418febee 100644
--- a/stdlib/source/test/aedifex/artifact/type.lux
+++ b/stdlib/source/test/aedifex/artifact/type.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [data
-    ["." text]
-    [collection
-     ["." set]
-     ["." list]]]
-   [math
-    ["." random (#+ Random) ("#\." monad)]
-    [number
-     ["n" nat]]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [data
+     ["." text]
+     [collection
+      ["." set]
+      ["." list]]]
+    [math
+     ["." random (#+ Random) ("#\." monad)]
+     [number
+      ["n" nat]]]]]
   [\\program
    ["." /]])
 
diff --git a/stdlib/source/test/aedifex/artifact/versioning.lux b/stdlib/source/test/aedifex/artifact/versioning.lux
index d1d4da7ef..9efdca98a 100644
--- a/stdlib/source/test/aedifex/artifact/versioning.lux
+++ b/stdlib/source/test/aedifex/artifact/versioning.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    ["." try ("#\." functor)]
-    [parser
-     ["<.>" xml]]]
-   [math
-    ["." random (#+ Random)]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     ["." try ("#\." functor)]
+     [parser
+      ["<.>" xml]]]
+    [math
+     ["." random (#+ Random)]]]]
   [\\program
    ["." /]]
   ["$." // #_