9 files changed, 6 insertions, 14 deletions
diff --git a/new-luxc/source/luxc/generator.lux b/new-luxc/source/luxc/generator.lux
index 90e0ca4cf..b1068c257 100644
--- a/new-luxc/source/luxc/generator.lux
+++ b/new-luxc/source/luxc/generator.lux
@@ -14,11 +14,11 @@
         [";L" host]
         ["&;" io]
         ["&;" module]
-        ["&;" parser]
-        ["&;" analyser]
-        ["&;" analyser/common]
         ["&;" synthesizer]
         ["&;" eval]
+        (lang ["&;" parser]
+              (analysis [";A" expression]
+                        [";A" common]))
         (generator ["&&;" runtime]
                    ["&&;" statement]
                    ["&&;" common]
@@ -28,7 +28,7 @@
 
 (def: analyse
   (&;Analyser)
-  (&analyser;analyser &eval;eval))
+  (expressionA;analyser &eval;eval))
 
 (def: (generate code)
   (-> Code (Meta Unit))
@@ -49,7 +49,7 @@
                                (do @
                                  [valueA (analyse valueC)]
                                  (wrap [Type valueA])))
-                             (&analyser/common;with-unknown-type
+                             (commonA;with-unknown-type
                                (analyse valueC))))
        valueI (expressionG;generate (&synthesizer;synthesize valueA))
        _ (&;with-scope
diff --git a/new-luxc/source/luxc/generator/eval.jvm.lux b/new-luxc/source/luxc/generator/eval.jvm.lux
index 3cf5fb189..86bede8cd 100644
--- a/new-luxc/source/luxc/generator/eval.jvm.lux
+++ b/new-luxc/source/luxc/generator/eval.jvm.lux
@@ -12,7 +12,6 @@
                    ["$i" inst]))
         (lang ["la" analysis]
               ["ls" synthesis])
-        ["&;" analyser]
         ["&;" synthesizer]
         (generator ["&;" common])
         ))
diff --git a/new-luxc/source/luxc/generator/expression.jvm.lux b/new-luxc/source/luxc/generator/expression.jvm.lux
index 5eb8d7c47..e0f95b48b 100644
--- a/new-luxc/source/luxc/generator/expression.jvm.lux
+++ b/new-luxc/source/luxc/generator/expression.jvm.lux
@@ -11,7 +11,6 @@
         (host ["$" jvm])
         (lang ["ls" synthesis]
               [";L" variable #+ Variable Register])
-        ["&;" analyser]
         ["&;" synthesizer]
         (generator ["&;" common]
                    ["&;" primitive]
diff --git a/new-luxc/source/luxc/generator/function.jvm.lux b/new-luxc/source/luxc/generator/function.jvm.lux
index ed90d3aa2..70b892d41 100644
--- a/new-luxc/source/luxc/generator/function.jvm.lux
+++ b/new-luxc/source/luxc/generator/function.jvm.lux
@@ -13,7 +13,6 @@
         (lang ["la" analysis]
               ["ls" synthesis]
               [";L" variable #+ Variable])
-        ["&;" analyser]
         ["&;" synthesizer]
         (generator ["&;" common]
                    ["&;" runtime])))
diff --git a/new-luxc/source/luxc/generator/primitive.jvm.lux b/new-luxc/source/luxc/generator/primitive.jvm.lux
index 2e4eb7ccf..f772383d1 100644
--- a/new-luxc/source/luxc/generator/primitive.jvm.lux
+++ b/new-luxc/source/luxc/generator/primitive.jvm.lux
@@ -10,7 +10,6 @@
                    ["$t" type]))
         (lang ["la" analysis]
               ["ls" synthesis])
-        ["&;" analyser]
         ["&;" synthesizer]
         (generator ["&;" common]))
   [../runtime])
diff --git a/new-luxc/source/luxc/generator/procedure/common.jvm.lux b/new-luxc/source/luxc/generator/procedure/common.jvm.lux
index a61b7f0fe..a8fa81f81 100644
--- a/new-luxc/source/luxc/generator/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/generator/procedure/common.jvm.lux
@@ -17,7 +17,6 @@
                    ["$i" inst]))
         (lang ["la" analysis]
               ["ls" synthesis])
-        ["&;" analyser]
         ["&;" synthesizer]
         (generator ["&;" common]
                    ["&;" runtime])))
diff --git a/new-luxc/source/luxc/generator/procedure/host.jvm.lux b/new-luxc/source/luxc/generator/procedure/host.jvm.lux
index bc57d6a2b..97c8fb87e 100644
--- a/new-luxc/source/luxc/generator/procedure/host.jvm.lux
+++ b/new-luxc/source/luxc/generator/procedure/host.jvm.lux
@@ -21,9 +21,8 @@
                    ["$d" def]
                    ["$i" inst]))
         (lang ["la" analysis]
+              (analysis (procedure ["&;" host]))
               ["ls" synthesis])
-        ["&;" analyser]
-        (analyser (procedure ["&;" host]))
         ["&;" synthesizer]
         (generator ["&;" common]
                    ["&;" runtime]))
diff --git a/new-luxc/source/luxc/generator/runtime.jvm.lux b/new-luxc/source/luxc/generator/runtime.jvm.lux
index c5777b4af..fd8fbf74a 100644
--- a/new-luxc/source/luxc/generator/runtime.jvm.lux
+++ b/new-luxc/source/luxc/generator/runtime.jvm.lux
@@ -14,7 +14,6 @@
                    ["$i" inst]))
         (lang ["la" analysis]
               ["ls" synthesis])
-        ["&;" analyser]
         ["&;" synthesizer]
         (generator ["&;" common])))
 
diff --git a/new-luxc/source/luxc/generator/structure.jvm.lux b/new-luxc/source/luxc/generator/structure.jvm.lux
index 33cc7936c..b9dced077 100644
--- a/new-luxc/source/luxc/generator/structure.jvm.lux
+++ b/new-luxc/source/luxc/generator/structure.jvm.lux
@@ -13,7 +13,6 @@
                    ["$i" inst]))
         (lang ["la" analysis]
               ["ls" synthesis])
-        ["&;" analyser]
         ["&;" synthesizer]
         (generator ["&;" common]))
   [../runtime])