- remove straggling ObjMap stuff

- cleanup ObjMap tests, either comment out, or remove things which will no longer be relevant (promotion to PHM)

Author: swannodette

src/main/cljs/cljs/core.cljs

@@ -9034,19 +9034,6 @@ reduces them without incurring seq initialization"
     (.createAsIfByAssoc PersistentArrayMap (to-array s))
     (if (seq s) (first s) (.-EMPTY PersistentArrayMap))))
 
-(defn obj-map
-  "keyval => key val
-  Returns a new object map with supplied mappings."
-  [& keyvals]
-  (let [ks  (array)
-        obj (js-obj)]
-    (loop [kvs (seq keyvals)]
-      (if kvs
-        (do (.push ks (first kvs))
-            (gobject/set obj (first kvs) (second kvs))
-            (recur (nnext kvs)))
-        (.fromObject ObjMap ks obj)))))
-
 (defn sorted-map
   "keyval => key val
   Returns a new sorted map with supplied mappings."
@@ -10698,10 +10685,6 @@ reduces them without incurring seq initialization"
   MapEntry
   (-pr-writer [coll writer opts] (pr-sequential-writer writer pr-writer "[" " " "]" opts coll))
 
-  ObjMap
-  (-pr-writer [coll writer opts]
-    (print-map coll pr-writer writer opts))
-
   KeySeq
   (-pr-writer [coll writer opts] (pr-sequential-writer writer pr-writer "(" " " ")" opts coll))
 

src/test/cljs/cljs/collections_test.cljs

@@ -21,8 +21,8 @@
     (is (= {:a :b} (get {[1 2 3] {:a :b}, 4 5} [1 2 3])))
     (is (not (= {:a :b :c nil} {:a :b :d nil})))
     (is (= {:a :b} (dissoc {:a :b :c :d} :c)))
-    (is (= (hash-map :foo 5)
-          (assoc (cljs.core.ObjMap. nil (array) (js-obj)) :foo 5))))
+    #_(is (= (hash-map :foo 5)
+           (assoc (ObjMap. nil (array) (js-obj)) :foo 5))))
   (testing "Testing assoc dissoc"
     (is (= {1 2 3 4} (assoc {} 1 2 3 4)))
     (is (= {1 2} (assoc {} 1 2)))
@@ -879,12 +879,6 @@
 
 (deftest test-461
   ;; CLJS-461: automatic map conversions
-  (loop [i 0 m (with-meta {} {:foo :bar}) result []]
-    (if (<= i (+ cljs.core.ObjMap.HASHMAP_THRESHOLD 2))
-      (recur (inc i) (assoc m (str i) i) (conj result (meta m)))
-      (let [n (inc (+ cljs.core.ObjMap.HASHMAP_THRESHOLD 2))
-            expected (repeat n {:foo :bar})]
-        (is (= result expected)))))
   (loop [i 0 m (with-meta {-1 :quux} {:foo :bar}) result []]
     (if (<= i (+ cljs.core.PersistentArrayMap.HASHMAP_THRESHOLD 2))
       (recur (inc i) (assoc m i i) (conj result (meta m)))

src/test/cljs/cljs/core_test.cljs

@@ -196,9 +196,9 @@
     (is (= #{:cljs.core-test/rect :cljs.core-test/square} (descendants ::shape)))
     (is (true? (isa? 42 42)))
     (is (true? (isa? ::square ::shape)))
-    (derive cljs.core.ObjMap ::collection)
+    ;(derive ObjMap ::collection)
     (derive cljs.core.PersistentHashSet ::collection)
-    (is (true? (isa? cljs.core.ObjMap ::collection)))
+    ;(is (true? (isa? ObjMap ::collection)))
     (is (true? (isa? cljs.core.PersistentHashSet ::collection)))
     (is (false? (isa? cljs.core.IndexedSeq ::collection)))
     ;; ?? (isa? String Object)