- before core fns knew about the ObjMap key rep - now it needs to be an internal detail

- testing stuff wip

Author: swannodette

resources/lite_test.edn

@@ -0,0 +1,10 @@
+{:optimizations :advanced
+ :main lite-test-runner
+ :output-to "builds/out-lite/lite-test.js"
+ :output-dir "builds/out-lite"
+ :output-wrapper true
+ :verbose true
+ :compiler-stats true
+ :parallel-build true
+ :closure-warnings {:non-standard-jsdoc :off :global-this :off}
+ :language-out :es5}

src/main/cljs/cljs/core.cljs

@@ -12371,9 +12371,9 @@ reduces them without incurring seq initialization"
   (let [a (hash a)
         b (hash b)]
     (cond
-     (< a b) -1
-     (> a b) 1
-     :else 0)))
+      (< a b) -1
+      (> a b) 1
+      :else 0)))
 
 (defn- obj-clone [obj ks]
   (let [new-obj (js-obj)
@@ -12387,6 +12387,10 @@ reduces them without incurring seq initialization"
 
 (declare simple-hash-map)
 
+(defn- keyword->obj-map-key
+  [k]
+  (str "\uFDD0" "'" (. k -fqn)))
+
 (deftype ObjMap [meta keys strobj ^:mutable __hash]
   IWithMeta
   (-with-meta [coll meta] (ObjMap. meta keys strobj __hash))
@@ -12422,41 +12426,45 @@ reduces them without incurring seq initialization"
   ILookup
   (-lookup [coll k] (-lookup coll k nil))
   (-lookup [coll k not-found]
-    (if (and (string? k)
-             (not (nil? (scan-array 1 k keys))))
-      (unchecked-get strobj k)
-      not-found))
+    (let [k (if-not (keyword? k) k (keyword->obj-map-key k))]
+      (if (and (string? k)
+               (not (nil? (scan-array 1 k keys))))
+        (unchecked-get strobj k)
+        not-found)))
 
   IAssociative
   (-assoc [coll k v]
-    (if (string? k)
-      (if-not (nil? (scan-array 1 k keys))
-        (let [new-strobj (obj-clone strobj keys)]
-          (gobject/set new-strobj k v)
-          (ObjMap. meta keys new-strobj nil)) ;overwrite
-        (let [new-strobj (obj-clone strobj keys) ; append
-              new-keys (aclone keys)]
-          (gobject/set new-strobj k v)
-          (.push new-keys k)
-          (ObjMap. meta new-keys new-strobj nil)))
-      ; non-string key. game over.
-      (-with-meta
-        (-kv-reduce coll
-          (fn [ret k v]
-            (-assoc ret k v))
-          (. HashMap -EMPTY) )
-         meta)))
+    (let [k (if-not (keyword? k) k (keyword->obj-map-key k))]
+      (if (string? k)
+        (if-not (nil? (scan-array 1 k keys))
+          (let [new-strobj (obj-clone strobj keys)]
+            (gobject/set new-strobj k v)
+            (ObjMap. meta keys new-strobj nil))             ;overwrite
+          (let [new-strobj (obj-clone strobj keys)          ; append
+                new-keys (aclone keys)]
+            (gobject/set new-strobj k v)
+            (.push new-keys k)
+            (ObjMap. meta new-keys new-strobj nil)))
+        ; non-string key. game over.
+        (-with-meta
+          (-kv-reduce coll
+            (fn [ret k v]
+              (-assoc ret k v))
+            (. HashMap -EMPTY))
+          meta))))
   (-contains-key? [coll k]
-    (if (and (string? k)
-             (not (nil? (scan-array 1 k keys))))
-      true
-      false))
+    (let [k (if-not (keyword? k) k (keyword->obj-map-key k))]
+      (if (and (string? k)
+               (not (nil? (scan-array 1 k keys))))
+        true
+        false)))
 
   IFind
   (-find [coll k]
-    (when (and (string? k)
-               (not (nil? (scan-array 1 k keys))))
-      (MapEntry. k (unchecked-get strobj k) nil)))
+    (let [k (if-not (keyword? k) k (keyword->obj-map-key k))]
+      (when (and (string? k)
+                 (not (nil? (scan-array 1 k keys))))
+        (MapEntry. k (unchecked-get strobj k) nil))))
 
   IKVReduce
   (-kv-reduce [coll f init]
@@ -12473,14 +12481,15 @@ reduces them without incurring seq initialization"
 
   IMap
   (-dissoc [coll k]
-    (if (and (string? k)
-             (not (nil? (scan-array 1 k keys))))
-      (let [new-keys (aclone keys)
-            new-strobj (obj-clone strobj keys)]
-        (.splice new-keys (scan-array 1 k new-keys) 1)
-        (js-delete new-strobj k)
-        (ObjMap. meta new-keys new-strobj nil))
-      coll)) ; key not found, return coll unchanged
+    (let [k (if-not (keyword? k) k (keyword->obj-map-key k))]
+      (if (and (string? k)
+            (not (nil? (scan-array 1 k keys))))
+        (let [new-keys (aclone keys)
+              new-strobj (obj-clone strobj keys)]
+          (.splice new-keys (scan-array 1 k new-keys) 1)
+          (js-delete new-strobj k)
+          (ObjMap. meta new-keys new-strobj nil))
+        coll))) ; key not found, return coll unchanged
 
   IFn
   (-invoke [coll k]

src/test/cljs/cljs/lite_collections_test.cljs

@@ -0,0 +1,11 @@
+;   Copyright (c) Rich Hickey. All rights reserved.
+;   The use and distribution terms for this software are covered by the
+;   Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;   which can be found in the file epl-v10.html at the root of this distribution.
+;   By using this software in any fashion, you are agreeing to be bound by
+;   the terms of this license.
+;   You must not remove this notice, or any other, from this software.
+
+(ns cljs.lite-collections-test
+  (:require [cljs.test :refer-macros [deftest testing is are run-tests]]
+            [clojure.test.check.clojure-test :refer-macros [defspec]]))

src/test/cljs/lite_test_runner.cljs

@@ -0,0 +1,21 @@
+;; Copyright (c) Rich Hickey. All rights reserved.
+;; The use and distribution terms for this software are covered by the
+;; Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;; which can be found in the file epl-v10.html at the root of this distribution.
+;; By using this software in any fashion, you are agreeing to be bound by
+;; the terms of this license.
+;; You must not remove this notice, or any other, from this software.
+
+(ns lite-test-runner
+  (:require [cljs.lite-collections-test]))
+
+(set! *print-newline* false)
+
+;; When testing Windows we default to Node.js
+(if (exists? js/print)
+  (set-print-fn! js/print)
+  (enable-console-print!))
+
+(run-tests
+  'cljs.collections-test
+  )