- Removed _jvm_monitorenter, _jvm_monitorexit and _jvm_throw from the list of special forms.

1 files changed, 106 insertions, 99 deletions

diff --git a/src/lux/analyser/host.clj b/src/lux/analyser/host.clj
index 2b3dedd4c..4d422d4d1 100644
--- a/src/lux/analyser/host.clj
+++ b/src/lux/analyser/host.clj
@@ -878,25 +878,6 @@
                                (&&/$host (&/T ["jvm" "arraylength"]) (&/|list =array))
                                )))))
 
-(defn analyse-jvm-throw [analyse exo-type ?ex]
-  (|do [=ex (&&/analyse-1 analyse (&/$DataT "java.lang.Throwable" &/$Nil) ?ex)
-        _cursor &/cursor
-        _ (&type/check exo-type &/$VoidT)]
-    (return (&/|list (&&/|meta exo-type _cursor (&&/$jvm-throw =ex))))))
-
-(do-template [<name> <tag>]
-  (defn <name> [analyse exo-type ?monitor]
-    (|do [=monitor (&&/analyse-1+ analyse ?monitor)
-          _ (ensure-object (&&/expr-type* =monitor))
-          :let [output-type &/$UnitT]
-          _ (&type/check exo-type output-type)
-          _cursor &/cursor]
-      (return (&/|list (&&/|meta output-type _cursor (<tag> =monitor))))))
-
-  analyse-jvm-monitorenter &&/$jvm-monitorenter
-  analyse-jvm-monitorexit  &&/$jvm-monitorexit
-  )
-
 (defn ^:private analyse-jvm-null? [analyse exo-type ?values]
   (|do [:let [(&/$Cons object (&/$Nil)) ?values]
         =object (&&/analyse-1+ analyse object)
@@ -915,90 +896,116 @@
     (return (&/|list (&&/|meta exo-type _cursor
                                (&&/$host (&/T ["jvm" "null"]) (&/|list)))))))
 
+(do-template [<name> <tag>]
+  (defn <name> [analyse exo-type ?values]
+    (|do [:let [(&/$Cons ?monitor (&/$Nil)) ?values]
+          =monitor (&&/analyse-1+ analyse ?monitor)
+          _ (ensure-object (&&/expr-type* =monitor))
+          :let [output-type &/$UnitT]
+          _ (&type/check exo-type output-type)
+          _cursor &/cursor]
+      (return (&/|list (&&/|meta exo-type _cursor
+                                 (&&/$host (&/T ["jvm" <tag>]) (&/|list =monitor)))))))
+
+  ^:private analyse-jvm-monitorenter "monitorenter"
+  ^:private analyse-jvm-monitorexit  "monitorexit"
+  )
+
+(defn ^:private analyse-jvm-throw [analyse exo-type ?values]
+  (|do [:let [(&/$Cons ?ex (&/$Nil)) ?values]
+        =ex (&&/analyse-1 analyse (&/$DataT "java.lang.Throwable" &/$Nil) ?ex)
+        _cursor &/cursor
+        _ (&type/check exo-type &/$VoidT)]
+    (return (&/|list (&&/|meta exo-type _cursor
+                               (&&/$host (&/T ["jvm" "throw"]) (&/|list =ex)))))))
+
 (defn analyse-host [analyse exo-type category proc ?values]
   (case category
     "jvm"
     (case proc
-      "null?"       (analyse-jvm-null? analyse exo-type ?values)
-      "null"        (analyse-jvm-null analyse exo-type ?values)
-      "anewarray"   (analyse-jvm-anewarray analyse exo-type ?values)
-      "aaload"      (analyse-jvm-aaload analyse exo-type ?values)
-      "aastore"     (analyse-jvm-aastore analyse exo-type ?values)
-      "arraylength" (analyse-jvm-arraylength analyse exo-type ?values)
-      "znewarray"   (analyse-jvm-znewarray analyse exo-type ?values)
-      "bnewarray"   (analyse-jvm-bnewarray analyse exo-type ?values)
-      "snewarray"   (analyse-jvm-snewarray analyse exo-type ?values)
-      "inewarray"   (analyse-jvm-inewarray analyse exo-type ?values)
-      "lnewarray"   (analyse-jvm-lnewarray analyse exo-type ?values)
-      "fnewarray"   (analyse-jvm-fnewarray analyse exo-type ?values)
-      "dnewarray"   (analyse-jvm-dnewarray analyse exo-type ?values)
-      "cnewarray"   (analyse-jvm-cnewarray analyse exo-type ?values)
-      "iadd"        (analyse-jvm-iadd analyse exo-type ?values)
-      "isub"        (analyse-jvm-isub analyse exo-type ?values)
-      "imul"        (analyse-jvm-imul analyse exo-type ?values)
-      "idiv"        (analyse-jvm-idiv analyse exo-type ?values)
-      "irem"        (analyse-jvm-irem analyse exo-type ?values)
-      "ieq"         (analyse-jvm-ieq analyse exo-type ?values)
-      "ilt"         (analyse-jvm-ilt analyse exo-type ?values)
-      "igt"         (analyse-jvm-igt analyse exo-type ?values)
-      "ceq"         (analyse-jvm-ceq analyse exo-type ?values)
-      "clt"         (analyse-jvm-clt analyse exo-type ?values)
-      "cgt"         (analyse-jvm-cgt analyse exo-type ?values)
-      "ladd"        (analyse-jvm-ladd analyse exo-type ?values)
-      "lsub"        (analyse-jvm-lsub analyse exo-type ?values)
-      "lmul"        (analyse-jvm-lmul analyse exo-type ?values)
-      "ldiv"        (analyse-jvm-ldiv analyse exo-type ?values)
-      "lrem"        (analyse-jvm-lrem analyse exo-type ?values)
-      "leq"         (analyse-jvm-leq analyse exo-type ?values)
-      "llt"         (analyse-jvm-llt analyse exo-type ?values)
-      "lgt"         (analyse-jvm-lgt analyse exo-type ?values)
-      "fadd"        (analyse-jvm-fadd analyse exo-type ?values)
-      "fsub"        (analyse-jvm-fsub analyse exo-type ?values)
-      "fmul"        (analyse-jvm-fmul analyse exo-type ?values)
-      "fdiv"        (analyse-jvm-fdiv analyse exo-type ?values)
-      "frem"        (analyse-jvm-frem analyse exo-type ?values)
-      "feq"         (analyse-jvm-feq analyse exo-type ?values)
-      "flt"         (analyse-jvm-flt analyse exo-type ?values)
-      "fgt"         (analyse-jvm-fgt analyse exo-type ?values)
-      "dadd"        (analyse-jvm-dadd analyse exo-type ?values)
-      "dsub"        (analyse-jvm-dsub analyse exo-type ?values)
-      "dmul"        (analyse-jvm-dmul analyse exo-type ?values)
-      "ddiv"        (analyse-jvm-ddiv analyse exo-type ?values)
-      "drem"        (analyse-jvm-drem analyse exo-type ?values)
-      "deq"         (analyse-jvm-deq analyse exo-type ?values)
-      "dlt"         (analyse-jvm-dlt analyse exo-type ?values)
-      "dgt"         (analyse-jvm-dgt analyse exo-type ?values)
-      "iand"        (analyse-jvm-iand analyse exo-type ?values)
-      "ior"         (analyse-jvm-ior analyse exo-type ?values)
-      "ixor"        (analyse-jvm-ixor analyse exo-type ?values)
-      "ishl"        (analyse-jvm-ishl analyse exo-type ?values)
-      "ishr"        (analyse-jvm-ishr analyse exo-type ?values)
-      "iushr"       (analyse-jvm-iushr analyse exo-type ?values)
-      "land"        (analyse-jvm-land analyse exo-type ?values)
-      "lor"         (analyse-jvm-lor analyse exo-type ?values)
-      "lxor"        (analyse-jvm-lxor analyse exo-type ?values)
-      "lshl"        (analyse-jvm-lshl analyse exo-type ?values)
-      "lshr"        (analyse-jvm-lshr analyse exo-type ?values)
-      "lushr"       (analyse-jvm-lushr analyse exo-type ?values)
-      "d2f"         (analyse-jvm-d2f analyse exo-type ?values)
-      "d2i"         (analyse-jvm-d2i analyse exo-type ?values)
-      "d2l"         (analyse-jvm-d2l analyse exo-type ?values)
-      "f2d"         (analyse-jvm-f2d analyse exo-type ?values)
-      "f2i"         (analyse-jvm-f2i analyse exo-type ?values)
-      "f2l"         (analyse-jvm-f2l analyse exo-type ?values)
-      "i2b"         (analyse-jvm-i2b analyse exo-type ?values)
-      "i2c"         (analyse-jvm-i2c analyse exo-type ?values)
-      "i2d"         (analyse-jvm-i2d analyse exo-type ?values)
-      "i2f"         (analyse-jvm-i2f analyse exo-type ?values)
-      "i2l"         (analyse-jvm-i2l analyse exo-type ?values)
-      "i2s"         (analyse-jvm-i2s analyse exo-type ?values)
-      "l2d"         (analyse-jvm-l2d analyse exo-type ?values)
-      "l2f"         (analyse-jvm-l2f analyse exo-type ?values)
-      "l2i"         (analyse-jvm-l2i analyse exo-type ?values)
-      "c2b"         (analyse-jvm-c2b analyse exo-type ?values)
-      "c2s"         (analyse-jvm-c2s analyse exo-type ?values)
-      "c2i"         (analyse-jvm-c2i analyse exo-type ?values)
-      "c2l"         (analyse-jvm-c2l analyse exo-type ?values)
+      "throw"        (analyse-jvm-throw analyse exo-type ?values)
+      "monitorenter" (analyse-jvm-monitorenter analyse exo-type ?values)
+      "monitorexit"  (analyse-jvm-monitorexit analyse exo-type ?values)
+      "null?"        (analyse-jvm-null? analyse exo-type ?values)
+      "null"         (analyse-jvm-null analyse exo-type ?values)
+      "anewarray"    (analyse-jvm-anewarray analyse exo-type ?values)
+      "aaload"       (analyse-jvm-aaload analyse exo-type ?values)
+      "aastore"      (analyse-jvm-aastore analyse exo-type ?values)
+      "arraylength"  (analyse-jvm-arraylength analyse exo-type ?values)
+      "znewarray"    (analyse-jvm-znewarray analyse exo-type ?values)
+      "bnewarray"    (analyse-jvm-bnewarray analyse exo-type ?values)
+      "snewarray"    (analyse-jvm-snewarray analyse exo-type ?values)
+      "inewarray"    (analyse-jvm-inewarray analyse exo-type ?values)
+      "lnewarray"    (analyse-jvm-lnewarray analyse exo-type ?values)
+      "fnewarray"    (analyse-jvm-fnewarray analyse exo-type ?values)
+      "dnewarray"    (analyse-jvm-dnewarray analyse exo-type ?values)
+      "cnewarray"    (analyse-jvm-cnewarray analyse exo-type ?values)
+      "iadd"         (analyse-jvm-iadd analyse exo-type ?values)
+      "isub"         (analyse-jvm-isub analyse exo-type ?values)
+      "imul"         (analyse-jvm-imul analyse exo-type ?values)
+      "idiv"         (analyse-jvm-idiv analyse exo-type ?values)
+      "irem"         (analyse-jvm-irem analyse exo-type ?values)
+      "ieq"          (analyse-jvm-ieq analyse exo-type ?values)
+      "ilt"          (analyse-jvm-ilt analyse exo-type ?values)
+      "igt"          (analyse-jvm-igt analyse exo-type ?values)
+      "ceq"          (analyse-jvm-ceq analyse exo-type ?values)
+      "clt"          (analyse-jvm-clt analyse exo-type ?values)
+      "cgt"          (analyse-jvm-cgt analyse exo-type ?values)
+      "ladd"         (analyse-jvm-ladd analyse exo-type ?values)
+      "lsub"         (analyse-jvm-lsub analyse exo-type ?values)
+      "lmul"         (analyse-jvm-lmul analyse exo-type ?values)
+      "ldiv"         (analyse-jvm-ldiv analyse exo-type ?values)
+      "lrem"         (analyse-jvm-lrem analyse exo-type ?values)
+      "leq"          (analyse-jvm-leq analyse exo-type ?values)
+      "llt"          (analyse-jvm-llt analyse exo-type ?values)
+      "lgt"          (analyse-jvm-lgt analyse exo-type ?values)
+      "fadd"         (analyse-jvm-fadd analyse exo-type ?values)
+      "fsub"         (analyse-jvm-fsub analyse exo-type ?values)
+      "fmul"         (analyse-jvm-fmul analyse exo-type ?values)
+      "fdiv"         (analyse-jvm-fdiv analyse exo-type ?values)
+      "frem"         (analyse-jvm-frem analyse exo-type ?values)
+      "feq"          (analyse-jvm-feq analyse exo-type ?values)
+      "flt"          (analyse-jvm-flt analyse exo-type ?values)
+      "fgt"          (analyse-jvm-fgt analyse exo-type ?values)
+      "dadd"         (analyse-jvm-dadd analyse exo-type ?values)
+      "dsub"         (analyse-jvm-dsub analyse exo-type ?values)
+      "dmul"         (analyse-jvm-dmul analyse exo-type ?values)
+      "ddiv"         (analyse-jvm-ddiv analyse exo-type ?values)
+      "drem"         (analyse-jvm-drem analyse exo-type ?values)
+      "deq"          (analyse-jvm-deq analyse exo-type ?values)
+      "dlt"          (analyse-jvm-dlt analyse exo-type ?values)
+      "dgt"          (analyse-jvm-dgt analyse exo-type ?values)
+      "iand"         (analyse-jvm-iand analyse exo-type ?values)
+      "ior"          (analyse-jvm-ior analyse exo-type ?values)
+      "ixor"         (analyse-jvm-ixor analyse exo-type ?values)
+      "ishl"         (analyse-jvm-ishl analyse exo-type ?values)
+      "ishr"         (analyse-jvm-ishr analyse exo-type ?values)
+      "iushr"        (analyse-jvm-iushr analyse exo-type ?values)
+      "land"         (analyse-jvm-land analyse exo-type ?values)
+      "lor"          (analyse-jvm-lor analyse exo-type ?values)
+      "lxor"         (analyse-jvm-lxor analyse exo-type ?values)
+      "lshl"         (analyse-jvm-lshl analyse exo-type ?values)
+      "lshr"         (analyse-jvm-lshr analyse exo-type ?values)
+      "lushr"        (analyse-jvm-lushr analyse exo-type ?values)
+      "d2f"          (analyse-jvm-d2f analyse exo-type ?values)
+      "d2i"          (analyse-jvm-d2i analyse exo-type ?values)
+      "d2l"          (analyse-jvm-d2l analyse exo-type ?values)
+      "f2d"          (analyse-jvm-f2d analyse exo-type ?values)
+      "f2i"          (analyse-jvm-f2i analyse exo-type ?values)
+      "f2l"          (analyse-jvm-f2l analyse exo-type ?values)
+      "i2b"          (analyse-jvm-i2b analyse exo-type ?values)
+      "i2c"          (analyse-jvm-i2c analyse exo-type ?values)
+      "i2d"          (analyse-jvm-i2d analyse exo-type ?values)
+      "i2f"          (analyse-jvm-i2f analyse exo-type ?values)
+      "i2l"          (analyse-jvm-i2l analyse exo-type ?values)
+      "i2s"          (analyse-jvm-i2s analyse exo-type ?values)
+      "l2d"          (analyse-jvm-l2d analyse exo-type ?values)
+      "l2f"          (analyse-jvm-l2f analyse exo-type ?values)
+      "l2i"          (analyse-jvm-l2i analyse exo-type ?values)
+      "c2b"          (analyse-jvm-c2b analyse exo-type ?values)
+      "c2s"          (analyse-jvm-c2s analyse exo-type ?values)
+      "c2i"          (analyse-jvm-c2i analyse exo-type ?values)
+      "c2l"          (analyse-jvm-c2l analyse exo-type ?values)
       ;; else
       (fail (str "[Analyser Error] Unknown host procedure: " [category proc])))