Merge branch 'array-play' into bitset

resources/META-INF/babashka/deps.edn

@@ -14,7 +14,7 @@
          "depstar/src" "process/src"
          "deps.clj/src" "deps.clj/resources"
          "resources" "sci/resources"],
- :deps {org.clojure/clojure {:mvn/version "1.11.0-alpha4"},
+ :deps {org.clojure/clojure {:mvn/version "1.11.0-beta1"},
         borkdude/sci {:local/root "sci"}
         babashka/babashka.curl {:local/root "babashka.curl"}
         babashka/fs {:local/root "fs"}
@@ -26,7 +26,7 @@
         cheshire/cheshire {:mvn/version "5.10.2"}
         org.clojure/data.xml {:mvn/version "0.2.0-alpha6"}
         clj-commons/clj-yaml {:mvn/version "0.7.107"}
-        com.cognitect/transit-clj {:mvn/version "1.0.324"}
+        com.cognitect/transit-clj {:mvn/version "1.0.329"}
         org.clojure/test.check {:mvn/version "1.1.1"}
         nrepl/bencode {:mvn/version "1.1.0"}
         seancorfield/next.jdbc {:mvn/version "1.1.610"}
@@ -56,6 +56,8 @@
                          org.babashka/spec.alpha {:git/url "https://github.com/babashka/spec.alpha"
                                                   :sha "0dec1f88cbde74a0470b454396f09a03adb4ae39"}
                          lambdaisland/regal {:mvn/version "0.0.143"}
+                         weavejester/medley {:git/url "https://github.com/weavejester/medley"
+                                             :sha "a4e5fb5383f5c0d83cb2d005181a35b76d8a136d"}
                          cprop/cprop {:mvn/version "0.1.16"}
                          comb/comb {:mvn/version "0.1.1"}
                          mvxcvi/arrangement {:mvn/version "2.0.0"}
@@ -101,6 +103,9 @@
                          listora/again {:mvn/version "1.0.0"}
                          org.clojure/tools.gitlibs {:mvn/version "2.4.172"}
                          environ/environ {:mvn/version "1.2.0"}
+<<<<<<< HEAD
+                         table/table {:git/url "https://github.com/cldwalker/table", :sha "55aef3d5fced682942af811bf5d642f79fb87688"}}
+=======
                          table/table {:git/url "https://github.com/cldwalker/table", :sha "f6293c5f3dac1dd6f525a80fc80930f8ccdf16b7"}
                          markdown-clj/markdown-clj {:mvn/version "1.10.8"}
                          org.clojure/tools.namespace {:git/url "https://github.com/babashka/tools.namespace", :sha "a13b037215e21a2e71aa34b27e1dd52c801a2a7b"}
@@ -121,6 +126,7 @@
                          com.exoscale/lingo {:mvn/version "1.0.0-alpha14"}
                          io.github.swirrl/dogstatsd {:mvn/version "0.1.39"}
                          org.clojure/algo.monads {:mvn/version "0.1.6"}}
+>>>>>>> array-play
             :classpath-overrides {org.clojure/clojure nil
                                   org.clojure/spec.alpha nil}}
            :clj-nvd

sci

@@ -1 +1 @@
-Subproject commit 2f5d287d27b9ebed8b4c0a8c59939a4c9da1ec26
+Subproject commit dd4a1f31e725ee1d2d1e95d3c0cf107925e8f9ce

src/babashka/impl/classes.clj

@@ -344,9 +344,11 @@
           java.util.jar.Manifest
           java.util.stream.BaseStream
           java.util.stream.Stream
+          java.util.stream.IntStream
           java.util.Random
           java.util.regex.Matcher
           java.util.regex.Pattern
+          java.util.BitSet
           java.util.ArrayDeque
           java.util.ArrayList
           java.util.Collections
@@ -499,6 +501,8 @@
                    java.nio.file.FileSystem
                    (instance? java.nio.file.PathMatcher v)
                    java.nio.file.PathMatcher
+                   (instance? java.util.stream.IntStream v)
+                   java.util.stream.IntStream
                    (instance? java.util.stream.BaseStream v)
                    java.util.stream.BaseStream
                    (instance? java.nio.ByteBuffer v)

src/babashka/impl/error_handler.clj

@@ -139,10 +139,6 @@
             (ruler "Context")
             (println ec)
             (println))
-          (when-let [locals (and (:debug opts) (not-empty (:locals d)))]
-            (ruler "Locals")
-            (print-locals locals)
-            (println))
           (when sci-error?
             (when-let
                 [st (let [st (with-out-str

test/babashka/error_test.clj

@@ -208,9 +208,6 @@ Location: <expr>:1:12
 1: (let [x 1] (/ x 0))
               ^--- Divide by zero
 
------ Locals -------------------------------------------------------------------
-x: 1
-
 ----- Stack trace --------------------------------------------------------------
 clojure.core// - <built-in>
 user           - <expr>:1:12
@@ -219,13 +216,13 @@ user           - <expr>:1:12
 clojure.lang.ExceptionInfo: Divide by zero
 {:type :sci/error, :line 1, :column 12, :message \"Divide by zero\",")))))
 
-(deftest macro-locals-print-test
+(deftest macro-test
-  (testing "exception during macro call includes &form and &env locals"
+  (let [output (try (tu/bb nil "--debug" "(defmacro foo [x] (subs nil 1) `(do ~x ~x)) (foo 1)")
-    (let [output (try (tu/bb nil "--debug" "(defmacro foo [x] (subs nil 1) `(do ~x ~x)) (foo 1)")
+                    (is false)
-                      (is false)
+                    (catch Exception e (ex-message e)))
-                      (catch Exception e (ex-message e)))]
+        output (tu/normalize output)]
-      (is (str/includes? (tu/normalize output)
+    (is (str/includes? output
-            "----- Error --------------------------------------------------------------------
+                       "----- Error --------------------------------------------------------------------
 Type:     java.lang.NullPointerException
 Location: <expr>:1:19
 Phase:    macroexpand
@@ -234,11 +231,6 @@ Phase:    macroexpand
 1: (defmacro foo [x] (subs nil 1) `(do ~x ~x)) (foo 1)
                      ^--- 
 
------ Locals -------------------------------------------------------------------
-&form: (foo 1)
-&env:  {}
-x:     1
-
 ----- Stack trace --------------------------------------------------------------
 clojure.core/subs - <built-in>
 user/foo          - <expr>:1:19
@@ -247,7 +239,7 @@ user              - <expr>:1:45
 
 ----- Exception ----------------------------------------------------------------
 clojure.lang.ExceptionInfo: null
-{:type :sci/error, :line 1, :column 19,")))))
+{:type :sci/error, :line 1, :column 19"))))
 
 (deftest native-stacktrace-test
   (let [output (try (tu/bb nil "(merge 1 2 3)")