- Heavy refactoring.

14 files changed, 87 insertions, 87 deletions

diff --git a/new-luxc/source/luxc/lang/translation/case.jvm.lux b/new-luxc/source/luxc/lang/translation/case.jvm.lux
index cb0aa2198..e3052c77d 100644
--- a/new-luxc/source/luxc/lang/translation/case.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/case.jvm.lux
@@ -4,12 +4,12 @@
                 ["ex" exception #+ exception:])
        (data text/format)
        [meta "meta/" Monad<Meta>])
-  (luxc ["_" base]
-        [";L" host]
-        (host ["$" jvm]
-              (jvm ["$t" type]
-                   ["$i" inst]))
-        (lang ["ls" synthesis]))
+  (luxc ["_" lang]
+        (lang [";L" host]
+              (host ["$" jvm]
+                    (jvm ["$t" type]
+                         ["$i" inst]))
+              ["ls" synthesis]))
   [../runtime])
 
 (def: $Object $;Type ($t;class "java.lang.Object" (list)))
diff --git a/new-luxc/source/luxc/lang/translation/common.jvm.lux b/new-luxc/source/luxc/lang/translation/common.jvm.lux
index 4ec487d86..49e135709 100644
--- a/new-luxc/source/luxc/lang/translation/common.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/common.jvm.lux
@@ -10,11 +10,11 @@
        [host]
        (world [blob #+ Blob]
               [file #+ File]))
-  (luxc (lang [";L" variable #+ Register])
-        (host ["$" jvm]
-              (jvm ["$t" type]
-                   ["$d" def]
-                   ["$i" inst]))))
+  (luxc (lang [";L" variable #+ Register]
+              (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/lang/translation/eval.jvm.lux b/new-luxc/source/luxc/lang/translation/eval.jvm.lux
index 9514741f8..3c4eea048 100644
--- a/new-luxc/source/luxc/lang/translation/eval.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/eval.jvm.lux
@@ -4,12 +4,12 @@
        (data text/format)
        [meta]
        [host #+ do-to])
-  (luxc ["&" base]
-        (host ["$" jvm]
-              (jvm ["$t" type]
-                   ["$d" def]
-                   ["$i" inst]))
-        (lang ["la" analysis]
+  (luxc ["&" lang]
+        (lang (host ["$" jvm]
+                    (jvm ["$t" type]
+                         ["$d" def]
+                         ["$i" inst]))
+              ["la" analysis]
               ["ls" synthesis]
               (translation [";T" common]))
         ))
diff --git a/new-luxc/source/luxc/lang/translation/expression.jvm.lux b/new-luxc/source/luxc/lang/translation/expression.jvm.lux
index fa5f54647..d592c5001 100644
--- a/new-luxc/source/luxc/lang/translation/expression.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/expression.jvm.lux
@@ -7,9 +7,10 @@
              text/format)
        [meta]
        (meta ["s" syntax]))
-  (luxc ["&" base]
-        (host ["$" jvm])
-        (lang ["ls" synthesis]
+  (luxc ["&" lang]
+        (lang [";L" variable #+ Variable Register]
+              (host ["$" jvm])
+              ["ls" synthesis]
               (translation [";T" common]
                            [";T" primitive]
                            [";T" structure]
@@ -17,8 +18,7 @@
                            [";T" procedure]
                            [";T" function]
                            [";T" reference]
-                           [";T" case])
-              [";L" variable #+ Variable Register])))
+                           [";T" case]))))
 
 (exception: #export Unrecognized-Synthesis)
 
diff --git a/new-luxc/source/luxc/lang/translation/function.jvm.lux b/new-luxc/source/luxc/lang/translation/function.jvm.lux
index 0247b3d7f..d12eca16e 100644
--- a/new-luxc/source/luxc/lang/translation/function.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/function.jvm.lux
@@ -5,13 +5,13 @@
              text/format
              (coll [list "list/" Functor<List> Monoid<List>]))
        [meta])
-  (luxc ["&" base]
-        [";L" host]
-        (host ["$" jvm]
-              (jvm ["$t" type]
-                   ["$d" def]
-                   ["$i" inst]))
-        (lang ["la" analysis]
+  (luxc ["&" lang]
+        (lang [";L" host]
+              (host ["$" jvm]
+                    (jvm ["$t" type]
+                         ["$d" def]
+                         ["$i" inst]))
+              ["la" analysis]
               ["ls" synthesis]
               (translation [";T" common]
                            [";T" runtime]
diff --git a/new-luxc/source/luxc/lang/translation/loop.jvm.lux b/new-luxc/source/luxc/lang/translation/loop.jvm.lux
index 6e51d7eed..b5497236f 100644
--- a/new-luxc/source/luxc/lang/translation/loop.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/loop.jvm.lux
@@ -5,13 +5,13 @@
              text/format
              (coll [list "list/" Functor<List> Monoid<List>]))
        [meta])
-  (luxc ["&" base]
-        [";L" host]
-        (host ["$" jvm]
-              (jvm ["$t" type]
-                   ["$d" def]
-                   ["$i" inst]))
-        (lang ["la" analysis]
+  (luxc ["&" lang]
+        (lang [";L" host]
+              (host ["$" jvm]
+                    (jvm ["$t" type]
+                         ["$d" def]
+                         ["$i" inst]))
+              ["la" analysis]
               ["ls" synthesis]
               (translation [";T" common]
                            [";T" runtime]
diff --git a/new-luxc/source/luxc/lang/translation/primitive.jvm.lux b/new-luxc/source/luxc/lang/translation/primitive.jvm.lux
index f795a2980..f059aa8da 100644
--- a/new-luxc/source/luxc/lang/translation/primitive.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/primitive.jvm.lux
@@ -3,12 +3,12 @@
   (lux (control monad)
        (data text/format)
        [meta "meta/" Monad<Meta>])
-  (luxc ["&" base]
-        [";L" host]
-        (host ["$" jvm]
-              (jvm ["$i" inst]
-                   ["$t" type]))
-        (lang ["la" analysis]
+  (luxc ["&" lang]
+        (lang [";L" host]
+              (host ["$" jvm]
+                    (jvm ["$i" inst]
+                         ["$t" type]))
+              ["la" analysis]
               ["ls" synthesis]
               (translation [";T" common])))
   [../runtime])
diff --git a/new-luxc/source/luxc/lang/translation/procedure.jvm.lux b/new-luxc/source/luxc/lang/translation/procedure.jvm.lux
index 733f630d5..917edd78d 100644
--- a/new-luxc/source/luxc/lang/translation/procedure.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/procedure.jvm.lux
@@ -5,9 +5,9 @@
        (data [maybe]
              text/format
              (coll [dict])))
-  (luxc ["&" base]
-        (host ["$" jvm])
-        (lang ["ls" synthesis]))
+  (luxc ["&" lang]
+        (lang (host ["$" jvm])
+              ["ls" synthesis]))
   (. ["./;" common]
      ["./;" host]))
 
diff --git a/new-luxc/source/luxc/lang/translation/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/procedure/common.jvm.lux
index 9a01622ae..3cab88e48 100644
--- a/new-luxc/source/luxc/lang/translation/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/procedure/common.jvm.lux
@@ -12,13 +12,13 @@
        (meta [code]
              ["s" syntax #+ syntax:])
        [host])
-  (luxc ["&" base]
-        [";L" host]
-        (host ["$" jvm]
-              (jvm ["$t" type]
-                   ["$d" def]
-                   ["$i" inst]))
-        (lang ["la" analysis]
+  (luxc ["&" lang]
+        (lang [";L" host]
+              (host ["$" jvm]
+                    (jvm ["$t" type]
+                         ["$d" def]
+                         ["$i" inst]))
+              ["la" analysis]
               ["ls" synthesis]
               (translation [";T" runtime]
                            [";T" case]
diff --git a/new-luxc/source/luxc/lang/translation/procedure/host.jvm.lux b/new-luxc/source/luxc/lang/translation/procedure/host.jvm.lux
index e45c0b911..8a28e3cf7 100644
--- a/new-luxc/source/luxc/lang/translation/procedure/host.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/procedure/host.jvm.lux
@@ -14,13 +14,13 @@
        (meta [code]
              ["s" syntax #+ syntax:])
        [host])
-  (luxc ["&" base]
-        [";L" host]
-        (host ["$" jvm]
-              (jvm ["$t" type]
-                   ["$d" def]
-                   ["$i" inst]))
-        (lang ["la" analysis]
+  (luxc ["&" lang]
+        (lang [";L" host]
+              (host ["$" jvm]
+                    (jvm ["$t" type]
+                         ["$d" def]
+                         ["$i" inst]))
+              ["la" analysis]
               (analysis (procedure ["&;" host]))
               ["ls" synthesis]))
   ["@" ../common])
diff --git a/new-luxc/source/luxc/lang/translation/reference.jvm.lux b/new-luxc/source/luxc/lang/translation/reference.jvm.lux
index e9c445dd4..b714558b8 100644
--- a/new-luxc/source/luxc/lang/translation/reference.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/reference.jvm.lux
@@ -4,12 +4,12 @@
        (data [text "text/" Hash<Text>]
              text/format)
        [meta "meta/" Monad<Meta>])
-  (luxc ["&" base]
-        [";L" host]
-        (host ["$" jvm]
-              (jvm ["$t" type]
-                   ["$i" inst]))
-        (lang ["ls" synthesis]
+  (luxc ["&" lang]
+        (lang [";L" host]
+              (host ["$" jvm]
+                    (jvm ["$t" type]
+                         ["$i" inst]))
+              ["ls" synthesis]
               [";L" variable #+ Variable]
               (translation [";T" common]))))
 
diff --git a/new-luxc/source/luxc/lang/translation/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/runtime.jvm.lux
index 70450be91..fa6d6dcad 100644
--- a/new-luxc/source/luxc/lang/translation/runtime.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/runtime.jvm.lux
@@ -6,13 +6,13 @@
        [math]
        [meta]
        [host])
-  (luxc ["&" base]
-        [";L" host]
-        (host ["$" jvm]
-              (jvm ["$t" type]
-                   ["$d" def]
-                   ["$i" inst]))
-        (lang ["la" analysis]
+  (luxc ["&" lang]
+        (lang [";L" host]
+              (host ["$" jvm]
+                    (jvm ["$t" type]
+                         ["$d" def]
+                         ["$i" inst]))
+              ["la" analysis]
               ["ls" synthesis]
               (translation [";T" common]))))
 
diff --git a/new-luxc/source/luxc/lang/translation/statement.jvm.lux b/new-luxc/source/luxc/lang/translation/statement.jvm.lux
index 718175df1..232519d8b 100644
--- a/new-luxc/source/luxc/lang/translation/statement.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/statement.jvm.lux
@@ -9,15 +9,15 @@
              (coll [list "list/" Functor<List> Fold<List>]))
        [meta]
        [host])
-  (luxc ["&" base]
-        ["&;" scope]
-        ["&;" module]
+  (luxc ["&" lang]
         ["&;" io]
-        (host ["$" jvm]
-              (jvm ["$t" type]
-                   ["$d" def]
-                   ["$i" inst]))
-        (lang (translation [";T" eval]
+        (lang (host ["$" jvm]
+                    (jvm ["$t" type]
+                         ["$d" def]
+                         ["$i" inst]))
+              ["&;" scope]
+              ["&;" module]
+              (translation [";T" eval]
                            [";T" common]))))
 
 (exception: #export Invalid-Definition-Value)
diff --git a/new-luxc/source/luxc/lang/translation/structure.jvm.lux b/new-luxc/source/luxc/lang/translation/structure.jvm.lux
index 68219b87c..2c04eaa0c 100644
--- a/new-luxc/source/luxc/lang/translation/structure.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/structure.jvm.lux
@@ -6,13 +6,13 @@
              (coll [list]))
        [meta]
        [host #+ do-to])
-  (luxc ["&" base]
-        [";L" host]
-        (host ["$" jvm]
-              (jvm ["$t" type]
-                   ["$d" def]
-                   ["$i" inst]))
-        (lang ["la" analysis]
+  (luxc ["&" lang]
+        (lang [";L" host]
+              (host ["$" jvm]
+                    (jvm ["$t" type]
+                         ["$d" def]
+                         ["$i" inst]))
+              ["la" analysis]
               ["ls" synthesis]
               (translation [";T" common])))
   [../runtime])