- Moved the "host" directory from under "generator" to under "luxc".

18 files changed, 59 insertions, 59 deletions

diff --git a/new-luxc/source/luxc/generator/case.jvm.lux b/new-luxc/source/luxc/generator/case.jvm.lux
index a619768bb..a9ea4482a 100644
--- a/new-luxc/source/luxc/generator/case.jvm.lux
+++ b/new-luxc/source/luxc/generator/case.jvm.lux
@@ -6,10 +6,10 @@
        [meta "meta/" Monad<Meta>])
   (luxc ["_" base]
         [";L" host]
-        (lang ["ls" synthesis])
-        (generator (host ["$" jvm]
-                         (jvm ["$t" type]
-                              ["$i" inst]))))
+        (host ["$" jvm]
+              (jvm ["$t" type]
+                   ["$i" inst]))
+        (lang ["ls" synthesis]))
   [../runtime])
 
 (def: $Object $;Type ($t;class "java.lang.Object" (list)))
diff --git a/new-luxc/source/luxc/generator/common.jvm.lux b/new-luxc/source/luxc/generator/common.jvm.lux
index 4439ae51d..1870530c2 100644
--- a/new-luxc/source/luxc/generator/common.jvm.lux
+++ b/new-luxc/source/luxc/generator/common.jvm.lux
@@ -9,10 +9,10 @@
              (coll [dict #+ Dict]))
        [host]
        (world [blob #+ Blob]))
-  (luxc (generator (host ["$" jvm]
-                         (jvm ["$t" type]
-                              ["$d" def]
-                              ["$i" inst])))))
+  (luxc (host ["$" jvm]
+              (jvm ["$t" type]
+                   ["$d" def]
+                   ["$i" inst]))))
 
 (host;import org.objectweb.asm.Opcodes
   (#static V1_6 int))
diff --git a/new-luxc/source/luxc/generator/eval.jvm.lux b/new-luxc/source/luxc/generator/eval.jvm.lux
index 842199a47..3cf5fb189 100644
--- a/new-luxc/source/luxc/generator/eval.jvm.lux
+++ b/new-luxc/source/luxc/generator/eval.jvm.lux
@@ -6,15 +6,15 @@
        [meta #+ Monad<Meta> "Meta/" Monad<Meta>]
        [host #+ do-to])
   (luxc ["&" base]
+        (host ["$" jvm]
+              (jvm ["$t" type]
+                   ["$d" def]
+                   ["$i" inst]))
         (lang ["la" analysis]
               ["ls" synthesis])
         ["&;" analyser]
         ["&;" synthesizer]
-        (generator ["&;" common]
-                   (host ["$" jvm]
-                         (jvm ["$t" type]
-                              ["$d" def]
-                              ["$i" inst])))
+        (generator ["&;" common])
         ))
 
 (host;import java.lang.Object)
diff --git a/new-luxc/source/luxc/generator/expression.jvm.lux b/new-luxc/source/luxc/generator/expression.jvm.lux
index 61120ef86..624070145 100644
--- a/new-luxc/source/luxc/generator/expression.jvm.lux
+++ b/new-luxc/source/luxc/generator/expression.jvm.lux
@@ -8,6 +8,7 @@
        [meta]
        (meta ["s" syntax]))
   (luxc ["&" base]
+        (host ["$" jvm])
         (lang ["ls" synthesis])
         ["&;" analyser]
         ["&;" synthesizer]
@@ -19,8 +20,7 @@
                    ["&;" procedure]
                    ["&;" function]
                    ["&;" reference]
-                   [";G" case]
-                   (host ["$" jvm]))))
+                   [";G" case])))
 
 (exception: #export Unrecognized-Synthesis)
 
diff --git a/new-luxc/source/luxc/generator/function.jvm.lux b/new-luxc/source/luxc/generator/function.jvm.lux
index ce92b9010..1b0939856 100644
--- a/new-luxc/source/luxc/generator/function.jvm.lux
+++ b/new-luxc/source/luxc/generator/function.jvm.lux
@@ -6,17 +6,17 @@
        [meta])
   (luxc ["&" base]
         [";L" host]
+        (host ["$" jvm]
+              (jvm ["$t" type]
+                   ["$d" def]
+                   ["$i" inst]))
         (lang ["la" analysis]
               ["ls" synthesis])
         ["&;" analyser]
         ["&;" synthesizer]
         (synthesizer [function])
         (generator ["&;" common]
-                   ["&;" runtime]
-                   (host ["$" jvm]
-                         (jvm ["$t" type]
-                              ["$d" def]
-                              ["$i" inst])))))
+                   ["&;" runtime])))
 
 
 (def: arity-field Text "arity")
diff --git a/new-luxc/source/luxc/generator/primitive.jvm.lux b/new-luxc/source/luxc/generator/primitive.jvm.lux
index 571ba4835..2e4eb7ccf 100644
--- a/new-luxc/source/luxc/generator/primitive.jvm.lux
+++ b/new-luxc/source/luxc/generator/primitive.jvm.lux
@@ -5,14 +5,14 @@
        [meta "meta/" Monad<Meta>])
   (luxc ["&" base]
         [";L" host]
+        (host ["$" jvm]
+              (jvm ["$i" inst]
+                   ["$t" type]))
         (lang ["la" analysis]
               ["ls" synthesis])
         ["&;" analyser]
         ["&;" synthesizer]
-        (generator ["&;" common]
-                   (host ["$" jvm]
-                         (jvm ["$i" inst]
-                              ["$t" type]))))
+        (generator ["&;" common]))
   [../runtime])
 
 (def: #export generate-unit
diff --git a/new-luxc/source/luxc/generator/procedure.jvm.lux b/new-luxc/source/luxc/generator/procedure.jvm.lux
index cc10e45aa..973f0e968 100644
--- a/new-luxc/source/luxc/generator/procedure.jvm.lux
+++ b/new-luxc/source/luxc/generator/procedure.jvm.lux
@@ -5,8 +5,8 @@
              text/format
              (coll [dict])))
   (luxc ["&" base]
-        (lang ["ls" synthesis])
-        (generator (host ["$" jvm])))
+        (host ["$" jvm])
+        (lang ["ls" synthesis]))
   (. ["./;" common]
      ["./;" host]))
 
diff --git a/new-luxc/source/luxc/generator/procedure/common.jvm.lux b/new-luxc/source/luxc/generator/procedure/common.jvm.lux
index 7ae471c64..d94ded890 100644
--- a/new-luxc/source/luxc/generator/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/generator/procedure/common.jvm.lux
@@ -11,17 +11,17 @@
        [host])
   (luxc ["&" base]
         [";L" host]
+        (host ["$" jvm]
+              (jvm ["$t" type]
+                   ["$d" def]
+                   ["$i" inst]))
         (lang ["la" analysis]
               ["ls" synthesis])
         ["&;" analyser]
         ["&;" synthesizer]
         (synthesizer [function])
         (generator ["&;" common]
-                   ["&;" runtime]
-                   (host ["$" jvm]
-                         (jvm ["$t" type]
-                              ["$d" def]
-                              ["$i" inst])))))
+                   ["&;" runtime])))
 
 (host;import java.lang.Long
   (#static MIN_VALUE Long)
diff --git a/new-luxc/source/luxc/generator/procedure/host.jvm.lux b/new-luxc/source/luxc/generator/procedure/host.jvm.lux
index 44da5744d..5fb779d41 100644
--- a/new-luxc/source/luxc/generator/procedure/host.jvm.lux
+++ b/new-luxc/source/luxc/generator/procedure/host.jvm.lux
@@ -16,6 +16,10 @@
        [host])
   (luxc ["&" base]
         [";L" host]
+        (host ["$" jvm]
+              (jvm ["$t" type]
+                   ["$d" def]
+                   ["$i" inst]))
         (lang ["la" analysis]
               ["ls" synthesis])
         ["&;" analyser]
@@ -23,11 +27,7 @@
         ["&;" synthesizer]
         (synthesizer [function])
         (generator ["&;" common]
-                   ["&;" runtime]
-                   (host ["$" jvm]
-                         (jvm ["$t" type]
-                              ["$d" def]
-                              ["$i" inst]))))
+                   ["&;" runtime]))
   ["@" ../common])
 
 (do-template [<name> <inst>]
diff --git a/new-luxc/source/luxc/generator/reference.jvm.lux b/new-luxc/source/luxc/generator/reference.jvm.lux
index 0e77b1819..3c8cbc552 100644
--- a/new-luxc/source/luxc/generator/reference.jvm.lux
+++ b/new-luxc/source/luxc/generator/reference.jvm.lux
@@ -4,12 +4,12 @@
        (data text/format)
        [meta "meta/" Monad<Meta>])
   (luxc ["&" base]
+        (host ["$" jvm]
+              (jvm ["$t" type]
+                   ["$i" inst]))
         (lang ["ls" synthesis])
         (generator [";G" common]
-                   [";G" function]
-                   (host ["$" jvm]
-                         (jvm ["$t" type]
-                              ["$i" inst])))))
+                   [";G" function])))
 
 (def: #export (generate-captured variable)
   (-> ls;Variable (Meta $;Inst))
diff --git a/new-luxc/source/luxc/generator/runtime.jvm.lux b/new-luxc/source/luxc/generator/runtime.jvm.lux
index d3f99ae6a..c5777b4af 100644
--- a/new-luxc/source/luxc/generator/runtime.jvm.lux
+++ b/new-luxc/source/luxc/generator/runtime.jvm.lux
@@ -8,15 +8,15 @@
        [host])
   (luxc ["&" base]
         [";L" host]
+        (host ["$" jvm]
+              (jvm ["$t" type]
+                   ["$d" def]
+                   ["$i" inst]))
         (lang ["la" analysis]
               ["ls" synthesis])
         ["&;" analyser]
         ["&;" synthesizer]
-        (generator ["&;" common]
-                   (host ["$" jvm]
-                         (jvm ["$t" type]
-                              ["$d" def]
-                              ["$i" inst])))))
+        (generator ["&;" common])))
 
 (host;import java.lang.Object)
 (host;import java.lang.String)
diff --git a/new-luxc/source/luxc/generator/statement.jvm.lux b/new-luxc/source/luxc/generator/statement.jvm.lux
index 6df522fb8..e91e99fc9 100644
--- a/new-luxc/source/luxc/generator/statement.jvm.lux
+++ b/new-luxc/source/luxc/generator/statement.jvm.lux
@@ -13,12 +13,12 @@
         ["&;" scope]
         ["&;" module]
         ["&;" io]
+        (host ["$" jvm]
+              (jvm ["$t" type]
+                   ["$d" def]
+                   ["$i" inst]))
         (generator ["&;" eval]
-                   ["&;" common]
-                   (host ["$" jvm]
-                         (jvm ["$t" type]
-                              ["$d" def]
-                              ["$i" inst])))))
+                   ["&;" common])))
 
 (exception: #export Invalid-Definition-Value)
 
diff --git a/new-luxc/source/luxc/generator/structure.jvm.lux b/new-luxc/source/luxc/generator/structure.jvm.lux
index 28196b914..33cc7936c 100644
--- a/new-luxc/source/luxc/generator/structure.jvm.lux
+++ b/new-luxc/source/luxc/generator/structure.jvm.lux
@@ -7,15 +7,15 @@
        [host #+ do-to])
   (luxc ["&" base]
         [";L" host]
+        (host ["$" jvm]
+              (jvm ["$t" type]
+                   ["$d" def]
+                   ["$i" inst]))
         (lang ["la" analysis]
               ["ls" synthesis])
         ["&;" analyser]
         ["&;" synthesizer]
-        (generator ["&;" common]
-                   (host ["$" jvm]
-                         (jvm ["$t" type]
-                              ["$d" def]
-                              ["$i" inst]))))
+        (generator ["&;" common]))
   [../runtime])
 
 (def: $Object $;Type ($t;class "java.lang.Object" (list)))
diff --git a/new-luxc/source/luxc/generator/host/jvm.lux b/new-luxc/source/luxc/host/jvm.lux
index 24d4a9ea9..24d4a9ea9 100644
--- a/new-luxc/source/luxc/generator/host/jvm.lux
+++ b/new-luxc/source/luxc/host/jvm.lux
diff --git a/new-luxc/source/luxc/generator/host/jvm/def.lux b/new-luxc/source/luxc/host/jvm/def.lux
index 1d50ba9f6..1d50ba9f6 100644
--- a/new-luxc/source/luxc/generator/host/jvm/def.lux
+++ b/new-luxc/source/luxc/host/jvm/def.lux
diff --git a/new-luxc/source/luxc/generator/host/jvm/inst.lux b/new-luxc/source/luxc/host/jvm/inst.lux
index 37ab75020..37ab75020 100644
--- a/new-luxc/source/luxc/generator/host/jvm/inst.lux
+++ b/new-luxc/source/luxc/host/jvm/inst.lux
diff --git a/new-luxc/source/luxc/generator/host/jvm/type.lux b/new-luxc/source/luxc/host/jvm/type.lux
index 3825d443b..3825d443b 100644
--- a/new-luxc/source/luxc/generator/host/jvm/type.lux
+++ b/new-luxc/source/luxc/host/jvm/type.lux
diff --git a/new-luxc/test/test/luxc/generator/reference.lux b/new-luxc/test/test/luxc/generator/reference.lux
index 9df6d8b10..a8bed89e1 100644
--- a/new-luxc/test/test/luxc/generator/reference.lux
+++ b/new-luxc/test/test/luxc/generator/reference.lux
@@ -8,15 +8,15 @@
        [meta]
        (meta [code])
        test)
-  (luxc (lang ["ls" synthesis])
+  (luxc (host ["$" jvm]
+              (jvm ["$i" inst]))
+        (lang ["ls" synthesis])
         ["_;" module]
         (generator [";G" statement]
                    [";G" eval]
                    [";G" expression]
                    [";G" case]
-                   [";G" runtime]
-                   (host ["$" jvm]
-                         (jvm ["$i" inst]))))
+                   [";G" runtime]))
   (test/luxc common))
 
 (def: nilI $;Inst runtimeG;noneI)