#917 Static method fn

babashka · Oct 10, 2024 · d07c0f1 · d07c0f1
1 parent 82bf12b
commit d07c0f1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 22 deletions.
diff --git a/src/sci/impl/evaluator.cljc b/src/sci/impl/evaluator.cljc
@@ -169,7 +169,8 @@
    (when (or (not env)
              (not (contains? env sym)))
      (let [sym (types/eval sym ctx bindings)
-           res (second (@utils/lookup ctx sym false))]
+           res (second
+                (@utils/lookup ctx sym false nil (qualified-symbol? sym)))]
        (when-not #?(:cljs (instance? sci.impl.types/NodeR res)
                     :clj (instance? sci.impl.types.Eval res))
          res)))))

diff --git a/src/sci/impl/resolve.cljc b/src/sci/impl/resolve.cljc
@@ -75,15 +75,6 @@
                             [clazz #?(:clj sym-name
                                       :cljs (.split (str sym-name) "."))]
                             {:sci.impl.analyzer/interop-ifn true})
-                          #_(->Node
-                              (interop/get-static-field clazz sym-name)
-                              stack) #_(if (str/starts-with? (str sym-name) ".")
-                                         ::TODO-return-IFn ;; that invokes instance method on class...
-                                         #_(let [meths (Reflector/getMethods clazz arg-count method false)])
-
-                                         (->Node
-                                           (interop/get-static-field clazz sym-name)
-                                           stack))
                           :cljs
                           (let [stack (assoc (meta sym)
                                              :file @utils/current-file
@@ -162,7 +153,8 @@
 
 (defn lookup
   ([ctx sym call?] (lookup ctx sym call? nil))
-  ([ctx sym call? #?(:clj tag :cljs _tag)]
+  ([ctx sym call? tag] (lookup ctx sym call? tag nil))
+  ([ctx sym call? #?(:clj tag :cljs _tag) only-var?]
    (let [bindings (faster/get-2 ctx :bindings)
          track-mutable? (faster/get-2 ctx :deftype-fields)]
      (or
@@ -197,7 +189,7 @@
                             mutable? (vary-meta assoc :mutable true))]
                     v))]
           [k v]))
-      (when-let [kv (lookup* ctx sym call?)]
+      (when-let [kv (lookup* ctx sym call? only-var?)]
         (when (:check-permissions ctx)
           (check-permission! ctx sym kv))
         kv)))))

diff --git a/test/sci/interop_test.cljc b/test/sci/interop_test.cljc
@@ -120,23 +120,27 @@
                     :classes {'java.lang.Class {:class Class
                                                 :static-methods {'forName (fn [_Class _forName] :dude)}}}})))))
 
+#?(:clj
+   (deftest clojure-1_12-interop-test
+     (is (= [1 2 3] (eval* "(map Integer/parseInt [\"1\" \"2\" \"3\"])")))))
 
 (when-not tu/native?
   (deftest exception-data
     (testing "top-level interop forms have line and column data"
-      (letfn [(form-ex-data [form]
-                (try
-                  (tu/eval* (str form) {:classes {:allow :all
-                                                  #?@(:clj ['Long Long])}})
-                  (is (= nil "shouldn't reach here"))
-                  (catch #?(:clj Exception :cljs :default) e
-                    (ex-data e))))]
+      (let [form-ex-data
+            (fn [form]
+              (try
+                (tu/eval* (str form) {:classes {:allow :all
+                                                #?@(:clj ['Long Long])}})
+                (is (= nil "shouldn't reach here") (str form))
+                (catch #?(:clj Exception :cljs :default) e
+                  (ex-data e))))]
         (testing "instance members"
           (are [form]
             (let [actual (form-ex-data form)]
               (and (tu/submap? {:type   :sci/error
-                           :line   1
-                           :column 1}
+                                :line   1
+                                :column 1}
                 actual)
                 (str/includes? (:message actual) "missingMem")))
             '(. 3 missingMem) '(. 3 missingMem 1 2)
@@ -156,7 +160,7 @@
                '(.missingMem Long)   '(.missingMem Long 1 2)
                '(Long/missingMem)    '(Long/missingMem 1 2)
                '(. Long -missingMem) '(.-missingMem Long)
-               'Long/missingMem      '(Long/-missingMem))))))))
+               #_#_'Long/missingMem      '(Long/-missingMem))))))))
 
 (deftest syntax-test
   (when-not tu/native?