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,13 +9,25 @@
   "Generates pre-compiled reify combinations"
   [methods]
   (let [subsets (rest (combo/subsets (seq methods)))]
-    (reduce (fn [opts classes]
+    (reduce (fn [opts [classes protocols?]]
+              (let [prelude '[reify]
+                    prelude (if protocols?
+                              (conj prelude
+                                    'sci.impl.types.IReified
+                                    '(getInterfaces [this]
+                                                    interfaces)
+                                    '(getMethods [this]
+                                                 methods)
+                                    '(getProtocols [this]
+                                                   protocols))
+                              prelude)]
                 (assoc opts
-                     (set (map (fn [[class _]]
+                       (cond-> (set (map #(list 'quote %)
-                                 (list 'quote class))
+                                         (map first classes)))
-                               classes))
+                         protocols?
-                     (list 'fn ['methods]
+                         (conj (list 'quote 'sci.impl.types.IReified)))
-                           (list* 'reify
+                       (list 'fn ['interfaces 'methods 'protocols]
+                             (concat prelude
                                      (mapcat
                                       (fn [[clazz methods]]
                                         (cons clazz
@@ -24,14 +37,20 @@
                                                   (fn [arity]
                                                     (list meth arity
                                                           (list*
-                                                        (list 'get-in 'methods
+                                                           (list 'get 'methods (list 'quote meth))
-                                                              [(list 'quote clazz) (list 'quote meth)])
                                                            arity)))
                                                   arities))
                                                methods)))
-                                   classes)))))
+                                      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]]}})))