- Fixed some bugs.

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

1 files changed, 9 insertions, 4 deletions

diff --git a/new-luxc/source/luxc/analyser/function.lux b/new-luxc/source/luxc/analyser/function.lux
index 1432308f8..55896480e 100644
--- a/new-luxc/source/luxc/analyser/function.lux
+++ b/new-luxc/source/luxc/analyser/function.lux
@@ -1,6 +1,7 @@
 (;module:
   lux
-  (lux (control monad)
+  (lux (control monad
+                ["ex" exception #+ exception:])
        (data [maybe]
              [text]
              text/format
@@ -14,6 +15,9 @@
         (analyser ["&;" common]
                   ["&;" inference])))
 
+(exception: #export Invalid-Function-Type)
+(exception: #export Cannot-Apply-Function)
+
 ## [Analysers]
 (def: #export (analyse-function analyse func-name arg-name body)
   (-> &;Analyser Text Text Code (Meta Analysis))
@@ -21,7 +25,7 @@
     [functionT meta;expected-type]
     (loop [expectedT functionT]
       (&;with-stacked-errors
-        (function [_] (format "Functions require function types: " (type;to-text expectedT)))
+        (function [_] (Invalid-Function-Type (%type expectedT)))
         (case expectedT
           (#;Named name unnamedT)
           (recur unnamedT)
@@ -92,8 +96,9 @@
 (def: #export (analyse-apply analyse funcT funcA args)
   (-> &;Analyser Type Analysis (List Code) (Meta Analysis))
   (&;with-stacked-errors
-    (function [_] (format "Cannot apply function " (%type funcT)
-                          " to args: " (|> args (list/map %code) (text;join-with " "))))
+    (function [_]
+      (Cannot-Apply-Function (format " Function: " (%type funcT) "\n"
+                                     "Arguments: " (|> args (list/map %code) (text;join-with " ")))))
     (do Monad<Meta>
       [expected meta;expected-type
        [applyT argsA] (&inference;apply-function analyse funcT args)