- Fixed some bugs.

- Improved error reporting.
- Implemented macro-expansion (for JVM).
- Implemented "let" compilation.

1 files changed, 11 insertions, 11 deletions

diff --git a/new-luxc/source/luxc/analyser/reference.lux b/new-luxc/source/luxc/analyser/reference.lux
index 9756a1b9c..4a2f6dbc5 100644
--- a/new-luxc/source/luxc/analyser/reference.lux
+++ b/new-luxc/source/luxc/analyser/reference.lux
@@ -1,8 +1,8 @@
 (;module:
   lux
   (lux (control monad)
-       [meta #+ Monad<Meta>]
-       (meta (type ["TC" check])))
+       [meta]
+       (meta (type ["tc" check])))
   (luxc ["&" base]
         (lang ["la" analysis #+ Analysis])
         ["&;" scope]))
@@ -10,23 +10,23 @@
 ## [Analysers]
 (def: (analyse-definition def-name)
   (-> Ident (Meta Analysis))
-  (do Monad<Meta>
-    [actual (meta;find-def-type def-name)
-     expected meta;expected-type
+  (do meta;Monad<Meta>
+    [actualT (meta;find-def-type def-name)
+     expectedT meta;expected-type
      _ (&;with-type-env
-         (TC;check expected actual))]
+         (tc;check expectedT actualT))]
     (wrap (#la;Definition def-name))))
 
 (def: (analyse-variable var-name)
   (-> Text (Meta (Maybe Analysis)))
-  (do Monad<Meta>
+  (do meta;Monad<Meta>
     [?var (&scope;find var-name)]
     (case ?var
-      (#;Some [actual ref])
+      (#;Some [actualT ref])
       (do @
-        [expected meta;expected-type
+        [expectedT meta;expected-type
          _ (&;with-type-env
-             (TC;check expected actual))]
+             (tc;check expectedT actualT))]
         (wrap (#;Some (#la;Variable ref))))
 
       #;None
@@ -36,7 +36,7 @@
   (-> Ident (Meta Analysis))
   (case reference
     ["" simple-name]
-    (do Monad<Meta>
+    (do meta;Monad<Meta>
       [?var (analyse-variable simple-name)]
       (case ?var
         (#;Some analysis)