From f44c594e29c33639a0fcd6e2c46c15f0012d2e91 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sun, 4 Dec 2016 23:41:23 -0400 Subject: - Removed "monitorenter" and "monitorexit" procedures. --- luxc/src/lux/analyser/host.clj | 17 ----------------- luxc/src/lux/compiler/host.clj | 18 ------------------ 2 files changed, 35 deletions(-) diff --git a/luxc/src/lux/analyser/host.clj b/luxc/src/lux/analyser/host.clj index 209e36d0e..6aea46cab 100644 --- a/luxc/src/lux/analyser/host.clj +++ b/luxc/src/lux/analyser/host.clj @@ -686,21 +686,6 @@ (return (&/|list (&&/|meta exo-type _cursor (&&/$proc (&/T ["jvm" "synchronized"]) (&/|list =monitor =expr) (&/|list))))))) -(do-template [ ] - (defn [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 - (&&/$proc (&/T ["jvm" ]) (&/|list =monitor) (&/|list))))))) - - ^: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 ?ex) @@ -1242,8 +1227,6 @@ "load-class" (analyse-jvm-load-class analyse exo-type ?values) "try" (analyse-jvm-try 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) diff --git a/luxc/src/lux/compiler/host.clj b/luxc/src/lux/compiler/host.clj index 9f6d077be..eccfef089 100644 --- a/luxc/src/lux/compiler/host.clj +++ b/luxc/src/lux/compiler/host.clj @@ -1840,22 +1840,6 @@ (.visitInsn Opcodes/MONITOREXIT))]] (return nil))) -(do-template [ ] - (defn [compile ?values special-args] - (|do [:let [(&/$Cons ?monitor (&/$Nil)) ?values - ;; (&/$Nil) special-args - ] - ^MethodVisitor *writer* &/get-writer - _ (compile ?monitor) - :let [_ (doto *writer* - (.visitInsn ) - (.visitInsn Opcodes/ACONST_NULL))]] - (return nil))) - - ^:private compile-jvm-monitorenter Opcodes/MONITORENTER - ^:private compile-jvm-monitorexit Opcodes/MONITOREXIT - ) - (defn ^:private compile-jvm-throw [compile ?values special-args] (|do [:let [(&/$Cons ?ex (&/$Nil)) ?values ;; (&/$Nil) special-args @@ -2421,8 +2405,6 @@ "putstatic" (compile-jvm-putstatic compile ?values special-args) "putfield" (compile-jvm-putfield compile ?values special-args) "throw" (compile-jvm-throw compile ?values special-args) - "monitorenter" (compile-jvm-monitorenter compile ?values special-args) - "monitorexit" (compile-jvm-monitorexit compile ?values special-args) "null?" (compile-jvm-null? compile ?values special-args) "null" (compile-jvm-null compile ?values special-args) "anewarray" (compile-jvm-anewarray compile ?values special-args) -- cgit v1.2.3