(WIP) Add read conditionalization for clj.runtime - more, more

dmiller · dmiller · commit e21a1c917f53 · 2024-05-06T22:28:05.000-04:00
diff --git a/typed/clj.runtime/deps-clr.edn b/typed/clj.runtime/deps-clr.edn
@@ -1 +1,3 @@
-{:paths ["src" "resources"] }
+{:paths ["src" "resources"] 
+ :deps {local/typed.cljc.analyzer {:local/root "../cljc.analyzer"}}
+}
diff --git a/typed/clj.runtime/src/clojure/core/typed/expand.cljc b/typed/clj.runtime/src/clojure/core/typed/expand.cljc
@@ -259,7 +259,7 @@
                                                          ~(expand-with-open (subvec bindings 2) body)
                                                          (finally
                                                            (. ~(bindings 0) close))))
-                             :else (throw (IllegalArgumentException. "with-open only allows Symbols in bindings"))))]
+                             :else (throw (#?(:cljr ArgumentException. :default IllegalArgumentException.) "with-open only allows Symbols in bindings"))))]
     (expand-with-open bindings body)))
 
 (defmethod -expand-macro 'clojure.core/assert
@@ -286,7 +286,7 @@
                (if (seq? (first sigs))
                  sigs
                  ;; Assume single arity syntax
-                 (throw (IllegalArgumentException.
+                 (throw (#?(:cljr ArgumentException. :default IllegalArgumentException.)
                           (if (seq sigs)
                             (str "Parameter declaration "
                                  (first sigs)
diff --git a/typed/clj.runtime/src/typed/cljc/runtime/env_utils_annotations.cljc b/typed/clj.runtime/src/typed/cljc/runtime/env_utils_annotations.cljc
@@ -9,7 +9,7 @@
 (ns ^:no-doc typed.cljc.runtime.env-utils-annotations
   (:require [typed.clojure :as t]
             [typed.cljc.runtime.env-utils :as env-utils])
-  (:import [java.lang.ref SoftReference]))
+  (:import #?(:clojure [java.lang.ref SoftReference])))
 
 (t/defalias env-utils/InvalidationId t/Str)
 (t/defalias env-utils/ForcedType
diff --git a/typed/clj.runtime/src/typed/clojure/jvm.cljc b/typed/clj.runtime/src/typed/clojure/jvm.cljc
@@ -41,9 +41,9 @@
                (apply hash-map args))
         this-ns (ns-name *ns*)]
     `(clojure.core.typed/tc-ignore
-       (let [nme# (or (when-some [^Class c# (ns-resolve '~this-ns '~nme)]
+       (let [nme# (or (when-some [^#?(:cljr Type :default Class) c# (ns-resolve '~this-ns '~nme)]
                         (when (class? c#)
-                          (-> c# .getName symbol)))
+                          (-> c# #?(:cljr .FullName :default .getName) symbol)))
                       (throw (ex-info (str "Could not resolve class: " '~nme) {:class-name '~nme})))]
           ;; TODO runtime env
          #_
