- Now displaying the location where the analyser finds error (file-name, line & column).

3 files changed, 229 insertions, 219 deletions

diff --git a/src/lux/analyser.clj b/src/lux/analyser.clj
index 01a562bfe..a89d37ee5 100644
--- a/src/lux/analyser.clj
+++ b/src/lux/analyser.clj
@@ -2,7 +2,7 @@
   (:require (clojure [template :refer [do-template]])
             [clojure.core.match :as M :refer [matchv]]
             clojure.core.match.array
-            (lux [base :as & :refer [|do return fail return* fail* |list]]
+            (lux [base :as & :refer [|let |do return fail return* fail* |list]]
                  [reader :as &reader]
                  [parser :as &parser]
                  [type :as &type]
@@ -15,51 +15,51 @@
 (defn ^:private parse-handler [[catch+ finally+] token]
   (matchv ::M/objects [token]
     [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_catch"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ ?ex-class]]]]
-                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ ?ex-arg]]]]
-                                                                          ["lux;Cons" [?catch-body
-                                                                                       ["lux;Nil" _]]]]]]]]]]]]]
+                                                 ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ ?ex-class]]]]
+                                                              ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ ?ex-arg]]]]
+                                                                           ["lux;Cons" [?catch-body
+                                                                                        ["lux;Nil" _]]]]]]]]]]]]]
     (&/T (&/|++ catch+ (|list (&/T ?ex-class ?ex-arg ?catch-body))) finally+)
 
     [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_finally"]]]]
-                                                ["lux;Cons" [?finally-body
-                                                             ["lux;Nil" _]]]]]]]]]
+                                                 ["lux;Cons" [?finally-body
+                                                              ["lux;Nil" _]]]]]]]]]
     (&/T catch+ ?finally-body)))
 
 (let [unit (&/V "lux;Meta" (&/T (&/T "" -1 -1) (&/V "lux;TupleS" (|list))))]
   (defn ^:private aba1 [analyse eval! exo-type token]
     (matchv ::M/objects [token]
       ;; Standard special forms
-      [["lux;Meta" [meta ["lux;BoolS" ?value]]]]
+      [["lux;BoolS" ?value]]
       (|do [_ (&type/check exo-type &type/Bool)]
         (return (&/|list (&/T (&/V "bool" ?value) exo-type))))
 
-      [["lux;Meta" [meta ["lux;IntS" ?value]]]]
+      [["lux;IntS" ?value]]
       (|do [_ (&type/check exo-type &type/Int)]
         (return (&/|list (&/T (&/V "int" ?value) exo-type))))
 
-      [["lux;Meta" [meta ["lux;RealS" ?value]]]]
+      [["lux;RealS" ?value]]
       (|do [_ (&type/check exo-type &type/Real)]
         (return (&/|list (&/T (&/V "real" ?value) exo-type))))
 
-      [["lux;Meta" [meta ["lux;CharS" ?value]]]]
+      [["lux;CharS" ?value]]
       (|do [_ (&type/check exo-type &type/Char)]
         (return (&/|list (&/T (&/V "char" ?value) exo-type))))
 
-      [["lux;Meta" [meta ["lux;TextS" ?value]]]]
+      [["lux;TextS" ?value]]
       (|do [_ (&type/check exo-type &type/Text)]
         (return (&/|list (&/T (&/V "text" ?value) exo-type))))
 
-      [["lux;Meta" [meta ["lux;TupleS" ?elems]]]]
+      [["lux;TupleS" ?elems]]
       (&&lux/analyse-tuple analyse exo-type ?elems)
 
-      [["lux;Meta" [meta ["lux;RecordS" ?elems]]]]
+      [["lux;RecordS" ?elems]]
       (&&lux/analyse-record analyse exo-type ?elems)
 
-      [["lux;Meta" [meta ["lux;TagS" ?ident]]]]
+      [["lux;TagS" ?ident]]
       (&&lux/analyse-variant analyse exo-type ?ident unit)
       
-      [["lux;Meta" [meta ["lux;SymbolS" [_ "_jvm_null"]]]]]
+      [["lux;SymbolS" [_ "_jvm_null"]]]
       (return (&/|list (&/T (&/V "jvm-null" nil) (&/V "lux;DataT" "null"))))
 
       [_]
@@ -68,51 +68,51 @@
 
 (defn ^:private aba2 [analyse eval! exo-type token]
   (matchv ::M/objects [token]
-    [["lux;Meta" [meta ["lux;SymbolS" ?ident]]]]
+    [["lux;SymbolS" ?ident]]
     (&&lux/analyse-symbol analyse exo-type ?ident)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_case"]]]]
-                                                ["lux;Cons" [?value ?branches]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_case"]]]]
+                               ["lux;Cons" [?value ?branches]]]]]]
     (&&lux/analyse-case analyse exo-type ?value ?branches)
     
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_lambda"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ?self]]]
-                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ?arg]]]
-                                                                          ["lux;Cons" [?body
-                                                                                       ["lux;Nil" _]]]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_lambda"]]]]
+                               ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ?self]]]
+                                            ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ?arg]]]
+                                                         ["lux;Cons" [?body
+                                                                      ["lux;Nil" _]]]]]]]]]]]
     (&&lux/analyse-lambda analyse exo-type ?self ?arg ?body)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_def"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?name]]]]
-                                                             ["lux;Cons" [?value
-                                                                          ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_def"]]]]
+                               ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?name]]]]
+                                            ["lux;Cons" [?value
+                                                         ["lux;Nil" _]]]]]]]]]
     (&&lux/analyse-def analyse ?name ?value)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_declare-macro"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?name]]]]
-                                                             ["lux;Nil" _]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_declare-macro"]]]]
+                               ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?name]]]]
+                                            ["lux;Nil" _]]]]]]]
     (&&lux/analyse-declare-macro analyse ?name)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_import"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;TextS" ?path]]]
-                                                             ["lux;Nil" _]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_import"]]]]
+                               ["lux;Cons" [["lux;Meta" [_ ["lux;TextS" ?path]]]
+                                            ["lux;Nil" _]]]]]]]
     (&&lux/analyse-import analyse ?path)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_:"]]]]
-                                                ["lux;Cons" [?type
-                                                             ["lux;Cons" [?value
-                                                                          ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_:"]]]]
+                               ["lux;Cons" [?type
+                                            ["lux;Cons" [?value
+                                                         ["lux;Nil" _]]]]]]]]]
     (&&lux/analyse-check analyse eval! exo-type ?type ?value)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_:!"]]]]
-                                                ["lux;Cons" [?type
-                                                             ["lux;Cons" [?value
-                                                                          ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_:!"]]]]
+                               ["lux;Cons" [?type
+                                            ["lux;Cons" [?value
+                                                         ["lux;Nil" _]]]]]]]]]
     (&&lux/analyse-coerce analyse eval! ?type ?value)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_export"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?ident]]]]
-                                                             ["lux;Nil" _]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_export"]]]]
+                               ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?ident]]]]
+                                            ["lux;Nil" _]]]]]]]
     (&&lux/analyse-export analyse ?ident)
 
     [_]
@@ -122,53 +122,53 @@
   (matchv ::M/objects [token]
     ;; Host special forms
     ;; Integer arithmetic
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_iadd"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_iadd"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-iadd analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_isub"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_isub"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-isub analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_imul"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_imul"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-imul analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_idiv"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_idiv"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-idiv analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_irem"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_irem"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-irem analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_ieq"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_ieq"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-ieq analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_ilt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_ilt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-ilt analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_igt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_igt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-igt analyse ?x ?y)
 
     ;; Long arithmetic
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_ladd"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_ladd"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-ladd analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lsub"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lsub"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-lsub analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lmul"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lmul"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-lmul analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_ldiv"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_ldiv"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-ldiv analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lrem"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lrem"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-lrem analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_leq"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_leq"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-leq analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_llt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_llt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-llt analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lgt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lgt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-lgt analyse ?x ?y)
 
     [_]
@@ -177,53 +177,53 @@
 (defn ^:private aba4 [analyse eval! exo-type token]
   (matchv ::M/objects [token]
     ;; Float arithmetic
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_fadd"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_fadd"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-fadd analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_fsub"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_fsub"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-fsub analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_fmul"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_fmul"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-fmul analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_fdiv"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_fdiv"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-fdiv analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_frem"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_frem"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-frem analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_feq"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_feq"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-feq analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_flt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_flt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-flt analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_fgt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_fgt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-fgt analyse ?x ?y)
 
     ;; Double arithmetic
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_dadd"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_dadd"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-dadd analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_dsub"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_dsub"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-dsub analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_dmul"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_dmul"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-dmul analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_ddiv"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_ddiv"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-ddiv analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_drem"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_drem"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-drem analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_deq"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_deq"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-deq analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_dlt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_dlt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-dlt analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_dgt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_dgt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-dgt analyse ?x ?y)
 
     [_]
@@ -232,101 +232,101 @@
 (defn ^:private aba5 [analyse eval! exo-type token]
   (matchv ::M/objects [token]
     ;; Objects
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_null?"]]]]
-                                                ["lux;Cons" [?object
-                                                             ["lux;Nil" _]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_null?"]]]]
+                               ["lux;Cons" [?object
+                                            ["lux;Nil" _]]]]]]]
     (&&host/analyse-jvm-null? analyse ?object)
     
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_new"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ ?class]]]]
-                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?classes]]]
-                                                                          ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?args]]]
-                                                                                       ["lux;Nil" _]]]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_new"]]]]
+                               ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ ?class]]]]
+                                            ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?classes]]]
+                                                         ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?args]]]
+                                                                      ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-new analyse ?class ?classes ?args)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_getstatic"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?class]]]]
-                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?field]]]]
-                                                                          ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_getstatic"]]]]
+                               ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?class]]]]
+                                            ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?field]]]]
+                                                         ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-getstatic analyse ?class ?field)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_getfield"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?class]]]]
-                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?field]]]]
-                                                                          ["lux;Cons" [?object
-                                                                                       ["lux;Nil" _]]]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_getfield"]]]]
+                               ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?class]]]]
+                                            ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?field]]]]
+                                                         ["lux;Cons" [?object
+                                                                      ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-getfield analyse ?class ?field ?object)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_putstatic"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?class]]]]
-                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?field]]]]
-                                                                          ["lux;Cons" [?value
-                                                                                       ["lux;Nil" _]]]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_putstatic"]]]]
+                               ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?class]]]]
+                                            ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?field]]]]
+                                                         ["lux;Cons" [?value
+                                                                      ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-putstatic analyse ?class ?field ?value)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_putfield"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?class]]]]
-                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?field]]]]
-                                                                          ["lux;Cons" [?object
-                                                                                       ["lux;Cons" [?value
-                                                                                                    ["lux;Nil" _]]]]]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_putfield"]]]]
+                               ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?class]]]]
+                                            ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?field]]]]
+                                                         ["lux;Cons" [?object
+                                                                      ["lux;Cons" [?value
+                                                                                   ["lux;Nil" _]]]]]]]]]]]]]
     (&&host/analyse-jvm-putfield analyse ?class ?field ?object ?value)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_invokestatic"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?class]]]]
-                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?method]]]]
-                                                                          ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?classes]]]
-                                                                                       ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?args]]]
-                                                                                                    ["lux;Nil" _]]]]]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_invokestatic"]]]]
+                               ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?class]]]]
+                                            ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?method]]]]
+                                                         ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?classes]]]
+                                                                      ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?args]]]
+                                                                                   ["lux;Nil" _]]]]]]]]]]]]]
     (&&host/analyse-jvm-invokestatic analyse ?class ?method ?classes ?args)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_invokevirtual"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?class]]]]
-                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?method]]]]
-                                                                          ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?classes]]]
-                                                                                       ["lux;Cons" [?object
-                                                                                                    ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?args]]]
-                                                                                                                 ["lux;Nil" _]]]]]]]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_invokevirtual"]]]]
+                               ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?class]]]]
+                                            ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?method]]]]
+                                                         ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?classes]]]
+                                                                      ["lux;Cons" [?object
+                                                                                   ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?args]]]
+                                                                                                ["lux;Nil" _]]]]]]]]]]]]]]]
     (&&host/analyse-jvm-invokevirtual analyse ?class ?method ?classes ?object ?args)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_invokeinterface"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?class]]]]
-                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?method]]]]
-                                                                          ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?classes]]]
-                                                                                       ["lux;Cons" [?object
-                                                                                                    ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?args]]]
-                                                                                                                 ["lux;Nil" _]]]]]]]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_invokeinterface"]]]]
+                               ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?class]]]]
+                                            ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?method]]]]
+                                                         ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?classes]]]
+                                                                      ["lux;Cons" [?object
+                                                                                   ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?args]]]
+                                                                                                ["lux;Nil" _]]]]]]]]]]]]]]]
     (&&host/analyse-jvm-invokeinterface analyse ?class ?method ?classes ?object ?args)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_invokespecial"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?class]]]]
-                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?method]]]]
-                                                                          ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?classes]]]
-                                                                                       ["lux;Cons" [?object
-                                                                                                    ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?args]]]
-                                                                                                                 ["lux;Nil" _]]]]]]]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_invokespecial"]]]]
+                               ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?class]]]]
+                                            ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?method]]]]
+                                                         ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?classes]]]
+                                                                      ["lux;Cons" [?object
+                                                                                   ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?args]]]
+                                                                                                ["lux;Nil" _]]]]]]]]]]]]]]]
     (&&host/analyse-jvm-invokespecial analyse ?class ?method ?classes ?object ?args)
     
     ;; Exceptions
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_try"]]]]
-                                                ["lux;Cons" [?body
-                                                             ?handlers]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_try"]]]]
+                               ["lux;Cons" [?body
+                                            ?handlers]]]]]]
     (&&host/analyse-jvm-try analyse ?body (&/fold parse-handler [(list) nil] ?handlers))
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_throw"]]]]
-                                                ["lux;Cons" [?ex
-                                                             ["lux;Nil" _]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_throw"]]]]
+                               ["lux;Cons" [?ex
+                                            ["lux;Nil" _]]]]]]]
     (&&host/analyse-jvm-throw analyse ?ex)
 
     ;; Syncronization/monitos
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_monitorenter"]]]]
-                                                ["lux;Cons" [?monitor
-                                                             ["lux;Nil" _]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_monitorenter"]]]]
+                               ["lux;Cons" [?monitor
+                                            ["lux;Nil" _]]]]]]]
     (&&host/analyse-jvm-monitorenter analyse ?monitor)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_monitorexit"]]]]
-                                                ["lux;Cons" [?monitor
-                                                             ["lux;Nil" _]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_monitorexit"]]]]
+                               ["lux;Cons" [?monitor
+                                            ["lux;Nil" _]]]]]]]
     (&&host/analyse-jvm-monitorexit analyse ?monitor)
 
     [_]
@@ -335,74 +335,74 @@
 (defn ^:private aba6 [analyse eval! exo-type token]
   (matchv ::M/objects [token]
     ;; Primitive conversions
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_d2f"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_d2f"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
     (&&host/analyse-jvm-d2f analyse ?value)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_d2i"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_d2i"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
     (&&host/analyse-jvm-d2i analyse ?value)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_d2l"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_d2l"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
     (&&host/analyse-jvm-d2l analyse ?value)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_f2d"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_f2d"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
     (&&host/analyse-jvm-f2d analyse ?value)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_f2i"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_f2i"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
     (&&host/analyse-jvm-f2i analyse ?value)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_f2l"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_f2l"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
     (&&host/analyse-jvm-f2l analyse ?value)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2b"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2b"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
     (&&host/analyse-jvm-i2b analyse ?value)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2c"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2c"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
     (&&host/analyse-jvm-i2c analyse ?value)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2d"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2d"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
     (&&host/analyse-jvm-i2d analyse ?value)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2f"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2f"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
     (&&host/analyse-jvm-i2f analyse ?value)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2l"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2l"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
     (&&host/analyse-jvm-i2l analyse ?value)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2s"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2s"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
     (&&host/analyse-jvm-i2s analyse ?value)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_l2d"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_l2d"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
     (&&host/analyse-jvm-l2d analyse ?value)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_l2f"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_l2f"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
     (&&host/analyse-jvm-l2f analyse ?value)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_l2i"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_l2i"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
     (&&host/analyse-jvm-l2i analyse ?value)
 
     ;; Bitwise operators
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_iand"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_iand"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-iand analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_ior"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_ior"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-ior analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_land"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_land"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-land analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lor"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lor"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-lor analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lxor"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lxor"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-lxor analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lshl"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lshl"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-lshl analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lshr"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lshr"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-lshr analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lushr"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lushr"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-lushr analyse ?x ?y)
 
     [_]
@@ -411,107 +411,115 @@
 (defn ^:private aba7 [analyse eval! exo-type token]
   (matchv ::M/objects [token]
     ;; Arrays
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_new-array"]]]]
-                                                 ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ ?class]]]]
-                                                              ["lux;Cons" [["lux;Meta" [_ ["lux;IntS" ?length]]]
-                                                                           ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_new-array"]]]]
+                               ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ ?class]]]]
+                                            ["lux;Cons" [["lux;Meta" [_ ["lux;IntS" ?length]]]
+                                                         ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-new-array analyse ?class ?length)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_aastore"]]]]
-                                                 ["lux;Cons" [?array
-                                                              ["lux;Cons" [["lux;Meta" [_ ["lux;IntS" ?idx]]]
-                                                                           ["lux;Cons" [?elem
-                                                                                        ["lux;Nil" _]]]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_aastore"]]]]
+                               ["lux;Cons" [?array
+                                            ["lux;Cons" [["lux;Meta" [_ ["lux;IntS" ?idx]]]
+                                                         ["lux;Cons" [?elem
+                                                                      ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-aastore analyse ?array ?idx ?elem)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_aaload"]]]]
-                                                 ["lux;Cons" [?array
-                                                              ["lux;Cons" [["lux;Meta" [_ ["lux;IntS" ?idx]]]
-                                                                           ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_aaload"]]]]
+                               ["lux;Cons" [?array
+                                            ["lux;Cons" [["lux;Meta" [_ ["lux;IntS" ?idx]]]
+                                                         ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-aaload analyse ?array ?idx)
 
     ;; Classes & interfaces
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_class"]]]]
-                                                 ["lux;Cons" [["lux;Meta" [_ ["lux;TextS" ?name]]]
-                                                              ["lux;Cons" [["lux;Meta" [_ ["lux;TextS" ?super-class]]]
-                                                                           ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?interfaces]]]
-                                                                                        ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?fields]]]
-                                                                                                     ?methods]]]]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_class"]]]]
+                               ["lux;Cons" [["lux;Meta" [_ ["lux;TextS" ?name]]]
+                                            ["lux;Cons" [["lux;Meta" [_ ["lux;TextS" ?super-class]]]
+                                                         ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?interfaces]]]
+                                                                      ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?fields]]]
+                                                                                   ?methods]]]]]]]]]]]]
     (&&host/analyse-jvm-class analyse ?name ?super-class ?interfaces ?fields ?methods)
 
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_interface"]]]]
-                                                 ["lux;Cons" [["lux;Meta" [_ ["lux;TextS" ?name]]]
-                                                              ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?supers]]]
-                                                                           ?methods]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_interface"]]]]
+                               ["lux;Cons" [["lux;Meta" [_ ["lux;TextS" ?name]]]
+                                            ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?supers]]]
+                                                         ?methods]]]]]]]]
     (&&host/analyse-jvm-interface analyse ?name ?supers ?methods)
 
     ;; Programs
-    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_program"]]]]
-                                                 ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ ?args]]]]
-                                                              ["lux;Cons" [?body
-                                                                           ["lux;Nil" _]]]]]]]]]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_program"]]]]
+                               ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ ?args]]]]
+                                            ["lux;Cons" [?body
+                                                         ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-program analyse ?args ?body)
     
     [_]
     (fail "")))
 
+(defn ^:private add-loc [meta msg]
+  (if (.startsWith msg "@")
+    msg
+    (|let [[file line col] meta]
+      (str "@ " file " : " line " , " col "\n" msg))))
+
 (defn ^:private analyse-basic-ast [analyse eval! exo-type token]
   ;; (prn 'analyse-basic-ast (&/show-ast token))
-  (fn [state]
-    (matchv ::M/objects [((aba1 analyse eval! exo-type token) state)]
-      [["lux;Right" [state* output]]]
-      (return* state* output)
-
-      [["lux;Left" ""]]
-      (matchv ::M/objects [((aba2 analyse eval! exo-type token) state)]
+  (matchv ::M/objects [token]
+    [["lux;Meta" [meta ?token]]]
+    (fn [state]
+      (matchv ::M/objects [((aba1 analyse eval! exo-type ?token) state)]
         [["lux;Right" [state* output]]]
         (return* state* output)
 
         [["lux;Left" ""]]
-        (matchv ::M/objects [((aba3 analyse eval! exo-type token) state)]
+        (matchv ::M/objects [((aba2 analyse eval! exo-type ?token) state)]
           [["lux;Right" [state* output]]]
           (return* state* output)
 
           [["lux;Left" ""]]
-          (matchv ::M/objects [((aba4 analyse eval! exo-type token) state)]
+          (matchv ::M/objects [((aba3 analyse eval! exo-type ?token) state)]
             [["lux;Right" [state* output]]]
             (return* state* output)
 
             [["lux;Left" ""]]
-            (matchv ::M/objects [((aba5 analyse eval! exo-type token) state)]
+            (matchv ::M/objects [((aba4 analyse eval! exo-type ?token) state)]
               [["lux;Right" [state* output]]]
               (return* state* output)
 
               [["lux;Left" ""]]
-              (matchv ::M/objects [((aba6 analyse eval! exo-type token) state)]
+              (matchv ::M/objects [((aba5 analyse eval! exo-type ?token) state)]
                 [["lux;Right" [state* output]]]
                 (return* state* output)
-                
+
                 [["lux;Left" ""]]
-                (matchv ::M/objects [((aba7 analyse eval! exo-type token) state)]
+                (matchv ::M/objects [((aba6 analyse eval! exo-type ?token) state)]
                   [["lux;Right" [state* output]]]
                   (return* state* output)
+                  
+                  [["lux;Left" ""]]
+                  (matchv ::M/objects [((aba7 analyse eval! exo-type ?token) state)]
+                    [["lux;Right" [state* output]]]
+                    (return* state* output)
+
+                    [["lux;Left" msg]]
+                    (fail* (add-loc meta msg)))
 
                   [["lux;Left" msg]]
-                  (fail* msg))
+                  (fail* (add-loc meta msg)))
 
                 [["lux;Left" msg]]
-                (fail* msg))
+                (fail* (add-loc meta msg)))
 
               [["lux;Left" msg]]
-              (fail* msg))
+              (fail* (add-loc meta msg)))
 
             [["lux;Left" msg]]
-            (fail* msg))
+            (fail* (add-loc meta msg)))
 
           [["lux;Left" msg]]
-          (fail* msg))
+          (fail* (add-loc meta msg)))
 
         [["lux;Left" msg]]
-        (fail* msg))
-
-      [["lux;Left" msg]]
-      (fail* msg))))
+        (fail* (add-loc meta msg))))))
 
 (defn ^:private analyse-ast [eval! exo-type token]
   (matchv ::M/objects [token]
diff --git a/src/lux/reader.clj b/src/lux/reader.clj
index fa5d659bf..08b053a85 100644
--- a/src/lux/reader.clj
+++ b/src/lux/reader.clj
@@ -124,11 +124,13 @@
                             (&/T (&/T file-name line-num column-num*) line)))))
         (&/V "No" (str "[Reader Error] Text failed: " text))))))
 
+(def ^:private +source-dir+ "source/")
 (defn from [file-name file-content]
-  (let [lines (&/->list (string/split-lines file-content))]
+  (let [lines (&/->list (string/split-lines file-content))
+        file-name (.substring file-name (.length +source-dir+))]
     (&/|map (fn [line+line-num]
               (|let [[line-num line] line+line-num]
-                (&/T (&/T file-name line-num 0)
+                (&/T (&/T file-name (inc line-num) 0)
                      line)))
             (&/|filter (fn [line+line-num]
                          (|let [[line-num line] line+line-num]
diff --git a/src/lux/type.clj b/src/lux/type.clj
index 9034abb53..fa598daf1 100644
--- a/src/lux/type.clj
+++ b/src/lux/type.clj
@@ -778,7 +778,7 @@
       (if (or (.equals ^Object e!name a!name)
               (.isAssignableFrom (Class/forName e!name) (Class/forName a!name)))
         (return (&/T fixpoints nil))
-        (fail (str "[Type Error] Names don't match: " e!name " & " a!name)))
+        (fail (str "[Type Error] Names don't match: " e!name " =/= " a!name)))
 
       [["lux;LambdaT" [eI eO]] ["lux;LambdaT" [aI aO]]]
       (|do [[fixpoints* _] (check* fixpoints aI eI)]