import internal passes

Author: bronsa

src/main/clojure/clojure/tools/emitter/jvm.clj

@@ -17,12 +17,14 @@
             [clojure.tools.emitter.jvm.transform :as t]
             [clojure.tools.analyzer.passes.collect-closed-overs :refer [collect-closed-overs]]
             [clojure.tools.analyzer.passes.jvm
-             [annotate-class-id :refer [annotate-class-id]]
-             [annotate-internal-name :refer [annotate-internal-name]]
              [infer-tag :refer [ensure-tag]]
              [clear-locals :refer [clear-locals]]
              [collect :refer [collect]]]
-            [clojure.tools.emitter.passes.jvm.collect-internal-methods :refer :all]
+            [clojure.tools.emitter.passes.jvm
+             [collect-internal-methods :refer :all]
+             [annotate-class-id :refer [annotate-class-id]]
+             [annotate-internal-name :refer [annotate-internal-name]]
+             [ensure-tag :refer [ensure-tag]]]
             [clojure.java.io :as io]
             [clojure.string :as s]
             [clojure.tools.reader :as r]

src/main/clojure/clojure/tools/emitter/passes/jvm/annotate_class_id.clj

@@ -0,0 +1,17 @@
+;;   Copyright (c) Nicola Mometto, Rich Hickey & contributors.
+;;   The use and distribution terms for this software are covered by the
+;;   Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;;   which can be found in the file epl-v10.html at the root of this distribution.
+;;   By using this software in any fashion, you are agreeing to be bound by
+;;   the terms of this license.
+;;   You must not remove this notice, or any other, from this software.
+
+(ns clojure.tools.emitter.passes.jvm.annotate-class-id)
+
+(defn annotate-class-id
+  "Adds a unique class id to :reify/:fn nodes"
+  {:pass-info {:walk :any :depends #{}}}
+  [ast]
+  (if (#{:reify :fn} (:op ast))
+    (assoc ast :class-id (gensym))
+    ast))

src/main/clojure/clojure/tools/emitter/passes/jvm/annotate_internal_name.clj

@@ -0,0 +1,49 @@
+;;   Copyright (c) Nicola Mometto, Rich Hickey & contributors.
+;;   The use and distribution terms for this software are covered by the
+;;   Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;;   which can be found in the file epl-v10.html at the root of this distribution.
+;;   By using this software in any fashion, you are agreeing to be bound by
+;;   the terms of this license.
+;;   You must not remove this notice, or any other, from this software.
+
+(ns clojure.tools.emitter.passes.jvm.annotate-internal-name
+  (:require [clojure.tools.analyzer.ast :refer [update-children]]
+            [clojure.string :as s]))
+
+(defmulti annotate-internal-name
+  "Adds a :internal-name to :fn nodes containing a string that represents
+   the name of the class that will be generated for that fn, not including
+   the ns prefix"
+  {:pass-info {:walk :pre :depends #{}}}
+  :op)
+
+(defn propagate-internal-name
+  [ast internal-name]
+  (update-children ast (fn [ast] (assoc-in ast [:env :internal-name] internal-name))))
+
+(defmethod annotate-internal-name :default
+  [{:keys [env] :as ast}]
+  (if-let [internal-name (:internal-name env)]
+    (propagate-internal-name ast internal-name)
+    ast))
+
+(defmethod annotate-internal-name :def
+  [{:keys [name] :as ast}]
+  (propagate-internal-name ast (s/replace (str name) "." "_DOT_")))
+
+(defmethod annotate-internal-name :fn
+  [{:keys [env local] :as ast}]
+  (let [internal-name (str (when-let [n (:internal-name env)]
+                             (str n "$"))
+                           (s/replace (or (:form local) "fn") "." "_DOT_")
+                           (gensym "__"))]
+    (-> ast
+      (assoc :internal-name internal-name)
+      (propagate-internal-name internal-name))))
+
+(defmethod annotate-internal-name :binding
+  [{:keys [form env] :as ast}]
+  (let [internal-name (str (when-let [n (:internal-name env)]
+                             (str n "$"))
+                           form)]
+   (propagate-internal-name ast internal-name)))

src/main/clojure/clojure/tools/emitter/passes/jvm/ensure_tag.clj

@@ -0,0 +1,17 @@
+;;   Copyright (c) Nicola Mometto, Rich Hickey & contributors.
+;;   The use and distribution terms for this software are covered by the
+;;   Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;;   which can be found in the file epl-v10.html at the root of this distribution.
+;;   By using this software in any fashion, you are agreeing to be bound by
+;;   the terms of this license.
+;;   You must not remove this notice, or any other, from this software.
+
+(ns clojure.tools.emitter.passes.jvm.ensure-tag
+  (:require [clojure.tools.analyzer.passes.jvm.infer-tag :refer [infer-tag]]))
+
+(defn ensure-tag
+  {:pass-info {:walk :any :depends #{#'infer-tag}}}
+  [{:keys [o-tag tag] :as ast}]
+  (assoc ast
+    :tag   (or tag Object)
+    :o-tag (or o-tag Object)))