CLJ-1711 - Fix structmap iterator

Signed-off-by: Stuart Halloway <[email protected]>

Author: immoh

src/jvm/clojure/lang/PersistentStructMap.java

@@ -195,9 +195,9 @@ public boolean hasNext(){
         public Object next(){
             if(ks != null)
             {
-                Object ret = ks.first();
+                Object key = ks.first();
                 ks = ks.next();
-                return ret;
+                return entryAt(key);
             }
             else if(extIter != null && extIter.hasNext())
                 return extIter.next();

test/clojure/test_clojure/data_structures.clj

@@ -1261,4 +1261,17 @@
 (defspec seq-and-iter-match-for-vals
          identity
          [^{:tag clojure.test-clojure.data-structures/gen-map} m]
-         (seq-iter-match (vals m) (vals m)))
+         (seq-iter-match (vals m) (vals m)))
+
+(defstruct test-struct :a :b)
+
+(defn gen-struct
+  []
+  (let [s (struct test-struct (gen/int) (gen/int))]
+    (gen/one-of s
+                (assoc s (rand-nth cgen/ednable-scalars) (rand-nth cgen/ednable-scalars)))))
+
+(defspec seq-and-iter-match-for-structs
+         identity
+         [^{:tag clojure.test-clojure.data-structures/gen-struct} s]
+         (seq-iter-match s s))