- Some bug fixes.

- More additions to the standard library.

8 files changed, 382 insertions, 364 deletions

diff --git a/src/lux/analyser.clj b/src/lux/analyser.clj
index 8c8be29d2..782ae4685 100644
--- a/src/lux/analyser.clj
+++ b/src/lux/analyser.clj
@@ -26,214 +26,128 @@
                                                               ["lux;Nil" _]]]]]]]]]
     (&/T catch+ ?finally-body)))
 
-(let [unit (&/V "lux;Meta" (&/T (&/T "" -1 -1) (&/V "lux;TupleS" (|list))))]
-  (defn ^:private aba1 [analyse eval! compile-module exo-type token]
-    (matchv ::M/objects [token]
-      ;; Standard special forms
-      [["lux;BoolS" ?value]]
-      (|do [_ (&type/check exo-type &type/Bool)]
-        (return (&/|list (&/T (&/V "bool" ?value) exo-type))))
-
-      [["lux;IntS" ?value]]
-      (|do [_ (&type/check exo-type &type/Int)]
-        (return (&/|list (&/T (&/V "int" ?value) exo-type))))
-
-      [["lux;RealS" ?value]]
-      (|do [_ (&type/check exo-type &type/Real)]
-        (return (&/|list (&/T (&/V "real" ?value) exo-type))))
-
-      [["lux;CharS" ?value]]
-      (|do [_ (&type/check exo-type &type/Char)]
-        (return (&/|list (&/T (&/V "char" ?value) exo-type))))
-
-      [["lux;TextS" ?value]]
-      (|do [_ (&type/check exo-type &type/Text)]
-        (return (&/|list (&/T (&/V "text" ?value) exo-type))))
-
-      [["lux;TupleS" ?elems]]
-      (&&lux/analyse-tuple analyse exo-type ?elems)
-
-      [["lux;RecordS" ?elems]]
-      (&&lux/analyse-record analyse exo-type ?elems)
-
-      [["lux;TagS" ?ident]]
-      (&&lux/analyse-variant analyse exo-type ?ident unit)
-      
-      [["lux;SymbolS" [_ "_jvm_null"]]]
-      (return (&/|list (&/T (&/V "jvm-null" nil) (&/V "lux;DataT" "null"))))
-
-      [_]
-      (fail "")
-      )))
-
-(defn ^:private aba2 [analyse eval! compile-module exo-type token]
+(defn ^:private aba7 [analyse eval! compile-module exo-type token]
   (matchv ::M/objects [token]
-    [["lux;SymbolS" ?ident]]
-    (&&lux/analyse-symbol analyse exo-type ?ident)
-
-    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_case"]]]]
-                               ["lux;Cons" [?value ?branches]]]]]]
-    (&&lux/analyse-case analyse exo-type ?value ?branches)
-    
-    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_def"]]]]
-                               ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?name]]]]
-                                            ["lux;Cons" [?value
+    ;; Arrays
+    [["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/analyse-def analyse ?name ?value)
-
-    [["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)
+    (&&host/analyse-jvm-new-array analyse ?class ?length)
 
-    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_import"]]]]
-                               ["lux;Cons" [["lux;Meta" [_ ["lux;TextS" ?path]]]
-                                            ["lux;Nil" _]]]]]]]
-    (&&lux/analyse-import analyse compile-module ?path)
+    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_:"]]]]
-                               ["lux;Cons" [?type
-                                            ["lux;Cons" [?value
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_aaload"]]]]
+                               ["lux;Cons" [?array
+                                            ["lux;Cons" [["lux;Meta" [_ ["lux;IntS" ?idx]]]
                                                          ["lux;Nil" _]]]]]]]]]
-    (&&lux/analyse-check analyse eval! exo-type ?type ?value)
+    (&&host/analyse-jvm-aaload analyse ?array ?idx)
 
-    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_:!"]]]]
-                               ["lux;Cons" [?type
-                                            ["lux;Cons" [?value
-                                                         ["lux;Nil" _]]]]]]]]]
-    (&&lux/analyse-coerce analyse eval! exo-type ?type ?value)
+    ;; Classes & interfaces
+    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_export"]]]]
-                               ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?ident]]]]
-                                            ["lux;Nil" _]]]]]]]
-    (&&lux/analyse-export analyse ?ident)
+    [["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)
 
-    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_alias"]]]]
-                               ["lux;Cons" [["lux;Meta" [_ ["lux;TextS" ?alias]]]
-                                            ["lux;Cons" [["lux;Meta" [_ ["lux;TextS" ?module]]]
+    ;; Programs
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_program"]]]]
+                               ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ?args]]]
+                                            ["lux;Cons" [?body
                                                          ["lux;Nil" _]]]]]]]]]
-    (&&lux/analyse-alias analyse ?alias ?module)
+    (&&host/analyse-jvm-program analyse ?args ?body)
     
     [_]
     (fail "")))
 
-(defn ^:private aba3 [analyse eval! compile-module exo-type token]
+(defn ^:private aba6 [analyse eval! compile-module exo-type token]
   (matchv ::M/objects [token]
-    ;; Host special forms
-    ;; Integer arithmetic
-    [["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;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;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;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;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;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;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;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;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;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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lmul"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
-    (&&host/analyse-jvm-lmul analyse ?x ?y)
+    ;; Primitive conversions
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_d2f"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
+    (&&host/analyse-jvm-d2f analyse ?value)
 
-    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_d2i"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
+    (&&host/analyse-jvm-d2i analyse ?value)
 
-    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_d2l"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
+    (&&host/analyse-jvm-d2l analyse ?value)
 
-    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_f2d"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
+    (&&host/analyse-jvm-f2d analyse ?value)
 
-    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_f2i"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
+    (&&host/analyse-jvm-f2i analyse ?value)
 
-    [["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)
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_f2l"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
+    (&&host/analyse-jvm-f2l analyse ?value)
 
-    [_]
-    (fail "")))
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2b"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
+    (&&host/analyse-jvm-i2b analyse ?value)
 
-(defn ^:private aba4 [analyse eval! compile-module exo-type token]
-  (matchv ::M/objects [token]
-    ;; Float arithmetic
-    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2c"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
+    (&&host/analyse-jvm-i2c analyse ?value)
 
-    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2d"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
+    (&&host/analyse-jvm-i2d analyse ?value)
 
-    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2f"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
+    (&&host/analyse-jvm-i2f analyse ?value)
 
-    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2l"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
+    (&&host/analyse-jvm-i2l analyse ?value)
 
-    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2s"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
+    (&&host/analyse-jvm-i2s analyse ?value)
 
-    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_l2d"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
+    (&&host/analyse-jvm-l2d analyse ?value)
 
-    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_l2f"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
+    (&&host/analyse-jvm-l2f analyse ?value)
 
-    [["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)
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_l2i"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
+    (&&host/analyse-jvm-l2i analyse ?value)
 
-    ;; Double arithmetic
-    [["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)
+    ;; Bitwise operators
+    [["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;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;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;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;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;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;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;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;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;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;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;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;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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_dgt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
-    (&&host/analyse-jvm-dgt analyse ?x ?y)
+    [["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)
 
     [_]
-    (fail "")))
+    (aba7 analyse eval! compile-module exo-type token)))
 
 (defn ^:private aba5 [analyse eval! compile-module exo-type token]
   (matchv ::M/objects [token]
@@ -242,6 +156,12 @@
                                ["lux;Cons" [?object
                                             ["lux;Nil" _]]]]]]]
     (&&host/analyse-jvm-null? analyse ?object)
+
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_instanceof"]]]]
+                               ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?class]]]]
+                                            ["lux;Cons" [?object
+                                                         ["lux;Nil" _]]]]]]]]]
+    (&&host/analyse-jvm-instanceof analyse ?class ?object)
     
     [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_new"]]]]
                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ ?class]]]]
@@ -336,130 +256,226 @@
     (&&host/analyse-jvm-monitorexit analyse ?monitor)
 
     [_]
-    (fail "")))
+    (aba6 analyse eval! compile-module exo-type token)))
 
-(defn ^:private aba6 [analyse eval! compile-module exo-type token]
+(defn ^:private aba4 [analyse eval! compile-module exo-type token]
   (matchv ::M/objects [token]
-    ;; Primitive conversions
-    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_d2f"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
-    (&&host/analyse-jvm-d2f analyse ?value)
+    ;; Float arithmetic
+    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_d2i"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
-    (&&host/analyse-jvm-d2i analyse ?value)
+    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_d2l"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
-    (&&host/analyse-jvm-d2l analyse ?value)
+    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_f2d"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
-    (&&host/analyse-jvm-f2d analyse ?value)
+    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_f2i"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
-    (&&host/analyse-jvm-f2i analyse ?value)
+    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_f2l"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
-    (&&host/analyse-jvm-f2l analyse ?value)
+    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2b"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
-    (&&host/analyse-jvm-i2b analyse ?value)
+    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2c"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
-    (&&host/analyse-jvm-i2c analyse ?value)
+    [["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)
 
-    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2d"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
-    (&&host/analyse-jvm-i2d analyse ?value)
+    ;; Double arithmetic
+    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2f"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
-    (&&host/analyse-jvm-i2f analyse ?value)
+    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2l"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
-    (&&host/analyse-jvm-i2l analyse ?value)
+    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2s"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
-    (&&host/analyse-jvm-i2s analyse ?value)
+    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_l2d"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
-    (&&host/analyse-jvm-l2d analyse ?value)
+    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_l2f"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
-    (&&host/analyse-jvm-l2f analyse ?value)
+    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_l2i"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]
-    (&&host/analyse-jvm-l2i analyse ?value)
+    [["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)
 
-    ;; Bitwise operators
-    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_dgt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
+    (&&host/analyse-jvm-dgt analyse ?x ?y)
 
-    [["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)
+    [_]
+    (aba5 analyse eval! compile-module exo-type token)))
 
-    [["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)
+(defn ^:private aba3 [analyse eval! compile-module exo-type token]
+  (matchv ::M/objects [token]
+    ;; Host special forms
+    ;; Characters
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_ceq"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
+    (&&host/analyse-jvm-ceq analyse ?x ?y)
 
-    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_clt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
+    (&&host/analyse-jvm-clt analyse ?x ?y)
 
-    [["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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_cgt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
+    (&&host/analyse-jvm-cgt analyse ?x ?y)
+    
+    ;; Integer arithmetic
+    [["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;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;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;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;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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lushr"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]
-    (&&host/analyse-jvm-lushr analyse ?x ?y)
+    [["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;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;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;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;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;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;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;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;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;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;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;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;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lgt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]
+    (&&host/analyse-jvm-lgt analyse ?x ?y)
 
     [_]
-    (fail "")))
+    (aba4 analyse eval! compile-module exo-type token)))
 
-(defn ^:private aba7 [analyse eval! compile-module exo-type token]
+(defn ^:private aba2 [analyse eval! compile-module exo-type token]
   (matchv ::M/objects [token]
-    ;; Arrays
-    [["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;SymbolS" ?ident]]
+    (&&lux/analyse-symbol analyse exo-type ?ident)
 
-    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_aastore"]]]]
-                               ["lux;Cons" [?array
-                                            ["lux;Cons" [["lux;Meta" [_ ["lux;IntS" ?idx]]]
-                                                         ["lux;Cons" [?elem
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_case"]]]]
+                               ["lux;Cons" [?value ?branches]]]]]]
+    (&&lux/analyse-case analyse exo-type ?value ?branches)
+    
+    [["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" _]]]]]]]]]]]
-    (&&host/analyse-jvm-aastore analyse ?array ?idx ?elem)
+    (&&lux/analyse-lambda analyse exo-type ?self ?arg ?body)
 
-    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_aaload"]]]]
-                               ["lux;Cons" [?array
-                                            ["lux;Cons" [["lux;Meta" [_ ["lux;IntS" ?idx]]]
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_def"]]]]
+                               ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?name]]]]
+                                            ["lux;Cons" [?value
                                                          ["lux;Nil" _]]]]]]]]]
-    (&&host/analyse-jvm-aaload analyse ?array ?idx)
+    (&&lux/analyse-def analyse ?name ?value)
 
-    ;; Classes & interfaces
-    [["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;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;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)
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_import"]]]]
+                               ["lux;Cons" [["lux;Meta" [_ ["lux;TextS" ?path]]]
+                                            ["lux;Nil" _]]]]]]]
+    (&&lux/analyse-import analyse compile-module ?path)
 
-    ;; Programs
-    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_program"]]]]
-                               ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ?args]]]
-                                            ["lux;Cons" [?body
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_:"]]]]
+                               ["lux;Cons" [?type
+                                            ["lux;Cons" [?value
                                                          ["lux;Nil" _]]]]]]]]]
-    (&&host/analyse-jvm-program analyse ?args ?body)
+    (&&lux/analyse-check analyse eval! exo-type ?type ?value)
+
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_:!"]]]]
+                               ["lux;Cons" [?type
+                                            ["lux;Cons" [?value
+                                                         ["lux;Nil" _]]]]]]]]]
+    (&&lux/analyse-coerce analyse eval! exo-type ?type ?value)
+
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_export"]]]]
+                               ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?ident]]]]
+                                            ["lux;Nil" _]]]]]]]
+    (&&lux/analyse-export analyse ?ident)
+
+    [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_alias"]]]]
+                               ["lux;Cons" [["lux;Meta" [_ ["lux;TextS" ?alias]]]
+                                            ["lux;Cons" [["lux;Meta" [_ ["lux;TextS" ?module]]]
+                                                         ["lux;Nil" _]]]]]]]]]
+    (&&lux/analyse-alias analyse ?alias ?module)
     
     [_]
-    (fail "")))
+    (aba3 analyse eval! compile-module exo-type token)))
+
+(let [unit (&/V "lux;Meta" (&/T (&/T "" -1 -1) (&/V "lux;TupleS" (|list))))]
+  (defn ^:private aba1 [analyse eval! compile-module exo-type token]
+    (matchv ::M/objects [token]
+      ;; Standard special forms
+      [["lux;BoolS" ?value]]
+      (|do [_ (&type/check exo-type &type/Bool)]
+        (return (&/|list (&/T (&/V "bool" ?value) exo-type))))
+
+      [["lux;IntS" ?value]]
+      (|do [_ (&type/check exo-type &type/Int)]
+        (return (&/|list (&/T (&/V "int" ?value) exo-type))))
+
+      [["lux;RealS" ?value]]
+      (|do [_ (&type/check exo-type &type/Real)]
+        (return (&/|list (&/T (&/V "real" ?value) exo-type))))
+
+      [["lux;CharS" ?value]]
+      (|do [_ (&type/check exo-type &type/Char)]
+        (return (&/|list (&/T (&/V "char" ?value) exo-type))))
+
+      [["lux;TextS" ?value]]
+      (|do [_ (&type/check exo-type &type/Text)]
+        (return (&/|list (&/T (&/V "text" ?value) exo-type))))
+
+      [["lux;TupleS" ?elems]]
+      (&&lux/analyse-tuple analyse exo-type ?elems)
+
+      [["lux;RecordS" ?elems]]
+      (&&lux/analyse-record analyse exo-type ?elems)
+
+      [["lux;TagS" ?ident]]
+      (&&lux/analyse-variant analyse exo-type ?ident unit)
+      
+      [["lux;SymbolS" [_ "_jvm_null"]]]
+      (return (&/|list (&/T (&/V "jvm-null" nil) (&/V "lux;DataT" "null"))))
+
+      [_]
+      (aba2 analyse eval! compile-module exo-type token)
+      )))
 
 (defn ^:private add-loc [meta ^String msg]
   (if (.startsWith msg "@")
@@ -477,55 +493,7 @@
         (return* state* output)
 
         [["lux;Left" ""]]
-        (matchv ::M/objects [((aba2 analyse eval! compile-module exo-type ?token) state)]
-          [["lux;Right" [state* output]]]
-          (return* state* output)
-
-          [["lux;Left" ""]]
-          (matchv ::M/objects [((aba3 analyse eval! compile-module exo-type ?token) state)]
-            [["lux;Right" [state* output]]]
-            (return* state* output)
-
-            [["lux;Left" ""]]
-            (matchv ::M/objects [((aba4 analyse eval! compile-module exo-type ?token) state)]
-              [["lux;Right" [state* output]]]
-              (return* state* output)
-
-              [["lux;Left" ""]]
-              (matchv ::M/objects [((aba5 analyse eval! compile-module exo-type ?token) state)]
-                [["lux;Right" [state* output]]]
-                (return* state* output)
-
-                [["lux;Left" ""]]
-                (matchv ::M/objects [((aba6 analyse eval! compile-module exo-type ?token) state)]
-                  [["lux;Right" [state* output]]]
-                  (return* state* output)
-                  
-                  [["lux;Left" ""]]
-                  (matchv ::M/objects [((aba7 analyse eval! compile-module exo-type ?token) state)]
-                    [["lux;Right" [state* output]]]
-                    (return* state* output)
-
-                    [["lux;Left" ""]]
-                    (fail* (add-loc meta (str "[Analyser Error] Unrecognized token: " (&/show-ast token))))
-                    
-                    [["lux;Left" msg]]
-                    (fail* (add-loc meta msg)))
-
-                  [["lux;Left" msg]]
-                  (fail* (add-loc meta msg)))
-
-                [["lux;Left" msg]]
-                (fail* (add-loc meta msg)))
-
-              [["lux;Left" msg]]
-              (fail* (add-loc meta msg)))
-
-            [["lux;Left" msg]]
-            (fail* (add-loc meta msg)))
-
-          [["lux;Left" msg]]
-          (fail* (add-loc meta msg)))
+        (fail* (add-loc meta (str "[Analyser Error] Unrecognized token: " (&/show-ast token))))
 
         [["lux;Left" msg]]
         (fail* (add-loc meta msg))
diff --git a/src/lux/analyser/case.clj b/src/lux/analyser/case.clj
index 6dfa234bd..267bd1269 100644
--- a/src/lux/analyser/case.clj
+++ b/src/lux/analyser/case.clj
@@ -63,28 +63,31 @@
         (return (&/T (&/V "TextTestAC" ?value) =kont)))
 
       [["lux;TupleS" ?members]]
-      (matchv ::M/objects [value-type]
-        [["lux;TupleT" ?member-types]]
-        (if (not (.equals ^Object (&/|length ?member-types) (&/|length ?members)))
-          (fail (str "[Analyser error] Pattern-matching mismatch. Require tuple[" (&/|length ?member-types) "]. Given tuple [" (&/|length ?members) "]"))
-          (|do [[=tests =kont] (&/fold (fn [kont* vm]
-                                         (|let [[v m] vm]
-                                           (|do [[=test [=tests =kont]] (analyse-pattern v m kont*)]
-                                             (return (&/T (&/|cons =test =tests) =kont)))))
-                                       (|do [=kont kont]
-                                         (return (&/T (&/|list) =kont)))
-                                       (&/|reverse (&/zip2 ?member-types ?members)))]
-            (return (&/T (&/V "TupleTestAC" =tests) =kont))))
-
-        [_]
-        (fail (str "[Analyser Error] Tuples require tuple-types: " (&type/show-type value-type))))
+      (|do [value-type* (resolve-type value-type)]
+        (do ;; (prn 'PM/TUPLE-1 (&type/show-type value-type*))
+          (matchv ::M/objects [value-type*]
+            [["lux;TupleT" ?member-types]]
+            (do ;; (prn 'PM/TUPLE-2 (&/|length ?member-types) (&/|length ?members))
+              (if (not (.equals ^Object (&/|length ?member-types) (&/|length ?members)))
+                (fail (str "[Pattern-matching Error] Pattern-matching mismatch. Require tuple[" (&/|length ?member-types) "]. Given tuple [" (&/|length ?members) "]"))
+                (|do [[=tests =kont] (&/fold (fn [kont* vm]
+                                               (|let [[v m] vm]
+                                                 (|do [[=test [=tests =kont]] (analyse-pattern v m kont*)]
+                                                   (return (&/T (&/|cons =test =tests) =kont)))))
+                                             (|do [=kont kont]
+                                               (return (&/T (&/|list) =kont)))
+                                             (&/|reverse (&/zip2 ?member-types ?members)))]
+                  (return (&/T (&/V "TupleTestAC" =tests) =kont)))))
+
+            [_]
+            (fail (str "[Pattern-matching Error] Tuples require tuple-types: " (&type/show-type value-type*))))))
 
       [["lux;RecordS" ?slots]]
       (|do [value-type* (resolve-type value-type)]
         (matchv ::M/objects [value-type*]
           [["lux;RecordT" ?slot-types]]
           (if (not (.equals ^Object (&/|length ?slot-types) (&/|length ?slots)))
-            (fail (str "[Analyser error] Pattern-matching mismatch. Require record[" (&/|length ?slot-types) "]. Given record[" (&/|length ?slots) "]"))
+            (fail (str "[Analyser Error] Pattern-matching mismatch. Require record[" (&/|length ?slot-types) "]. Given record[" (&/|length ?slots) "]"))
             (|do [[=tests =kont] (&/fold (fn [kont* slot]
                                            (|let [[sn sv] slot]
                                              (matchv ::M/objects [sn]
@@ -93,17 +96,17 @@
                                                  (if-let [=slot-type (&/|get =tag ?slot-types)]
                                                    (|do [[=test [=tests =kont]] (analyse-pattern =slot-type sv kont*)]
                                                      (return (&/T (&/|put =tag =test =tests) =kont)))
-                                                   (fail (str "[Pattern-Matching Error] Record-type lacks slot: " =tag))))
+                                                   (fail (str "[Pattern-matching Error] Record-type lacks slot: " =tag))))
 
                                                [_]
-                                               (fail (str "[Pattern-Matching Error] Record must use tags as slot-names: " (&/show-ast sn))))))
+                                               (fail (str "[Pattern-matching Error] Record must use tags as slot-names: " (&/show-ast sn))))))
                                          (|do [=kont kont]
                                            (return (&/T (&/|table) =kont)))
                                          (&/|reverse ?slots))]
               (return (&/T (&/V "RecordTestAC" =tests) =kont))))
 
           [_]
-          (fail "[Analyser Error] Record requires record-type.")))
+          (fail "[Pattern-matching Error] Record requires record-type.")))
 
       [["lux;TagS" ?ident]]
       (|do [=tag (&&/resolved-ident ?ident)
@@ -182,7 +185,7 @@
                                    (merge-total v (&/T t ?body)))
                                  ?values ?tests)]
             (return (&/V "TupleTotal" (&/T total? structs))))
-          (fail "[Pattern-matching error] Inconsistent tuple-size."))
+          (fail "[Pattern-matching Error] Inconsistent tuple-size."))
 
         [["DefaultTotal" total?] ["RecordTestAC" ?tests]]
         (|do [structs (&/map% (fn [t]
@@ -203,14 +206,14 @@
                                      (if (.equals ^Object lslot rslot)
                                        (|do [sub-struct* (merge-total sub-struct (&/T value ?body))]
                                          (return (&/T lslot sub-struct*)))
-                                       (fail "[Pattern-matching error] Record slots mismatch."))))
+                                       (fail "[Pattern-matching Error] Record slots mismatch."))))
                                  ?values
                                  (->> ?tests
                                       &/->seq
                                       (sort compare-kv)
                                       &/->list))]
             (return (&/V "RecordTotal" (&/T total? structs))))
-          (fail "[Pattern-matching error] Inconsistent record-size."))
+          (fail "[Pattern-matching Error] Inconsistent record-size."))
 
         [["DefaultTotal" total?] ["VariantTestAC" [?tag ?test]]]
         (|do [sub-struct (merge-total (&/V "DefaultTotal" total?)
@@ -245,15 +248,16 @@
     [["TupleTotal" [?total ?structs]]]
     (if ?total
       (return true)
-      (matchv ::M/objects [value-type]
-        [["lux;TupleT" ?members]]
-        (|do [totals (&/map2% (fn [sub-struct ?member]
-                                (check-totality ?member sub-struct))
-                              ?structs ?members)]
-          (return (&/fold #(and %1 %2) true totals)))
+      (|do [value-type* (resolve-type value-type)]
+        (matchv ::M/objects [value-type*]
+          [["lux;TupleT" ?members]]
+          (|do [totals (&/map2% (fn [sub-struct ?member]
+                                  (check-totality ?member sub-struct))
+                                ?structs ?members)]
+            (return (&/fold #(and %1 %2) true totals)))
 
-        [_]
-        (fail "")))
+          [_]
+          (fail "[Pattern-maching Error] Tuple is not total."))))
 
     [["RecordTotal" [?total ?structs]]]
     (if ?total
@@ -270,7 +274,7 @@
             (return (&/fold #(and %1 %2) true totals)))
 
           [_]
-          (fail ""))))
+          (fail "[Pattern-maching Error] Record is not total."))))
 
     [["VariantTotal" [?total ?structs]]]
     (if ?total
@@ -287,7 +291,7 @@
             (return (&/fold #(and %1 %2) true totals)))
 
           [_]
-          (fail ""))))
+          (fail "[Pattern-maching Error] Variant is not total."))))
     
     [["DefaultTotal" ?total]]
     (return ?total)
@@ -304,4 +308,4 @@
         ? (check-totality value-type struct)]
     (if ?
       (return patterns)
-      (fail "[Pattern-maching error] Pattern-matching is non-total."))))
+      (fail "[Pattern-maching Error] Pattern-matching is non-total."))))
diff --git a/src/lux/analyser/host.clj b/src/lux/analyser/host.clj
index 3db4bd16d..918bcb8f1 100644
--- a/src/lux/analyser/host.clj
+++ b/src/lux/analyser/host.clj
@@ -54,6 +54,10 @@
   analyse-jvm-ilt  "jvm-ilt"  "java.lang.Integer" "java.lang.Boolean"
   analyse-jvm-igt  "jvm-igt"  "java.lang.Integer" "java.lang.Boolean"
 
+  analyse-jvm-ceq  "jvm-ceq"  "java.lang.Character" "java.lang.Boolean"
+  analyse-jvm-clt  "jvm-clt"  "java.lang.Character" "java.lang.Boolean"
+  analyse-jvm-cgt  "jvm-cgt"  "java.lang.Character" "java.lang.Boolean"
+
   analyse-jvm-ladd "jvm-ladd" "java.lang.Long"    "java.lang.Long"
   analyse-jvm-lsub "jvm-lsub" "java.lang.Long"    "java.lang.Long"
   analyse-jvm-lmul "jvm-lmul" "java.lang.Long"    "java.lang.Long"
@@ -93,21 +97,37 @@
 
 (defn analyse-jvm-putstatic [analyse ?class ?field ?value]
   (|do [=type (&host/lookup-static-field ?class ?field)
-        =value (&&/analyse-1 analyse ?value)]
+        =value (&&/analyse-1 analyse =type ?value)]
     (return (&/|list (&/T (&/V "jvm-putstatic" (&/T ?class ?field =value)) =type)))))
 
 (defn analyse-jvm-putfield [analyse ?class ?field ?object ?value]
   (|do [=type (&host/lookup-static-field ?class ?field)
         =object (&&/analyse-1 analyse ?object)
-        =value (&&/analyse-1 analyse ?value)]
+        =value (&&/analyse-1 analyse =type ?value)]
     (return (&/|list (&/T (&/V "jvm-putfield" (&/T ?class ?field =object =value)) =type)))))
 
 (defn analyse-jvm-invokestatic [analyse ?class ?method ?classes ?args]
   (|do [=classes (&/map% &host/extract-jvm-param ?classes)
         =return (&host/lookup-static-method ?class ?method =classes)
-        =args (&/flat-map% analyse ?args)]
+        :let [_ (matchv ::M/objects [=return]
+                  [["lux;DataT" _return-class]]
+                  (prn 'analyse-jvm-invokestatic ?class ?method _return-class))]
+        =args (&/map2% (fn [_class _arg]
+                         (&&/analyse-1 analyse (&/V "lux;DataT" _class) _arg))
+                       =classes
+                       ?args)]
     (return (&/|list (&/T (&/V "jvm-invokestatic" (&/T ?class ?method =classes =args)) =return)))))
 
+(defn analyse-jvm-instanceof [analyse ?class ?object]
+  (|do [=object (analyse-1+ analyse ?object)
+        :let [[_obj _type] =object]]
+    (matchv ::M/objects [_type]
+      [["lux;DataT" _]]
+      (return (&/|list (&/T (&/V "jvm-instanceof" (&/T ?class ?object)) (&/V "lux;DataT" "java.lang.Boolean"))))
+
+      [_]
+      (fail "[Analyser Error] Can only use instanceof with object types."))))
+
 (do-template [<name> <tag>]
   (defn <name> [analyse ?class ?method ?classes ?object ?args]
     (|do [=classes (&/map% &host/extract-jvm-param ?classes)
diff --git a/src/lux/analyser/lux.clj b/src/lux/analyser/lux.clj
index d02599f10..75881c80a 100644
--- a/src/lux/analyser/lux.clj
+++ b/src/lux/analyser/lux.clj
@@ -248,11 +248,11 @@
             [["lux;MacroD" macro]]
             (|do [macro-expansion #(-> macro (.apply ?args) (.apply %))
                   :let [_ (when (and ;; (= "lux/control/monad" ?module)
-                                     (= "do" ?name))
+                                 (= "case" ?name))
                             (->> (&/|map &/show-ast macro-expansion)
                                  (&/|interpose "\n")
                                  (&/fold str "")
-                                 (prn ?module "do")))]
+                                 (prn ?module "case")))]
                   ]
               (&/flat-map% (partial analyse exo-type) macro-expansion))
 
@@ -310,7 +310,9 @@
             [["lux;VarT" ?id]]
             (|do [? (&type/bound? ?id)]
               (if ?
-                (|do [dtype (&type/deref ?id)]
+                (|do [dtype (&type/deref ?id)
+                      ;; dtype* (&type/actual-type dtype)
+                      ]
                   (matchv ::M/objects [dtype]
                     [["lux;ExT" _]]
                     (return (&/T _expr exo-type))
@@ -341,7 +343,7 @@
   (|do [module-name &/get-module-name
         ? (&&module/defined? module-name ?name)]
     (if ?
-      (fail (str "[Analyser Error] Can't redefine " ?name))
+      (fail (str "[Analyser Error] Can't redefine " (str module-name ";" ?name)))
       (|do [=value (&/with-scope ?name
                      (analyse-1+ analyse ?value))
             =value-type (&&/expr-type =value)]
diff --git a/src/lux/base.clj b/src/lux/base.clj
index d88bb2ec1..e22e51473 100644
--- a/src/lux/base.clj
+++ b/src/lux/base.clj
@@ -158,7 +158,6 @@
         ))))
 
 (defmacro |do [steps return]
-  (assert (not= 0 (count steps)) "The steps can't be empty!")
   (assert (= 0 (rem (count steps) 2)) "The number of steps must be even!")
   (reduce (fn [inner [label computation]]
             (case label
@@ -330,6 +329,9 @@
   map%      |cons
   flat-map% |++)
 
+(defn list-join [xss]
+  (fold |++ (V "lux;Nil" nil) xss))
+
 (defn |as-pairs [xs]
   (matchv ::M/objects [xs]
     [["lux;Cons" [x ["lux;Cons" [y xs*]]]]]
@@ -669,6 +671,14 @@
     [_ _]
     (fail "Lists don't match in size.")))
 
+(defn map2 [f xs ys]
+  (matchv ::M/objects [xs ys]
+    [["lux;Cons" [x xs*]] ["lux;Cons" [y ys*]]]
+    (|cons (f x y) (map2 f xs* ys*))
+
+    [_ _]
+    (V "lux;Nil" nil)))
+
 (defn fold2 [f init xs ys]
   (matchv ::M/objects [xs ys]
     [["lux;Cons" [x xs*]] ["lux;Cons" [y ys*]]]
diff --git a/src/lux/compiler.clj b/src/lux/compiler.clj
index 04f4fb4c2..559c1179b 100644
--- a/src/lux/compiler.clj
+++ b/src/lux/compiler.clj
@@ -74,6 +74,16 @@
 
       [["ann" [?value-ex ?type-ex]]]
       (&&lux/compile-ann compile-expression ?type ?value-ex ?type-ex)
+
+      ;; Characters
+      [["jvm-ceq" [?x ?y]]]
+      (&&host/compile-jvm-ceq compile-expression ?type ?x ?y)
+
+      [["jvm-clt" [?x ?y]]]
+      (&&host/compile-jvm-clt compile-expression ?type ?x ?y)
+
+      [["jvm-cgt" [?x ?y]]]
+      (&&host/compile-jvm-cgt compile-expression ?type ?x ?y)
       
       ;; Integer arithmetic
       [["jvm-iadd" [?x ?y]]]
@@ -297,6 +307,9 @@
 
       [["jvm-lushr" [?x ?y]]]
       (&&host/compile-jvm-lushr compile-expression ?type ?x ?y)
+
+      [["jvm-instanceof" [?class ?object]]]
+      (&&host/compile-jvm-instanceof compile-expression ?type ?class ?object)
       )
     ))
 
diff --git a/src/lux/compiler/host.clj b/src/lux/compiler/host.clj
index 2a8bdac89..5c2c43296 100644
--- a/src/lux/compiler/host.clj
+++ b/src/lux/compiler/host.clj
@@ -144,6 +144,10 @@
   compile-jvm-ieq Opcodes/IF_ICMPEQ "java.lang.Integer" "intValue" "()I"
   compile-jvm-ilt Opcodes/IF_ICMPLT "java.lang.Integer" "intValue" "()I"
   compile-jvm-igt Opcodes/IF_ICMPGT "java.lang.Integer" "intValue" "()I"
+
+  compile-jvm-ceq Opcodes/IF_ICMPEQ "java.lang.Character" "charValue" "()C"
+  compile-jvm-clt Opcodes/IF_ICMPLT "java.lang.Character" "charValue" "()C"
+  compile-jvm-cgt Opcodes/IF_ICMPGT "java.lang.Character" "charValue" "()C"
   )
 
 (do-template [<name> <cmpcode> <cmp-output> <wrapper-class> <value-method> <value-method-sig>]
@@ -186,12 +190,12 @@
 
 (defn compile-jvm-invokestatic [compile *type* ?class ?method ?classes ?args]
   (|do [^MethodVisitor *writer* &/get-writer
-        :let [method-sig (str "(" (reduce str "" (map &host/->type-signature ?classes)) ")" (&host/->java-sig *type*))]
-        _ (&/map% (fn [[class-name arg]]
-                    (|do [ret (compile arg)
-                          :let [_ (prepare-arg! *writer* class-name)]]
-                      (return ret)))
-                  (map vector ?classes ?args))
+        :let [method-sig (str "(" (&/fold str "" (&/|map &host/->type-signature ?classes)) ")" (&host/->java-sig *type*))]
+        _ (&/map2% (fn [class-name arg]
+                     (|do [ret (compile arg)
+                           :let [_ (prepare-arg! *writer* class-name)]]
+                       (return ret)))
+                   ?classes ?args)
         :let [_ (doto *writer*
                   (.visitMethodInsn Opcodes/INVOKESTATIC (&host/->class ?class) ?method method-sig)
                   (prepare-return! *type*))]]
@@ -319,6 +323,14 @@
        ;; else
        0)))
 
+(defn compile-jvm-instanceof [compile *type* class object]
+  (|do [^MethodVisitor *writer* &/get-writer
+        _ (compile object)
+        :let [_ (doto *writer*
+                  (.visitLdcInsn class)
+                  (.visitTypeInsn Opcodes/INSTANCEOF class))]]
+    (return nil)))
+
 (defn compile-jvm-class [compile ?name ?super-class ?interfaces ?fields ?methods]
   (|do [module &/get-module-name]
     (let [super-class* (&host/->class ?super-class)
diff --git a/src/lux/compiler/lux.clj b/src/lux/compiler/lux.clj
index 7d6b2b502..ecb614732 100644
--- a/src/lux/compiler/lux.clj
+++ b/src/lux/compiler/lux.clj
@@ -25,17 +25,6 @@
         :let [_ (.visitFieldInsn *writer* Opcodes/GETSTATIC "java/lang/Boolean" (if ?value "TRUE" "FALSE") "Ljava/lang/Boolean;")]]
     (return nil)))
 
-(defn compile-int [compile *type* value]
-  (|do [^MethodVisitor *writer* &/get-writer
-        :let [_ (doto *writer*
-                  (.visitTypeInsn Opcodes/NEW "java/lang/Long")
-                  (.visitInsn Opcodes/DUP)
-                  (.visitLdcInsn (bit-shift-left (long value) 0)
-                                 ;; (bit-shift-left (long value) 32)
-                                 )
-                  (.visitMethodInsn Opcodes/INVOKESPECIAL "java/lang/Long" "<init>" "(J)V"))]]
-    (return nil)))
-
 (do-template [<name> <class> <sig> <caster>]
   (defn <name> [compile *type* value]
     (|do [^MethodVisitor *writer* &/get-writer
@@ -46,7 +35,7 @@
                     (.visitMethodInsn Opcodes/INVOKESPECIAL <class> "<init>" <sig>))]]
       (return nil)))
 
-  ;; compile-int  "java/lang/Long"      "(J)V" long
+  compile-int  "java/lang/Long"      "(J)V" long
   compile-real "java/lang/Double"    "(D)V" double
   compile-char "java/lang/Character" "(C)V" char
   )