wip

Author: borkdude

src/sci/impl/multimethods.cljc

@@ -44,11 +44,8 @@
   a reference type e.g. a var (i.e. via the Var-quote dispatch macro #'
   or the var special form)."
   {:arglists '([name docstring? attr-map? dispatch-fn & options])}
-  [_ _ ctx mm-name & options]
-  (let [[ctx mm-name options] (if (symbol? ctx)
-                                [nil ctx (cons mm-name options)]
-                                [ctx mm-name options])
-        docstring   (if (string? (first options))
+  [_ _ mm-name & options]
+  (let [docstring   (if (string? (first options))
                       (first options)
                       nil)
         options     (if (string? (first options))

src/sci/impl/namespaces.cljc

@@ -1173,8 +1173,7 @@
                'clojure-version (copy-core-var clojure-version)])
      ;; end clojure version
      ;; multimethods
-     'defmulti (macrofy 'defmulti sci.impl.multimethods/defmulti
-                        clojure-core-ns true)
+     'defmulti (macrofy 'defmulti sci.impl.multimethods/defmulti clojure-core-ns)
      'defmethod (macrofy 'defmethod sci.impl.multimethods/defmethod)
      'get-method (copy-core-var get-method)
      'methods (copy-core-var methods)
@@ -1191,8 +1190,7 @@
                            clojure-core-ns)
      'extend (copy-var sci.impl.protocols/extend clojure-core-ns {:name 'extend})
      'extends? (copy-core-var sci.impl.protocols/extends?)
-     'extend-type (macrofy 'extend-type sci.impl.protocols/extend-type
-                           clojure-core-ns true)
+     'extend-type (macrofy 'extend-type sci.impl.protocols/extend-type clojure-core-ns)
      'extend-protocol (macrofy 'extend-protocol sci.impl.protocols/extend-protocol
                                clojure-core-ns true)
      '-reified-methods (new-var '-reified-methods #(types/getMethods %))

src/sci/impl/protocols.cljc

@@ -244,11 +244,8 @@
                   impls))]
     expansion))
 
-(defn extend-type [form _env ctx atype & proto+meths]
-  (let [[ctx atype proto+meths] (if (symbol? ctx)
-                                  [nil ctx (cons atype proto+meths)]
-                                  [ctx atype proto+meths])
-        ctx (or ctx (store/get-ctx))
+(defn extend-type [form _env atype & proto+meths]
+  (let [ctx (store/get-ctx)
         #?@(:cljs [atype (get cljs-type-symbols atype atype)])
         proto+meths (utils/split-when #(not (seq? %)) proto+meths)]
     `(do ~@(map