Merge pull request #58 from LuxLang/hierarchy_normalization

Hierarchy normalization

3 files changed, 86 insertions, 83 deletions

diff --git a/lux-jvm/source/luxc/lang/host/jvm.lux b/lux-jvm/source/luxc/lang/host/jvm.lux
index a50090c5d..de92a3ba5 100644
--- a/lux-jvm/source/luxc/lang/host/jvm.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm.lux
@@ -1,31 +1,32 @@
 (.module:
-  [lux (#- Definition Type)
-   [ffi (#+ import:)]
-   [abstract
-    monad]
-   [control
-    ["<>" parser
-     ["<.>" code]]]
-   [data
-    [binary (#+ Binary)]
-    [collection
-     ["." list ("#/." functor)]]]
-   [macro
-    ["." code]
-    [syntax (#+ syntax:)]]
-   [target
-    [jvm
-     ["." type (#+ Type)
-      [category (#+ Class)]]]]
-   [tool
-    [compiler
-     [reference
-      [variable (#+ Register)]]
-     [language
-      [lux
-       ["." generation]]]
-     [meta
-      [archive (#+ Archive)]]]]])
+  [library
+   [lux (#- Definition Type)
+    [ffi (#+ import:)]
+    [abstract
+     monad]
+    [control
+     ["<>" parser
+      ["<.>" code]]]
+    [data
+     [binary (#+ Binary)]
+     [collection
+      ["." list ("#/." functor)]]]
+    [macro
+     ["." code]
+     [syntax (#+ syntax:)]]
+    [target
+     [jvm
+      ["." type (#+ Type)
+       [category (#+ Class)]]]]
+    [tool
+     [compiler
+      [reference
+       [variable (#+ Register)]]
+      [language
+       [lux
+        ["." generation]]]
+      [meta
+       [archive (#+ Archive)]]]]]])
 
 (import: org/objectweb/asm/MethodVisitor)
 
diff --git a/lux-jvm/source/luxc/lang/host/jvm/def.lux b/lux-jvm/source/luxc/lang/host/jvm/def.lux
index b2012006a..58121502a 100644
--- a/lux-jvm/source/luxc/lang/host/jvm/def.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm/def.lux
@@ -1,26 +1,27 @@
 (.module:
-  [lux (#- Type)
-   ["." ffi (#+ import: do_to)]
-   [control
-    ["." function]]
-   [data
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." array (#+ Array)]
-     ["." list ("#@." functor)]]]
-   [math
-    [number
-     ["i" int]]]
-   [target
-    [jvm
-     [encoding
-      ["." name]]
-     ["." type (#+ Type Constraint)
-      [category (#+ Class Value Method)]
-      ["." signature]
-      ["." descriptor]]]]]
+  [library
+   [lux (#- Type)
+    ["." ffi (#+ import: do_to)]
+    [control
+     ["." function]]
+    [data
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." array (#+ Array)]
+      ["." list ("#@." functor)]]]
+    [math
+     [number
+      ["i" int]]]
+    [target
+     [jvm
+      [encoding
+       ["." name]]
+      ["." type (#+ Type Constraint)
+       [category (#+ Class Value Method)]
+       ["." signature]
+       ["." descriptor]]]]]]
   ["." //])
 
 (def: signature (|>> type.signature signature.signature))
diff --git a/lux-jvm/source/luxc/lang/host/jvm/inst.lux b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
index 95de82463..8427e23e1 100644
--- a/lux-jvm/source/luxc/lang/host/jvm/inst.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
@@ -1,38 +1,39 @@
 (.module:
-  [lux (#- Type int char try)
-   ["." ffi (#+ import: do_to)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." function]
-    ["." try]
-    ["p" parser
-     ["s" code]]]
-   [data
-    ["." product]
-    ["." maybe]
-    [collection
-     ["." list ("#@." functor)]]]
-   [macro
-    [syntax (#+ syntax:)]
-    ["." code]
-    ["." template]]
-   [math
-    [number
-     ["n" nat]
-     ["i" int]]]
-   [target
-    [jvm
-     [encoding
-      ["." name (#+ External)]]
-     ["." type (#+ Type) ("#@." equivalence)
-      [category (#+ Void Value Return Method Primitive Object Class Array Var Parameter)]
-      ["." box]
-      ["." descriptor]
-      ["." reflection]]]]
-   [tool
-    [compiler
-     [phase (#+ Operation)]]]]
+  [library
+   [lux (#- Type int char try)
+    ["." ffi (#+ import: do_to)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." function]
+     ["." try]
+     ["p" parser
+      ["s" code]]]
+    [data
+     ["." product]
+     ["." maybe]
+     [collection
+      ["." list ("#@." functor)]]]
+    [macro
+     [syntax (#+ syntax:)]
+     ["." code]
+     ["." template]]
+    [math
+     [number
+      ["n" nat]
+      ["i" int]]]
+    [target
+     [jvm
+      [encoding
+       ["." name (#+ External)]]
+      ["." type (#+ Type) ("#@." equivalence)
+       [category (#+ Void Value Return Method Primitive Object Class Array Var Parameter)]
+       ["." box]
+       ["." descriptor]
+       ["." reflection]]]]
+    [tool
+     [compiler
+      [phase (#+ Operation)]]]]]
   ["." // (#+ Inst)])
 
 (def: class_name (|>> type.descriptor descriptor.class_name name.read))