Merge pull request #58 from LuxLang/hierarchy_normalization

Hierarchy normalization

12 files changed, 170 insertions, 158 deletions

diff --git a/stdlib/source/program/aedifex/artifact/extension.lux b/stdlib/source/program/aedifex/artifact/extension.lux
index ad0122512..d1102437d 100644
--- a/stdlib/source/program/aedifex/artifact/extension.lux
+++ b/stdlib/source/program/aedifex/artifact/extension.lux
@@ -1,10 +1,11 @@
 (.module:
-  [lux (#- type)
-   [data
-    ["." text
-     ["%" format (#+ format)]]]
-   [macro
-    ["." template]]]
+  [library
+   [lux (#- type)
+    [data
+     ["." text
+      ["%" format (#+ format)]]]
+    [macro
+     ["." template]]]]
   ["." // #_
    ["#" type]])
 
diff --git a/stdlib/source/program/aedifex/artifact/snapshot.lux b/stdlib/source/program/aedifex/artifact/snapshot.lux
index 89897316d..b377c1b38 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux (#- Name Type)
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monad (#+ do)]]
-   [control
-    ["<>" parser
-     ["<.>" xml (#+ Parser)]
-     ["<.>" text]]]
-   [data
-    ["." sum]
-    [format
-     ["." xml (#+ XML)]]]]
+  [library
+   [lux (#- Name Type)
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monad (#+ do)]]
+    [control
+     ["<>" parser
+      ["<.>" xml (#+ Parser)]
+      ["<.>" text]]]
+    [data
+     ["." sum]
+     [format
+      ["." xml (#+ XML)]]]]]
   ["." / #_
    ["#." stamp (#+ Stamp)]])
 
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/build.lux b/stdlib/source/program/aedifex/artifact/snapshot/build.lux
index cd87c283e..0e8692054 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/build.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/build.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monad (#+ do)]]
-   [control
-    ["<>" parser
-     ["<.>" xml (#+ Parser)]
-     ["<.>" text]]]
-   [data
-    [text
-     ["%" format]]
-    [format
-     ["." xml (#+ XML)]]]
-   [math
-    [number
-     ["." nat]]]])
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monad (#+ do)]]
+    [control
+     ["<>" parser
+      ["<.>" xml (#+ Parser)]
+      ["<.>" text]]]
+    [data
+     [text
+      ["%" format]]
+     [format
+      ["." xml (#+ XML)]]]
+    [math
+     [number
+      ["." nat]]]]])
 
 (type: #export Build
   Nat)
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux b/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
index 2d127af21..147369711 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monad (#+ do)]]
-   [control
-    ["<>" parser
-     ["<.>" xml (#+ Parser)]
-     ["<.>" text]]]
-   [data
-    ["." product]
-    [format
-     ["." xml (#+ XML)]]]]
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monad (#+ do)]]
+    [control
+     ["<>" parser
+      ["<.>" xml (#+ Parser)]
+      ["<.>" text]]]
+    [data
+     ["." product]
+     [format
+      ["." xml (#+ XML)]]]]]
   ["." // #_
    ["#." time (#+ Time)]
    ["#." build (#+ Build)]])
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/time.lux b/stdlib/source/program/aedifex/artifact/snapshot/time.lux
index e0cb8c112..46c9b149e 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/time.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/time.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monad (#+ do)]]
-   [control
-    ["." exception (#+ exception:)]
-    ["<>" parser
-     ["<.>" text]
-     ["<.>" xml (#+ Parser)]]]
-   [data
-    [text
-     ["%" format]]
-    [format
-     ["." xml (#+ XML)]]]
-   [time
-    ["." instant (#+ Instant)]]]
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monad (#+ do)]]
+    [control
+     ["." exception (#+ exception:)]
+     ["<>" parser
+      ["<.>" text]
+      ["<.>" xml (#+ Parser)]]]
+    [data
+     [text
+      ["%" format]]
+     [format
+      ["." xml (#+ XML)]]]
+    [time
+     ["." instant (#+ Instant)]]]]
   ["." /// #_
    ["#." time
     ["#/." date]
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/version.lux b/stdlib/source/program/aedifex/artifact/snapshot/version.lux
index 806d2b261..a1a50fcc2 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/version.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/version.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux (#- Type)
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monad (#+ do)]]
-   [control
-    ["<>" parser
-     ["<.>" xml (#+ Parser)]
-     ["<.>" text]]]
-   [data
-    ["." product]
-    ["." text]
-    [format
-     ["." xml (#+ XML)]]]]
+  [library
+   [lux (#- Type)
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monad (#+ do)]]
+    [control
+     ["<>" parser
+      ["<.>" xml (#+ Parser)]
+      ["<.>" text]]]
+    [data
+     ["." product]
+     ["." text]
+     [format
+      ["." xml (#+ XML)]]]]]
   ["." /// #_
    ["#." type (#+ Type)]
    ["#." time (#+ Time)]])
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux b/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux
index 7356d897c..ce9a09f1a 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]]
-   [data
-    ["." product]
-    ["." text
-     ["%" format]]]]
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]]
+    [data
+     ["." product]
+     ["." text
+      ["%" format]]]]]
   ["." /// (#+ Snapshot)
    ["#." time]
    ["#." stamp]])
diff --git a/stdlib/source/program/aedifex/artifact/time.lux b/stdlib/source/program/aedifex/artifact/time.lux
index b227c3954..41ee0d418 100644
--- a/stdlib/source/program/aedifex/artifact/time.lux
+++ b/stdlib/source/program/aedifex/artifact/time.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   ["." time]
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["<>" parser
-     ["<.>" text (#+ Parser)]]]
-   [data
-    ["." product]
-    [text
-     ["%" format (#+ Format)]]]
-   [time
-    ["." instant (#+ Instant)]]]
+  [library
+   [lux #*
+    ["." time]
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["<>" parser
+      ["<.>" text (#+ Parser)]]]
+    [data
+     ["." product]
+     [text
+      ["%" format (#+ Format)]]]
+    [time
+     ["." instant (#+ Instant)]]]]
   ["." / #_
    ["#." date]
    ["#." time]])
diff --git a/stdlib/source/program/aedifex/artifact/time/date.lux b/stdlib/source/program/aedifex/artifact/time/date.lux
index 655b8f6c2..f6b8ae5a9 100644
--- a/stdlib/source/program/aedifex/artifact/time/date.lux
+++ b/stdlib/source/program/aedifex/artifact/time/date.lux
@@ -1,26 +1,27 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]
-    [equivalence (#+ Equivalence)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["<>" parser
-     ["<.>" text (#+ Parser)]]]
-   [data
-    [text
-     ["%" format]]]
-   [math
-    [number
-     ["n" nat]
-     ["i" int]]]
-   [time
-    ["." date ("#\." equivalence)]
-    ["." year]
-    ["." month]]
-   [type
-    abstract]])
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]
+     [equivalence (#+ Equivalence)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     ["<>" parser
+      ["<.>" text (#+ Parser)]]]
+    [data
+     [text
+      ["%" format]]]
+    [math
+     [number
+      ["n" nat]
+      ["i" int]]]
+    [time
+     ["." date ("#\." equivalence)]
+     ["." year]
+     ["." month]]
+    [type
+     abstract]]])
 
 (def: #export (pad value)
   (-> Nat Text)
diff --git a/stdlib/source/program/aedifex/artifact/time/time.lux b/stdlib/source/program/aedifex/artifact/time/time.lux
index 5c074c20b..78b85f8cd 100644
--- a/stdlib/source/program/aedifex/artifact/time/time.lux
+++ b/stdlib/source/program/aedifex/artifact/time/time.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   ["." time]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["<>" parser
-     ["<.>" text (#+ Parser)]]]
-   [data
-    [text
-     ["%" format]]]
-   [math
-    [number
-     ["n" nat]]]]
+  [library
+   [lux #*
+    ["." time]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["<>" parser
+      ["<.>" text (#+ Parser)]]]
+    [data
+     [text
+      ["%" format]]]
+    [math
+     [number
+      ["n" nat]]]]]
   ["." // #_
    ["#" date]])
 
diff --git a/stdlib/source/program/aedifex/artifact/type.lux b/stdlib/source/program/aedifex/artifact/type.lux
index cbf0a35ed..22cbd8253 100644
--- a/stdlib/source/program/aedifex/artifact/type.lux
+++ b/stdlib/source/program/aedifex/artifact/type.lux
@@ -1,5 +1,6 @@
 (.module:
-  [lux (#- Type)])
+  [library
+   [lux (#- Type)]])
 
 ## https://maven.apache.org/ref/3.6.3/maven-core/artifact-handlers.html
 (type: #export Type
diff --git a/stdlib/source/program/aedifex/artifact/versioning.lux b/stdlib/source/program/aedifex/artifact/versioning.lux
index be192e9a5..9fdc2d84d 100644
--- a/stdlib/source/program/aedifex/artifact/versioning.lux
+++ b/stdlib/source/program/aedifex/artifact/versioning.lux
@@ -1,29 +1,30 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monad (#+ do)]]
-   [control
-    ["." exception (#+ exception:)]
-    ["<>" parser
-     ["<.>" xml (#+ Parser)]
-     ["<.>" text]]]
-   [data
-    ["." product]
-    ["." maybe]
-    ["." text
-     ["%" format]]
-    [format
-     ["." xml (#+ XML)]]
-    [collection
-     ["." list ("#\." functor)]]]
-   [math
-    [number
-     ["n" nat]]]
-   ["." time (#+ Time)
-    ["." date (#+ Date)]
-    ["." year]
-    ["." month]]]
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monad (#+ do)]]
+    [control
+     ["." exception (#+ exception:)]
+     ["<>" parser
+      ["<.>" xml (#+ Parser)]
+      ["<.>" text]]]
+    [data
+     ["." product]
+     ["." maybe]
+     ["." text
+      ["%" format]]
+     [format
+      ["." xml (#+ XML)]]
+     [collection
+      ["." list ("#\." functor)]]]
+    [math
+     [number
+      ["n" nat]]]
+    ["." time (#+ Time)
+     ["." date (#+ Date)]
+     ["." year]
+     ["." month]]]]
   ["." // #_
    ["#." time]
    ["#." snapshot (#+ Snapshot)