luciano/babashka
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clojure 1.12 IFn coercion

Browse source
This commit is contained in:
Michiel Borkent 2024-10-10 20:54:29 +02:00 committed by GitHub
parent bc1c35790e
commit c3c2c8b108
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 156 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -9,6 +9,7 @@ A preview of the next release can be installed from
## Unreleased ## Unreleased
- Clojure 1.12 interop: method thunks, FI coercion, array notation
- Upgrade SCI reflector based on clojure 1.12 and remove specific workaround for - Upgrade SCI reflector based on clojure 1.12 and remove specific workaround for
`Thread/sleep` interop `Thread/sleep` interop
- Add `tools.reader.edn/read` - Add `tools.reader.edn/read`

2
deps.edn
View file

@ -20,7 +20,7 @@
"impl-java/src"], "impl-java/src"],
:deps {org.clojure/clojure {:mvn/version "1.12.0"}, :deps {org.clojure/clojure {:mvn/version "1.12.0"},
org.babashka/sci {:local/root "sci"} org.babashka/sci {:local/root "sci"}
org.babashka/babashka.impl.java {:mvn/version "0.1.8"} org.babashka/babashka.impl.java {:mvn/version "0.1.9"}
org.babashka/sci.impl.types {:mvn/version "0.0.2"} org.babashka/sci.impl.types {:mvn/version "0.0.2"}
babashka/babashka.curl {:local/root "babashka.curl"} babashka/babashka.curl {:local/root "babashka.curl"}
babashka/fs {:local/root "fs"} babashka/fs {:local/root "fs"}

9
impl-java/build.clj
View file

@ -3,7 +3,7 @@
[clojure.tools.build.api :as b])) [clojure.tools.build.api :as b]))
(def lib 'org.babashka/babashka.impl.java) (def lib 'org.babashka/babashka.impl.java)
(def version "0.1.8") (def version "0.1.9")
(def class-dir "target/classes") (def class-dir "target/classes")
(def basis (b/create-basis {:project "deps.edn"})) (def basis (b/create-basis {:project "deps.edn"}))
(def jar-file (format "target/%s-%s.jar" (name lib) version)) (def jar-file (format "target/%s-%s.jar" (name lib) version))
@ -26,7 +26,12 @@
:lib lib :lib lib
:version version :version version
:basis basis :basis basis
:src-dirs ["src"]}) :src-dirs ["src"]
:pom-data
[[:licenses
[:license
[:name "MIT License"]
[:url "https://opensource.org/license/mit/"]]]]})
(b/copy-dir {:src-dirs ["src"] (b/copy-dir {:src-dirs ["src"]
:target-dir class-dir}) :target-dir class-dir})
(b/jar {:class-dir class-dir (b/jar {:class-dir class-dir

2
impl-java/deps.edn
View file

@ -2,7 +2,7 @@
:aliases :aliases
{:build ;; added by neil {:build ;; added by neil
{:paths ["." "build" "src"] {:paths ["." "build" "src"]
:deps {io.github.clojure/tools.build {:git/tag "v0.8.1" :git/sha "7d40500"} :deps {io.github.clojure/tools.build {:git/tag "v0.9.6" :git/sha "8e78bcc"}
slipset/deps-deploy {:mvn/version "0.2.0"} slipset/deps-deploy {:mvn/version "0.2.0"}
org.babashka/sci.impl.types {:mvn/version "0.0.2"} org.babashka/sci.impl.types {:mvn/version "0.0.2"}
;; insn/insn {:mvn/version "0.5.3"} ;; insn/insn {:mvn/version "0.5.3"}

1
impl-java/src/babashka/impl/reify2/interfaces.clj
View file

@ -1,6 +1,7 @@
(ns babashka.impl.reify2.interfaces) (ns babashka.impl.reify2.interfaces)
(def interfaces [java.nio.file.FileVisitor (def interfaces [java.nio.file.FileVisitor
java.nio.file.DirectoryStream$Filter
java.io.FileFilter java.io.FileFilter
java.io.FilenameFilter java.io.FilenameFilter
clojure.lang.Associative clojure.lang.Associative

2
project.clj
View file

@ -29,7 +29,7 @@
[nrepl/bencode "1.2.0"] [nrepl/bencode "1.2.0"]
[borkdude/sci.impl.reflector "0.0.3"] [borkdude/sci.impl.reflector "0.0.3"]
[org.babashka/sci.impl.types "0.0.2"] [org.babashka/sci.impl.types "0.0.2"]
[org.babashka/babashka.impl.java "0.1.8"] [org.babashka/babashka.impl.java "0.1.9"]
[org.clojure/core.async "1.6.673"] [org.clojure/core.async "1.6.673"]
[org.clojure/test.check "1.1.1"] [org.clojure/test.check "1.1.1"]
[com.github.clj-easy/graal-build-time "0.1.0"] [com.github.clj-easy/graal-build-time "0.1.0"]

31
resources/META-INF/native-image/babashka/babashka/proxy-config.json Normal file
View file

@ -0,0 +1,31 @@
[{
"interfaces": [
"java.util.function.Predicate"
]
},
{
"interfaces": [
"java.util.function.Function"
]
},
{
"interfaces": [
"java.io.FileFilter"
]
},
{
"interfaces": [
"java.nio.file.DirectoryStream$Filter"
]
},
{
"interfaces": [
"java.util.function.Supplier"
]
},
{
"interfaces": [
"java.util.function.UnaryOperator"
]
}
]

2
sci

@ -1 +1 @@
Subproject commit 5d33aaa3f529d8a8da4837d5192cc244cdb9c9f3 Subproject commit 6c49b7ed9346e05e0868193c355e7c38ca7bcec9

180
src/babashka/impl/classes.clj
View file

@ -394,6 +394,7 @@
java.nio.file.FileVisitOption java.nio.file.FileVisitOption
java.nio.file.FileVisitResult java.nio.file.FileVisitResult
java.nio.file.Files java.nio.file.Files
java.nio.file.DirectoryStream$Filter
java.nio.file.LinkOption java.nio.file.LinkOption
java.nio.file.NoSuchFileException java.nio.file.NoSuchFileException
java.nio.file.Path java.nio.file.Path
@ -668,94 +669,101 @@
c)) c))
m (assoc m :public-class m (assoc m :public-class
(fn [v] (fn [v]
;; (prn :v v)
;; NOTE: a series of instance check, so far, is still cheaper ;; NOTE: a series of instance check, so far, is still cheaper
;; than piggybacking on defmulti or defprotocol ;; than piggybacking on defmulti or defprotocol
(cond (instance? java.lang.Process v) (let [res (cond (instance? java.lang.Process v)
java.lang.Process java.lang.Process
(instance? java.lang.ProcessHandle v) (instance? java.lang.ProcessHandle v)
java.lang.ProcessHandle java.lang.ProcessHandle
(instance? java.lang.ProcessHandle$Info v) (instance? java.lang.ProcessHandle$Info v)
java.lang.ProcessHandle$Info java.lang.ProcessHandle$Info
;; added for calling .put on .environment from ProcessBuilder ;; added for calling .put on .environment from ProcessBuilder
(instance? java.util.Map v) (instance? java.util.Map v)
java.util.Map java.util.Map
;; added for issue #239 regarding clj-http-lite ;; added for issue #239 regarding clj-http-lite
;; can potentially be removed due to fix for #1061 ;; can potentially be removed due to fix for #1061
(instance? java.io.ByteArrayOutputStream v) (instance? java.io.ByteArrayOutputStream v)
java.io.ByteArrayOutputStream java.io.ByteArrayOutputStream
(instance? java.security.MessageDigest v) (instance? java.security.MessageDigest v)
java.security.MessageDigest java.security.MessageDigest
;; streams ;; streams
(instance? java.io.InputStream v) (instance? java.io.InputStream v)
java.io.InputStream java.io.InputStream
(instance? java.io.OutputStream v) (instance? java.io.OutputStream v)
java.io.OutputStream java.io.OutputStream
;; java nio ;; java nio
(instance? java.nio.file.Path v) (instance? java.nio.file.Path v)
java.nio.file.Path java.nio.file.Path
(instance? java.nio.file.FileSystem v) (instance? java.nio.file.FileSystem v)
java.nio.file.FileSystem java.nio.file.FileSystem
(instance? java.nio.file.PathMatcher v) (instance? java.nio.file.PathMatcher v)
java.nio.file.PathMatcher java.nio.file.PathMatcher
(instance? java.util.stream.IntStream v) (instance? java.util.stream.Stream v)
java.util.stream.IntStream java.util.stream.Stream
(instance? java.util.stream.BaseStream v) (instance? java.util.stream.IntStream v)
java.util.stream.BaseStream java.util.stream.IntStream
(instance? java.nio.ByteBuffer v) (instance? java.util.stream.BaseStream v)
java.nio.ByteBuffer java.util.stream.BaseStream
(instance? java.nio.charset.Charset v) (instance? java.nio.ByteBuffer v)
java.nio.charset.Charset java.nio.ByteBuffer
(instance? java.nio.charset.CharsetEncoder v) (instance? java.nio.charset.Charset v)
java.nio.charset.CharsetEncoder java.nio.charset.Charset
(instance? java.nio.CharBuffer v) (instance? java.nio.charset.CharsetEncoder v)
java.nio.CharBuffer java.nio.charset.CharsetEncoder
(instance? java.nio.channels.FileChannel v) (instance? java.nio.CharBuffer v)
java.nio.channels.FileChannel java.nio.CharBuffer
(instance? java.nio.channels.ServerSocketChannel v) (instance? java.nio.channels.FileChannel v)
java.nio.channels.ServerSocketChannel java.nio.channels.FileChannel
(instance? java.nio.channels.SocketChannel v) (instance? java.nio.channels.ServerSocketChannel v)
java.nio.channels.SocketChannel java.nio.channels.ServerSocketChannel
(instance? java.net.CookieStore v) (instance? java.nio.channels.SocketChannel v)
java.net.CookieStore java.nio.channels.SocketChannel
;; this makes interop on reified classes work (instance? java.net.CookieStore v)
;; see java_net_http_test/interop-test java.net.CookieStore
(instance? sci.impl.types.IReified v) ;; this makes interop on reified classes work
(first (t/getInterfaces v)) ;; see java_net_http_test/interop-test
;; fix for #1061 (instance? sci.impl.types.IReified v)
(instance? java.net.URLClassLoader v) (first (t/getInterfaces v))
java.net.URLClassLoader ;; fix for #1061
(instance? java.lang.ClassLoader v) (instance? java.net.URLClassLoader v)
java.lang.ClassLoader java.net.URLClassLoader
(instance? java.nio.file.attribute.BasicFileAttributes v) (instance? java.lang.ClassLoader v)
java.nio.file.attribute.BasicFileAttributes java.lang.ClassLoader
(instance? java.util.concurrent.Future v) (instance? java.nio.file.attribute.BasicFileAttributes v)
java.util.concurrent.Future java.nio.file.attribute.BasicFileAttributes
(instance? java.util.concurrent.ScheduledExecutorService v) (instance? java.util.concurrent.Future v)
java.util.concurrent.ScheduledExecutorService java.util.concurrent.Future
(instance? java.util.concurrent.ExecutorService v) (instance? java.util.concurrent.ScheduledExecutorService v)
java.util.concurrent.ExecutorService java.util.concurrent.ScheduledExecutorService
(instance? java.util.Iterator v) (instance? java.util.concurrent.ExecutorService v)
java.util.Iterator java.util.concurrent.ExecutorService
(instance? javax.crypto.SecretKey v) (instance? java.util.Iterator v)
javax.crypto.SecretKey java.util.Iterator
(instance? javax.net.ssl.SSLSocketFactory v) (instance? javax.crypto.SecretKey v)
javax.net.ssl.SSLSocketFactory javax.crypto.SecretKey
(instance? javax.net.ssl.SSLSocket v) (instance? javax.net.ssl.SSLSocketFactory v)
javax.net.ssl.SSLSocket javax.net.ssl.SSLSocketFactory
(instance? java.lang.Thread v) (instance? javax.net.ssl.SSLSocket v)
java.lang.Thread javax.net.ssl.SSLSocket
(instance? java.util.concurrent.ThreadFactory v) (instance? java.lang.Thread v)
java.util.concurrent.ThreadFactory java.lang.Thread
(instance? java.security.cert.X509Certificate v) (instance? java.util.concurrent.ThreadFactory v)
java.security.cert.X509Certificate java.util.concurrent.ThreadFactory
(instance? java.io.Console v) (instance? java.security.cert.X509Certificate v)
java.io.Console java.security.cert.X509Certificate
(instance? java.util.Set v) (instance? java.io.Console v)
java.util.Set java.io.Console
(instance? java.io.Closeable v) (instance? java.util.Set v)
java.io.Closeable java.util.Set
;; keep commas for merge friendliness (instance? java.io.Closeable v)
))) java.io.Closeable
(instance? java.util.Collection v)
java.util.Collection
;; keep commas for merge friendliness
)]
;; (prn :res res)
res)))
m (assoc m (list 'quote 'clojure.lang.Var) 'sci.lang.Var) m (assoc m (list 'quote 'clojure.lang.Var) 'sci.lang.Var)
m (assoc m (list 'quote 'clojure.lang.Namespace) 'sci.lang.Namespace)] m (assoc m (list 'quote 'clojure.lang.Namespace) 'sci.lang.Namespace)]
m)) m))

1
src/babashka/impl/reify.clj
View file

@ -187,5 +187,4 @@
sun.misc.SignalHandler sun.misc.SignalHandler
{handle [[this signal]]} {handle [[this signal]]}
})) }))

11
test/babashka/interop_test.clj
View file

@ -64,3 +64,14 @@
(deftest jio-line-number-reader-test (deftest jio-line-number-reader-test
(is (= 2 (bb nil "(def rdr (java.io.LineNumberReader. (java.io.StringReader. \"foo\nbar\"))) (is (= 2 (bb nil "(def rdr (java.io.LineNumberReader. (java.io.StringReader. \"foo\nbar\")))
(binding [*in* rdr] (read-line) (read-line)) (.getLineNumber rdr)")))) (binding [*in* rdr] (read-line) (read-line)) (.getLineNumber rdr)"))))
(deftest FI-coercion
(is (true? (bb nil "(= [1 3] (into [] (doto (java.util.ArrayList. [1 2 3]) (.removeIf even?))))")))
(is (true? (bb nil "(= \"abcabc\" (.computeIfAbsent (java.util.HashMap.) \"abc\" #(str % %)))")))
(is (true? (bb nil "(= '(\\9) (-> \"a9-\" seq .stream (.filter Character/isDigit) stream-seq!))")))
(is (true? (bb nil "(require (quote [clojure.java.io :as jio])) (import [java.io File] [java.nio.file Path Files DirectoryStream$Filter]) (pos? (count (seq (Files/newDirectoryStream (.toPath (jio/file \".\"))
#(-> ^Path % .toFile .isDirectory)))))")))
(is (true? (bb nil "(import [java.util Collection] [java.util.stream Stream] [java.util.function Predicate])
(= '(100 100 100 100 100) (->> (Stream/generate (constantly 100)) stream-seq! (take 5)))")))
(is (true? (bb nil "(import [java.util Collection] [java.util.stream Stream] [java.util.function Predicate])
(= '(1 2 3 4 5 6 7 8 9 10) (->> (Stream/iterate 1 inc) stream-seq! (take 10)))"))))

7
test/babashka/reify_test.clj
View file

@ -153,3 +153,10 @@
(force-gc) (force-gc)
@deleted? @deleted?
"))) ")))
(deftest reify-dir-stream-filter
(is (true? (bb nil "
(defn get-dir-stream [^java.nio.file.Path dir-path glob-pattern]
(let [path (.toPath (java.io.File. dir-path))]
(java.nio.file.Files/newDirectoryStream path glob-pattern)))
(pos? (count (seq (get-dir-stream \".\" (reify java.nio.file.DirectoryStream$Filter (accept [_ path] (.isDirectory (.toFile path))))))))"))))