Fix bugs

sci

@@ -1 +1 @@
-Subproject commit b74cdc1f7f1e9a9136a7439b828f02f22251b901
+Subproject commit 32801896e4d9533b3b61453b4ebb813042c59e5c

src/babashka/impl/reify.clj

@@ -1,6 +1,7 @@
 (ns babashka.impl.reify
   {:no-doc true}
-  (:require [clojure.math.combinatorics :as combo]))
+  (:require [clojure.math.combinatorics :as combo]
+            [sci.impl.types]))
 
 (set! *warn-on-reflection* false)
 
@@ -8,33 +9,51 @@
   "Generates pre-compiled reify combinations"
   [methods]
   (let [subsets (rest (combo/subsets (seq methods)))]
-    (reduce (fn [opts classes]
+    (reduce (fn [opts [classes protocols?]]
-              (assoc opts
+              (let [prelude '[reify]
-                     (set (map (fn [[class _]]
+                    prelude (if protocols?
-                                 (list 'quote class))
+                              (conj prelude
-                               classes))
+                                    'sci.impl.types.IReified
-                     (list 'fn ['methods]
+                                    '(getInterfaces [this]
-                           (list* 'reify
+                                                    interfaces)
-                                  (mapcat
+                                    '(getMethods [this]
-                                   (fn [[clazz methods]]
+                                                 methods)
-                                     (cons clazz
+                                    '(getProtocols [this]
-                                           (mapcat
+                                                   protocols))
-                                            (fn [[meth arities]]
+                              prelude)]
-                                              (map
+                (assoc opts
-                                               (fn [arity]
+                       (cond-> (set (map #(list 'quote %)
-                                                 (list meth arity
+                                         (map first classes)))
-                                                       (list*
+                         protocols?
-                                                        (list 'get-in 'methods
+                         (conj (list 'quote 'sci.impl.types.IReified)))
-                                                              [(list 'quote clazz) (list 'quote meth)])
+                       (list 'fn ['interfaces 'methods 'protocols]
-                                                        arity)))
+                             (concat prelude
-                                               arities))
+                                     (mapcat
-                                            methods)))
+                                      (fn [[clazz methods]]
-                                   classes)))))
+                                        (cons clazz
+                                              (mapcat
+                                               (fn [[meth arities]]
+                                                 (map
+                                                  (fn [arity]
+                                                    (list meth arity
+                                                          (list*
+                                                           (list 'get 'methods (list 'quote meth))
+                                                           arity)))
+                                                  arities))
+                                               methods)))
+                                      classes))))))
             {}
-            subsets)))
+            (concat (map (fn [subset bool]
+                           [subset bool])
+                         subsets
+                         (repeat true))
+                    (map (fn [subset bool]
+                           [subset bool])
+                         subsets
+                         (repeat false))))))
 
 #_(prn (macroexpand '(gen-reify-combos
-                    {java.io.FileFilter {accept [[this f]]}})))
+                      {java.io.FileFilter {accept [[this f]]}})))
 
 #_:clj-kondo/ignore
 (def reify-opts