From a4e0eb58480a05e4c23a07d33965022125c539f2 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sun, 7 Apr 2019 17:49:35 -0400
Subject: Updated the JVM compiler to the latest changes.

---
 new-luxc/source/luxc/lang/host/jvm.lux      | 17 +++++++++--------
 new-luxc/source/luxc/lang/host/jvm/def.lux  |  5 +++--
 new-luxc/source/luxc/lang/host/jvm/inst.lux |  5 +++--
 3 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'new-luxc/source/luxc/lang/host')

diff --git a/new-luxc/source/luxc/lang/host/jvm.lux b/new-luxc/source/luxc/lang/host/jvm.lux
index 71e887d4d..da9dcb974 100644
--- a/new-luxc/source/luxc/lang/host/jvm.lux
+++ b/new-luxc/source/luxc/lang/host/jvm.lux
@@ -1,7 +1,8 @@
 (.module:
   [lux (#- Type Definition)
+   [abstract
+    monad]
    [control
-    monad
     ["p" parser]]
    [data
     [collection
@@ -16,7 +17,7 @@
     [compiler
      [reference (#+ Register)]
      [phase
-      ["." translation]]]]])
+      ["." generation]]]]])
 
 ## [Host]
 (import: org/objectweb/asm/MethodVisitor)
@@ -94,17 +95,17 @@
 (type: #export Anchor [Label Register])
 
 (type: #export Host
-  (translation.Host Inst Definition))
+  (generation.Host Inst Definition))
 
 (template [<name> <base>]
   [(type: #export <name>
      (<base> ..Anchor Inst Definition))]
 
-  [State     translation.State]
-  [Operation translation.Operation]
-  [Phase     translation.Phase]
-  [Handler   translation.Handler]
-  [Bundle    translation.Bundle]
+  [State     generation.State]
+  [Operation generation.Operation]
+  [Phase     generation.Phase]
+  [Handler   generation.Handler]
+  [Bundle    generation.Bundle]
   )
 
 ## [Values]
diff --git a/new-luxc/source/luxc/lang/host/jvm/def.lux b/new-luxc/source/luxc/lang/host/jvm/def.lux
index f9b6e5c2d..012d7ceee 100644
--- a/new-luxc/source/luxc/lang/host/jvm/def.lux
+++ b/new-luxc/source/luxc/lang/host/jvm/def.lux
@@ -1,5 +1,7 @@
 (.module:
   [lux #*
+   [control
+    ["." function]]
    [data
     ["." text
      format]
@@ -7,8 +9,7 @@
     [collection
      ["." array (#+ Array)]
      ["." list ("#/." functor)]]]
-   ["." host (#+ import: do-to)]
-   ["." function]]
+   ["." host (#+ import: do-to)]]
   ["$" //
    ["$t" type]])
 
diff --git a/new-luxc/source/luxc/lang/host/jvm/inst.lux b/new-luxc/source/luxc/lang/host/jvm/inst.lux
index 36a020686..f1ae8abd2 100644
--- a/new-luxc/source/luxc/lang/host/jvm/inst.lux
+++ b/new-luxc/source/luxc/lang/host/jvm/inst.lux
@@ -1,7 +1,9 @@
 (.module:
   [lux (#- int char)
+   [abstract
+    [monad (#+ do)]]
    [control
-    [monad (#+ do)]
+    ["." function]
     ["p" parser]]
    [data
     ["." maybe]
@@ -14,7 +16,6 @@
    [macro
     ["." code]
     ["s" syntax (#+ syntax:)]]
-   ["." function]
    [tool
     [compiler
      [phase (#+ Operation)]]]]
-- 
cgit v1.2.3