fix direct method invoke macro, update mutable ns

Author: dnolen

bench/mut_perf.js

@@ -1,5 +1,6 @@
 // lein cljsbuild once release
-// d8 node_modules/immutable/dist/immutable.min.js mori.bare.js ./bench/mut_perf.js
+// d8 mori.base.js mori.mutable.js mori.extra.js ./bench/mut_perf.js
+// d8 node_modules/immutable/dist/immutable.min.js mori.bare.js mori.mutable.js ./bench/mut_perf.js
 // jsc node_modules/immutable/dist/immutable.min.js mori.bare.js ./bench/mut_perf.js
 
 ;(function() {
@@ -47,15 +48,15 @@
     runs = [];
     for(var j = 0; j < 10; j++) {
         s = new Date();
-        var mv = m.mutable.thaw(m.vector());
+        var mv = m._thaw(m.vector());
         for(var i = 0; i < 1000000; i++) {
             if(i % 32 === 0) {
-                mv = m.mutable.conj.f2(mv, Math.random());
+                mv = m._conj.f2(mv, Math.random());
             } else {
-                mv = m.mutable.conj.f2(mv, i);
+                mv = m._conj.f2(mv, i);
             }
         }
-        var v = m.mutable.freeze(mv);
+        var v = m._freeze(mv);
         var el = (new Date())-s;
         runs.push(el);
         print("Mutable vector conj " + m.count(v) + " items " + el + " " + m.reduce(sum,0,v));

src/mori/macros.clj

@@ -1,6 +1,7 @@
 (ns mori.macros
   (:require [cljs.compiler :as comp]
             [cljs.analyzer :as ana]
+            [cljs.util :as util]
             [cljs.analyzer.api :as ana-api]))
 
 (alias 'core 'clojure.core)
@@ -12,28 +13,22 @@
          (.toString coll#)))))
 
 (defmacro make-inspectable [& xs]
-  `(do
-     ~@(map make-inspectable-1 xs)))
+  `(do ~@(map make-inspectable-1 xs)))
 
 (defmacro mori-export [exportf coref]
-  (let [{:keys [ns name methods]} (ana-api/resolve &env coref)]
-    `(do
-       (js/goog.exportSymbol ~(str "mori." (core/name exportf)) ~coref) ~(list 'js* ";")
-       ~@(when-not (= 1 (count methods))
-           (map
-             (fn [{:keys [variadic max-fixed-arity]}]
-               (if variadic
-                 `(do
-                    (js/goog.exportSymbol
-                      ~(str "mori." (core/name exportf) ".fn")
-                      ~(symbol (str ns) (str (core/name name) ".cljs$core$IFn$_invoke$variadic")))
-                    ~(list 'js* ";"))
-                 `(do
-                    (js/goog.exportSymbol
-                     ~(str "mori." (core/name exportf) ".f" max-fixed-arity)
-                     ~(symbol (str ns) (str (core/name name) ".cljs$core$IFn$_invoke$arity$" max-fixed-arity)))
-                    ~(list 'js* ";"))))
-             methods)))))
+  (let [{:keys [ns name arglists]} (ana-api/resolve &env coref)
+        arglists (cond-> arglists
+                   (= (first arglists) 'quote) rest)]
+    (letfn [(export-method [arglist]
+              (let [c (count arglist)]
+                `(js/goog.exportSymbol
+                   ~(str "mori." (core/name exportf) ".f" c)
+                   ~(symbol (str ns)
+                      (str (core/name name) ".cljs$core$IFn$_invoke$arity$" c)))))]
+      `(do
+         (js/goog.exportSymbol ~(str "mori." (core/name exportf)) ~coref) ~(list 'js* ";")
+         ~@(when (< 1 (count arglists))
+             (map export-method (remove #(some '#{&} %) arglists)))))))
 
 (comment
 

src/mori/mutable.cljs

@@ -3,11 +3,11 @@
     [transient persistent! conj assoc dissoc pop disj])
   (:require-macros [mori.macros :refer [mori-export]]))
 
-(mori-export thaw cljs.core/transient)
-(mori-export freeze cljs.core/persistent!)
-(mori-export conj cljs.core/conj!)
-(mori-export assoc cljs.core/assoc!)
-(mori-export dissoc cljs.core/dissoc!)
-(mori-export pop cljs.core/pop!)
-(mori-export disj cljs.core/disj!)
+(mori-export _thaw cljs.core/transient)
+(mori-export _freeze cljs.core/persistent!)
+(mori-export _conj cljs.core/conj!)
+(mori-export _assoc cljs.core/assoc!)
+(mori-export _dissoc cljs.core/dissoc!)
+(mori-export _pop cljs.core/pop!)
+(mori-export _disj cljs.core/disj!)