Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor #821

Merged
merged 2 commits into from
Oct 23, 2022
Merged

Minor #821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db890c8
minor
borkdude Oct 23, 2022
eb0044d
remove log
borkdude Oct 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/sci/impl/evaluator.cljc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,7 @@
(let [instance-class-name #?(:clj (.getName ^Class instance-class)
:cljs (.-name instance-class))
instance-class-symbol (symbol instance-class-name)]
(get class->opts instance-class-symbol))
#?(:cljs (.log js/console (str method-str))))
(get class->opts instance-class-symbol)))
^Class target-class (if allowed? instance-class
(when-let [f (:public-class env)]
(f instance-expr*)))]
Expand Down
38 changes: 19 additions & 19 deletions src/sci/impl/interop.cljc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
(ns sci.impl.interop
{:no-doc true}
#?(:clj (:import [sci.impl Reflector]
[java.lang.reflect Field Modifier]))
#?(:clj (:import
[java.lang.reflect Field Modifier]
[sci.impl Reflector]))
(:require #?(:cljs [goog.object :as gobject])
#?(:cljs [clojure.string :as str])
[sci.impl.vars :as vars]
[sci.impl.utils :as utils]))

;; see https://github.com/clojure/clojure/blob/master/src/jvm/clojure/lang/Reflector.java
Expand All @@ -17,13 +17,13 @@
;; gobject/get didn't work here
(aget obj field-name)]
:clj
[([obj ^Class target-class method]
(let [^Field field (.getField target-class method)
mod (.getModifiers field)]
(if (and (not (Modifier/isStatic mod))
(Modifier/isPublic mod))
(.get field obj)
(throw (ex-info (str "Not found or accessible instance field: " method) {})))))]))
[[obj ^Class target-class method]
(let [^Field field (.getField target-class method)
mod (.getModifiers field)]
(if (and (not (Modifier/isStatic mod))
(Modifier/isPublic mod))
(.get field obj)
(throw (ex-info (str "Not found or accessible instance field: " method) {}))))]))

(defn invoke-instance-method
#?@(:cljs [[obj _target-class method-name args]
Expand All @@ -33,14 +33,14 @@
(js/Reflect.apply method obj (into-array args) #_(js-object-array args))
(throw (js/Error. (str "Could not find instance method: " method-name))))]
:clj
[([obj ^Class target-class method args]
(if-not target-class
(Reflector/invokeInstanceMethod obj method (object-array args))
(let [arg-count (count args)
methods (Reflector/getMethods target-class arg-count method false)]
(if (and (zero? arg-count) (.isEmpty ^java.util.List methods))
(invoke-instance-field obj target-class method)
(Reflector/invokeMatchingMethod method methods obj (object-array args))))))]))
[[obj ^Class target-class method args]
(if-not target-class
(Reflector/invokeInstanceMethod obj method (object-array args))
(let [arg-count (count args)
methods (Reflector/getMethods target-class arg-count method false)]
(if (and (zero? arg-count) (.isEmpty ^java.util.List methods))
(invoke-instance-field obj target-class method)
(Reflector/invokeMatchingMethod method methods obj (object-array args)))))]))

(defn get-static-field #?(:clj [[^Class class field-name-sym]]
:cljs [[class field-name-sym]])
Expand Down Expand Up @@ -69,7 +69,7 @@
(cond
(not field)
(throw (js/Error. (str "Could not find static method " method-name)))
(clojure.string/ends-with? method-name ".")
(str/ends-with? method-name ".")
(invoke-js-constructor field args)
:else
;; why is this here??
Expand Down