Added PersistentHashMap

Author: jolby

src/clj/cljc/compiler.clj

@@ -342,6 +342,17 @@
                      (emit-meta-constant x
                                          (persistent-vector-emit-seq names)))))
 
+(defn- persistent-hash-map-emit-kv-pairs [keys vals]
+  (letfn [(emit-assoc [keys vals]
+            (if (empty? keys)
+              (emits "VAR_NAME (cljc_DOT_core_DOT_PersistentHashMap_SLASH_EMPTY)")
+              (do
+                (emits "FUNCALL3 ((closure_t*)VAR_NAME (cljc_DOT_core_SLASH__assoc), ")
+                (emit-assoc (next keys)(next vals))
+                (emits ", " (first keys))
+                (emits ", " (first vals) ")"))))]
+    (emit-assoc (reverse keys) (reverse vals))))
+
 (defmethod emit-constant clojure.lang.IPersistentMap [x]
   (FIXME-IMPLEMENT))
 
@@ -402,7 +413,10 @@
 
 (defmethod emit :map
   [{:keys [env simple-keys? keys vals]}]
-  (FIXME-IMPLEMENT))
+  (let [keys (doall (map emit keys))
+        vals (doall (map emit vals))]
+    (emit-value-wrap :map env
+                     (emits (persistent-hash-map-emit-kv-pairs keys vals)))))
 
 (defmethod emit :vector
   [{:keys [items env]}]

src/clj/cljc/core.clj

@@ -305,6 +305,22 @@
   ;; FIXME: see bit-clear
   (list 'c* "make_integer (integer_get (~{}) | (1ul << integer_get (~{})))" x n))
 
+;; internal
+(defmacro mask [hash shift]
+  (list 'c* "make_integer (((integer_get (~{}) >> integer_get (~{})) & 0x01f)) " hash shift))
+
+;; internal
+(defmacro bitpos [hash shift]
+  (list 'c* "make_integer ((1 << integer_get (~{})))" `(mask ~hash ~shift)))
+
+;;internal
+(defmacro bit-count [num]
+  (list 'c* "make_integer (__builtin_popcountll(integer_get (~{})))" num))
+
+;;internal
+(defmacro bit-index [bitmap bitpos]
+  (list 'c* "make_integer (__builtin_popcountll(integer_get (~{}) & (integer_get (~{}) - 1)))" bitmap bitpos))
+
 ;; internal
 (defmacro caching-hash [coll hash-fn hash-key]
   `(let [h# ~hash-key]