* src/clj/cljs/compiler.clj: simpler optimization of keyword invoke

clojure · May 21, 2012 · 17ed473 · 17ed473
1 parent db896b7
commit 17ed473
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/clj/cljs/compiler.clj b/src/clj/cljs/compiler.clj
@@ -689,6 +689,8 @@
                  (not (-> f :info :dynamic))
                  (-> f :info :fn-var))
         js? (= (-> f :info :ns) 'js)
+        keyword? (and (= (-> f :op) :constant)
+                      (keyword? (-> f :form)))
         [f variadic-invoke]
         (if fn?
           (let [info (-> f :info)
@@ -718,6 +720,9 @@
           [f nil])]
     (emit-wrap env
       (cond
+       keyword?
+       (emits "(new cljs.core.Keyword(" f ")).call(" (comma-sep (cons "null" args)) ")")
+
        variadic-invoke
        (let [mfa (:max-fixed-arity variadic-invoke)]
         (emits f "(" (comma-sep (take mfa args))

diff --git a/src/cljs/cljs/core.cljs b/src/cljs/cljs/core.cljs
@@ -1557,6 +1557,15 @@ reduces them without incurring seq initialization"
     ([string f start]
        (ci-reduce string f start))))
 
+(deftype Keyword [k]
+  IFn
+  (invoke [_ coll]
+    (when (coercive-not= coll nil)
+      (let [strobj (.-strobj coll)]
+        (if (nil? strobj)
+          (-lookup coll k nil)
+          (aget strobj k))))))
+
 ;;hrm
 (extend-type js/String
   IFn