Merge branch 'master' into tools-analyzer

src/babashka/impl/classes.clj

@@ -279,6 +279,7 @@
           java.io.RandomAccessFile
           java.io.InputStream
           java.io.IOException
+          java.io.LineNumberReader
           java.io.OutputStream
           java.io.InputStreamReader
           java.io.OutputStreamWriter
@@ -544,6 +545,8 @@
           java.util.zip.ZipFile
           sun.misc.Signal
           sun.misc.SignalHandler
+          org.objectweb.asm.Type
+          java.lang.Void
           ~(symbol "[B")
           ~(symbol "[I")
           ~(symbol "[Ljava.lang.Object;")
@@ -583,6 +586,8 @@
                       clojure.lang.Counted
                       clojure.lang.Cycle
                       clojure.lang.IObj
+                      clojure.lang.IType
+                      clojure.lang.IReference
                       clojure.lang.Fn ;; to distinguish fns from maps, etc.
                       clojure.lang.IPending
                       ;; clojure.lang.IDeref ;; implemented as protocol in sci
@@ -836,7 +841,9 @@
     Throwable java.lang.Throwable
     VirtualMachineError java.lang.VirtualMachineError
     ThreadDeath java.lang.ThreadDeath
-    UnsupportedOperationException java.lang.UnsupportedOperationException})
+    Void java.lang.Void
+    UnsupportedOperationException java.lang.UnsupportedOperationException
+    })
 
 (defn reflection-file-entries []
   (let [entries (vec (for [c (sort (concat (:all classes)

src/babashka/impl/clojure/core.clj

@@ -194,5 +194,6 @@
    'print-dup (sci/copy-var print-dup clojure-core-ns)
    'PrintWriter-on (sci/copy-var PrintWriter-on clojure-core-ns)
    'set-agent-send-executor! (sci/copy-var set-agent-send-executor! clojure-core-ns)
-   'set-agent-send-off-executor! (sci/copy-var set-agent-send-off-executor! clojure-core-ns)}
+   'set-agent-send-off-executor! (sci/copy-var set-agent-send-off-executor! clojure-core-ns)
+   }
   )

src/babashka/impl/clojure/tools/reader_types.clj

@@ -8,6 +8,7 @@
 (def rtns (sci/create-ns 'clojure.tools.reader.reader-types))
 
 (def reader-types-namespace {'indexing-reader? (sci/copy-var rt/indexing-reader? rtns)
+                             'indexing-push-back-reader (sci/copy-var rt/indexing-push-back-reader rtns)
                              'get-line-number (sci/copy-var rt/get-line-number rtns)
                              'get-column-number (sci/copy-var rt/get-column-number rtns)
                              'peek-char (sci/copy-var rt/peek-char rtns)

src/babashka/impl/tools/cli.clj

@@ -10,4 +10,5 @@
    'summarize (copy-var tools.cli/summarize cli-ns)
    'get-default-options (copy-var tools.cli/get-default-options cli-ns)
    'parse-opts (copy-var tools.cli/parse-opts cli-ns)
-   'make-summary-part (copy-var tools.cli/make-summary-part cli-ns)})
+   'make-summary-part (copy-var tools.cli/make-summary-part cli-ns)
+   'cli (copy-var tools.cli/cli cli-ns)})

src/babashka/main.clj

@@ -358,6 +358,8 @@ Use bb run --help to show this help output.
 
 (def main-var (sci/new-var 'main nil {:ns clojure-main-ns}))
 
+(require '[clojure.reflect] '[clojure.core.memoize :as memoize])
+
 (def namespaces
   (cond->
    {'user {'*input* (reify
@@ -484,7 +486,12 @@ Use bb run --help to show this help output.
                              'clojure.tools.logging.readable
                              @(resolve 'babashka.impl.logging/tools-logging-readable-namespace))
     features/priority-map? (assoc 'clojure.data.priority-map
-                                  @(resolve 'babashka.impl.priority-map/priority-map-namespace))))
+                                  @(resolve 'babashka.impl.priority-map/priority-map-namespace))
+    true (assoc 'clojure.reflect {'type-reflect clojure.reflect/type-reflect
+                                  '->JavaReflector clojure.reflect/->JavaReflector})
+    true (assoc 'clojure.core.cache {})
+    true (assoc 'clojure.core.memoize {'lru memoize/lru
+                                       'memo-clear! memoize/memo-clear!})))
 
 (def edn-readers (cond-> {}
                    features/yaml?