9 files changed, 5 insertions, 13 deletions
diff --git a/new-luxc/source/luxc/generator.lux b/new-luxc/source/luxc/generator.lux
index e4d4317fe..e9b6c4d3f 100644
--- a/new-luxc/source/luxc/generator.lux
+++ b/new-luxc/source/luxc/generator.lux
@@ -14,11 +14,11 @@
         [";L" host]
         ["&;" io]
         ["&;" module]
-        ["&;" synthesizer]
         ["&;" eval]
         (lang ["&;" syntax]
               (analysis [";A" expression]
-                        [";A" common]))
+                        [";A" common])
+              (synthesis [";S" expression]))
         (generator ["&&;" runtime]
                    ["&&;" statement]
                    ["&&;" common]
@@ -41,7 +41,7 @@
       [[_ metaA] (&;with-scope
                    (&;with-expected-type Code
                      (analyse metaC)))
-       metaI (expressionG;generate (&synthesizer;synthesize metaA))
+       metaI (expressionG;generate (expressionS;synthesize metaA))
        metaV (&&eval;eval metaI)
        [_ valueT valueA] (&;with-scope
                            (if (meta;type? (:! Code metaV))
@@ -51,7 +51,7 @@
                                  (wrap [Type valueA])))
                              (commonA;with-unknown-type
                                (analyse valueC))))
-       valueI (expressionG;generate (&synthesizer;synthesize valueA))
+       valueI (expressionG;generate (expressionS;synthesize valueA))
        _ (&;with-scope
            (&&statement;generate-def def-name valueT valueI metaI (:! Code metaV)))]
       (wrap []))
@@ -63,7 +63,7 @@
       [[_ programA] (&;with-scope
                       (&;with-expected-type (type (io;IO Unit))
                         (analyse programC)))
-       programI (expressionG;generate (&synthesizer;synthesize programA))]
+       programI (expressionG;generate (expressionS;synthesize programA))]
       (&&statement;generate-program program-args programI))
 
     _
diff --git a/new-luxc/source/luxc/generator/eval.jvm.lux b/new-luxc/source/luxc/generator/eval.jvm.lux
index 86bede8cd..2f0ce1c24 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])
-        ["&;" synthesizer]
         (generator ["&;" common])
         ))
 
diff --git a/new-luxc/source/luxc/generator/expression.jvm.lux b/new-luxc/source/luxc/generator/expression.jvm.lux
index e0f95b48b..798998510 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])
-        ["&;" synthesizer]
         (generator ["&;" common]
                    ["&;" primitive]
                    ["&;" structure]
diff --git a/new-luxc/source/luxc/generator/function.jvm.lux b/new-luxc/source/luxc/generator/function.jvm.lux
index 70b892d41..310f4d7a0 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])
-        ["&;" 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 f772383d1..637f46a85 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])
-        ["&;" 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 a8fa81f81..dffbcb64e 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])
-        ["&;" 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 97c8fb87e..9222b2e4a 100644
--- a/new-luxc/source/luxc/generator/procedure/host.jvm.lux
+++ b/new-luxc/source/luxc/generator/procedure/host.jvm.lux
@@ -23,7 +23,6 @@
         (lang ["la" analysis]
               (analysis (procedure ["&;" host]))
               ["ls" synthesis])
-        ["&;" synthesizer]
         (generator ["&;" common]
                    ["&;" runtime]))
   ["@" ../common])
diff --git a/new-luxc/source/luxc/generator/runtime.jvm.lux b/new-luxc/source/luxc/generator/runtime.jvm.lux
index fd8fbf74a..4b57e802e 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])
-        ["&;" synthesizer]
         (generator ["&;" common])))
 
 (host;import java.lang.Object)
diff --git a/new-luxc/source/luxc/generator/structure.jvm.lux b/new-luxc/source/luxc/generator/structure.jvm.lux
index b9dced077..96d5767c6 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])
-        ["&;" synthesizer]
         (generator ["&;" common]))
   [../runtime])