From 15121222d570f8fe3c5a326208e4f0bad737e63c Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Tue, 31 Oct 2017 23:39:49 -0400
Subject: - Re-organized analysis.

---
 new-luxc/source/luxc/generator.lux | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'new-luxc/source/luxc/generator.lux')

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
-- 
cgit v1.2.3