CLJS-1569: IndexedSeq doesn't implement IWithMeta / IMeta

Author: anmonteiro

src/main/cljs/cljs/core.cljs

@@ -1087,11 +1087,11 @@
 
       (array? coll)
       (when-not (zero? (alength coll))
-        (IndexedSeq. coll 0))
+        (IndexedSeq. coll 0 nil))
 
       (string? coll)
       (when-not (zero? (alength coll))
-        (IndexedSeq. coll 0))
+        (IndexedSeq. coll 0 nil))
 
       (native-satisfies? ISeqable coll)
       (-seq coll)
@@ -1424,7 +1424,7 @@ reduces them without incurring seq initialization"
       (set! i (inc i))
       ret)))
 
-(deftype IndexedSeq [arr i]
+(deftype IndexedSeq [arr i meta]
   Object
   (toString [coll]
    (pr-str* coll))
@@ -1440,23 +1440,29 @@ reduces them without incurring seq initialization"
     (-lastIndexOf coll x start))
 
   ICloneable
-  (-clone [_] (IndexedSeq. arr i))
+  (-clone [_] (IndexedSeq. arr i meta))
 
   ISeqable
   (-seq [this]
     (when (< i (alength arr))
       this))
 
+  IMeta
+  (-meta [coll] meta)
+  IWithMeta
+  (-with-meta [coll new-meta]
+    (IndexedSeq. arr i new-meta))
+
   ASeq
   ISeq
   (-first [_] (aget arr i))
   (-rest [_] (if (< (inc i) (alength arr))
-               (IndexedSeq. arr (inc i))
+               (IndexedSeq. arr (inc i) nil)
                (list)))
 
   INext
   (-next [_] (if (< (inc i) (alength arr))
-               (IndexedSeq. arr (inc i))
+               (IndexedSeq. arr (inc i) nil)
                nil))
 
   ICounted
@@ -1511,7 +1517,7 @@ reduces them without incurring seq initialization"
      (prim-seq prim 0))
   ([prim i]
      (when (< i (alength prim))
-       (IndexedSeq. prim i))))
+       (IndexedSeq. prim i nil))))
 
 (defn array-seq
   "Create a seq from a JavaScript array."
@@ -4935,7 +4941,7 @@ reduces them without incurring seq initialization"
   (-seq [coll]
     (cond
       (zero? cnt) nil
-      (<= cnt 32) (IndexedSeq. tail 0)
+      (<= cnt 32) (IndexedSeq. tail 0 nil)
       :else (chunked-seq coll (first-array-for-longvec coll) 0 0)))
 
   ICounted

src/main/clojure/cljs/core.cljc

@@ -2735,7 +2735,7 @@
                (copy-arguments args#)
                (let [argseq# (when (< ~c-1 (alength args#))
                                (new ^::ana/no-resolve cljs.core/IndexedSeq
-                                 (.slice args# ~c-1) 0))]
+                                 (.slice args# ~c-1) 0 nil))]
                  (. ~rname
                    (~'cljs$core$IFn$_invoke$arity$variadic ~@(dest-args c-1) argseq#))))))
          ~(variadic-fn* rname method)))))
@@ -2792,7 +2792,7 @@
                 ~@(mapcat #(fixed-arity rname %) sigs)
                 ~(if variadic
                    `(let [argseq# (new ^::ana/no-resolve cljs.core/IndexedSeq
-                                    (.slice ~args-sym ~maxfa) 0)]
+                                    (.slice ~args-sym ~maxfa) 0 nil)]
                       (. ~rname
                         (~'cljs$core$IFn$_invoke$arity$variadic
                           ~@(dest-args maxfa)

src/test/cljs/cljs/core_test.cljs

@@ -3037,8 +3037,8 @@
   ([x0 & xs] [x0 xs]))
 
 (deftest test-cljs-1284
-  (let [xs (IndexedSeq. #js [] 0)
-        ys (IndexedSeq. #js [1] 3)]
+  (let [xs (IndexedSeq. #js [] 0 nil)
+        ys (IndexedSeq. #js [1] 3 nil)]
     (is (nil? (first xs)))
     (is (nil? (seq xs)))
     (is (= (rest xs) ()))
@@ -3106,6 +3106,10 @@
     (is (not (== (hash x0) (hash x1) (hash x2) (hash x3) (hash x4)
                  (hash x5) (hash x6) (hash x7))))))
 
+(deftest test-cljs-1569
+  (is (= (meta (with-meta (seq [1 2 3]) {:a 1})) {:a 1})))
+
+
 (comment
   ;; ObjMap
   ;; (let [ks (map (partial str "foo") (range 500))