Fix for fn? and ifn?

Signed-off-by: James Hamlin <jfhamlin@gmail.com>

Author: jfhamlin

pkg/stdlib/clojure/core.glj

@@ -656,15 +656,15 @@
   "Applies fn f to the argument list formed by prepending intervening arguments to args."
   {:added "1.0"
    :static true}
-  ([^clojure.lang.IFn f args]
+  ([^github.com:glojurelang:glojure:pkg:lang.IFn f args]
      (github.com:glojurelang:glojure:pkg:lang.Apply f (seq args)))
-  ([^clojure.lang.IFn f x args]
+  ([^github.com:glojurelang:glojure:pkg:lang.IFn f x args]
      (github.com:glojurelang:glojure:pkg:lang.Apply f (list* x args)))
-  ([^clojure.lang.IFn f x y args]
+  ([^github.com:glojurelang:glojure:pkg:lang.IFn f x y args]
      (github.com:glojurelang:glojure:pkg:lang.Apply f (list* x y args)))
-  ([^clojure.lang.IFn f x y z args]
+  ([^github.com:glojurelang:glojure:pkg:lang.IFn f x y z args]
      (github.com:glojurelang:glojure:pkg:lang.Apply f (list* x y z args)))
-  ([^clojure.lang.IFn f a b c d & args]
+  ([^github.com:glojurelang:glojure:pkg:lang.IFn f a b c d & args]
      (github.com:glojurelang:glojure:pkg:lang.Apply f (cons a (cons b (cons c (cons d (spread args))))))))
 
 (defn vary-meta
@@ -6203,13 +6203,13 @@ fails, attempts to require sym's namespace and retries."
   (e.g. sets and maps) implement IFn"
   {:added "1.0"
    :static true}
-  [x] (instance? clojure.lang.IFn x))
+  [x] (instance? github.com:glojurelang:glojure:pkg:lang.IFn x))
 
 (defn fn?
   "Returns true if x implements Fn, i.e. is an object created via fn."
   {:added "1.0"
    :static true}
-  [x] (instance? github.com:glojurelang:glojure:pkg:runtime.*Fn x))
+  [x] (or (instance? github.com:glojurelang:glojure:pkg:runtime.*Fn x) (instance? github.com:glojurelang:glojure:pkg:lang.IFn x)))
 
 
 (defn associative?
@@ -7090,7 +7090,7 @@ fails, attempts to require sym's namespace and retries."
      github.com:glojurelang:glojure:pkg:lang.IPending
       (isRealized [this]
        (zero? (.getCount d)))
-     clojure.lang.IFn
+     github.com:glojurelang:glojure:pkg:lang.IFn
      (invoke
       [this x]
       (when (and (pos? (.getCount d))
@@ -7921,7 +7921,7 @@ fails, attempts to require sym's namespace and retries."
    :added "1.11"}
   ^go/int64 [^go/string s]
   (if (string? s)
-    (clojure.core/let [result__3646__auto__ (strconv.ParseInt s 10 64)] (if (result__3646__auto__ 1) nil (result__3646__auto__ 0)))
+    (clojure.core/let [result__3648__auto__ (strconv.ParseInt s 10 64)] (if (result__3648__auto__ 1) nil (result__3648__auto__ 0)))
     (throw (github.com:glojurelang:glojure:pkg:lang.NewIllegalArgumentError (parsing-err s)))))
 
 (defn parse-double
@@ -7932,7 +7932,7 @@ fails, attempts to require sym's namespace and retries."
    :added "1.11"}
   ^go/float64 [^go/string s]
   (if (string? s)
-    (clojure.core/let [result__3647__auto__ (strconv.ParseFloat s 64)] (if (result__3647__auto__ 1) nil (result__3647__auto__ 0)))
+    (clojure.core/let [result__3649__auto__ (strconv.ParseFloat s 64)] (if (result__3649__auto__ 1) nil (result__3649__auto__ 0)))
     (throw (github.com:glojurelang:glojure:pkg:lang.NewIllegalArgumentError (parsing-err s)))))
 
 (defn parse-uuid

pkg/stdlib/clojure/core/loader.go

@@ -263,6 +263,8 @@
 
    (sexpr-replace 'clojure.lang.IReduce
                   'github.com:glojurelang:glojure:pkg:lang.IReduce)
+   (sexpr-replace 'clojure.lang.IFn
+                  'github.com:glojurelang:glojure:pkg:lang.IFn)
    (sexpr-replace 'clojure.lang.IPending
                   'github.com:glojurelang:glojure:pkg:lang.IPending)
    (sexpr-replace 'clojure.lang.MultiFn
@@ -347,6 +349,11 @@
                   '(fn instance? [t x] (github.com:glojurelang:glojure:pkg:lang.HasType t x)))
 
 
+  ;; Replace instance? checks for clojure.lang.Fn with OR expression checking both runtime.*Fn and IFn
+  (sexpr-replace '(instance? clojure.lang.Fn x)
+                 '(or (instance? github.com:glojurelang:glojure:pkg:runtime.*Fn x)
+                      (instance? github.com:glojurelang:glojure:pkg:lang.IFn x)))
+
    ;; ===== Exception Handling =====
    (sexpr-replace 'Exception. 'github.com:glojurelang:glojure:pkg:lang.NewError)