From 8ebf2d5b9d368338b2be1fa53042c84a6f8ef682 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sat, 11 Jan 2020 02:53:52 -0400
Subject: Re-located code related to Lux's compilation across the different
 phases.

---
 .../luxc/lang/translation/jvm/extension/common.lux | 17 +++++++-----
 .../luxc/lang/translation/jvm/extension/host.lux   | 31 ++++++++++++----------
 2 files changed, 27 insertions(+), 21 deletions(-)

(limited to 'new-luxc/source/luxc/lang/translation/jvm/extension')

diff --git a/new-luxc/source/luxc/lang/translation/jvm/extension/common.lux b/new-luxc/source/luxc/lang/translation/jvm/extension/common.lux
index b2f24de63..cc703f17d 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/extension/common.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/extension/common.lux
@@ -18,13 +18,16 @@
      ["." type]]]
    [tool
     [compiler
-     ["." synthesis (#+ Synthesis %synthesis)]
-     ["." phase
-      [generation
-       [extension (#+ Nullary Unary Binary Trinary Variadic
-                      nullary unary binary trinary variadic)]]
-      ["." extension
-       ["." bundle]]]]]
+     ["." phase]
+     [language
+      [lux
+       ["." synthesis (#+ Synthesis %synthesis)]
+       [phase
+        [generation
+         [extension (#+ Nullary Unary Binary Trinary Variadic
+                        nullary unary binary trinary variadic)]]
+        ["." extension
+         ["." bundle]]]]]]]
    [host (#+ import:)]]
   [luxc
    [lang
diff --git a/new-luxc/source/luxc/lang/translation/jvm/extension/host.lux b/new-luxc/source/luxc/lang/translation/jvm/extension/host.lux
index bee116b1a..b5577cfcd 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/extension/host.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/extension/host.lux
@@ -1,5 +1,6 @@
 (.module:
   [lux (#- Type primitive int char type)
+   [host (#+ import:)]
    [abstract
     ["." monad (#+ do)]]
    [control
@@ -28,21 +29,23 @@
       ["." parser]]]]
    [tool
     [compiler
-     [analysis (#+ Environment)]
      ["." reference (#+ Variable)]
-     ["." synthesis (#+ Synthesis Path %synthesis)]
-     ["." generation]
-     ["." phase ("#@." monad)
-      [generation
-       [extension (#+ Nullary Unary Binary
-                      nullary unary binary)]]
-      [analysis
-       [".A" reference]]
-      ["." extension
-       ["." bundle]
-       [analysis
-        ["/" jvm]]]]]]
-   [host (#+ import:)]]
+     ["." phase ("#@." monad)]
+     [language
+      [lux
+       [analysis (#+ Environment)]
+       ["." synthesis (#+ Synthesis Path %synthesis)]
+       ["." generation]
+       [phase
+        [generation
+         [extension (#+ Nullary Unary Binary
+                        nullary unary binary)]]
+        [analysis
+         [".A" reference]]
+        ["." extension
+         ["." bundle]
+         [analysis
+          ["/" jvm]]]]]]]]]
   [luxc
    [lang
     [host
-- 
cgit v1.2.3