Fix for clojure 1.5

Author: bendlas

pom.xml

@@ -65,12 +65,18 @@
              hence enabling usage of .cljc while supporting clojure < 1.7.0 -->
         <groupId>net.bendlas</groupId>
         <artifactId>cljc-maven-plugin</artifactId>
-        <version>0.1.1</version>
+        <version>0.1.2</version>
         <executions>
           <execution>
+            <id>split-compile</id>
             <phase>generate-sources</phase>
             <goals><goal>split</goal></goals>
           </execution>
+          <execution>
+            <id>split-compile-tests</id>
+            <phase>generate-test-sources</phase>
+            <goals><goal>split-tests</goal></goals>
+          </execution>
         </executions>
       </plugin>
       <plugin>

src/main/clojure/clojure/data/xml/node.cljc

@@ -12,10 +12,9 @@
   (:require [clojure.data.xml.name :refer [as-qname]])
   #?(:clj (:import (clojure.lang IHashEq IObj ILookup IKeywordLookup Counted
                                  Associative Seqable IPersistentMap
-                                 APersistentMap RecordIterator RT
-                                 MapEquivalence)
+                                 APersistentMap RT MapEquivalence MapEntry)
                    (java.io Serializable Writer)
-                   (java.util Map))))
+                   (java.util Map Iterator))))
 
 ;; Parsed data format
 ;; Represents a node of an XML tree
@@ -30,6 +29,16 @@
 
 ;; FIXME hash caching cannot be used: http://dev.clojure.org/jira/browse/CLJ-2092
 
+#?
+(:clj
+ (deftype ElementIterator [el ^:volatile-mutable fields]
+   Iterator
+   (hasNext [_] (boolean (seq fields)))
+   (next [_]
+     (let [f (first fields)]
+       (set! fields (next fields))
+       (MapEntry. f (get el f))))))
+
 (deftype Element [tag attrs content meta]
 
   ;; serializing/cloning, hashing, equality, iteration
@@ -41,7 +50,7 @@
     IHashEq
     (hasheq [this] (APersistentMap/mapHasheq this))
     Iterable
-    (iterator [this] (RecordIterator. this [:tag :attrs :content] (RT/iter nil)))]
+    (iterator [this] (ElementIterator. this '(:tag :attrs :content)))]
    :cljs
    [ICloneable
     (-clone [_] (Element. tag attrs content meta))

src/test/clojure/clojure/data/xml/test_equiv.cljc

@@ -8,6 +8,4 @@
     (element :foo) {:tag :foo :attrs {} :content []}
     (element (qname "DAV:" "foo")) {:tag (qname "DAV:" "foo") :attrs {} :content []}
     (element :foo {:a "b"}) {:tag :foo :attrs {:a "b"} :content []}
-    (element :foo {:a "b"} "a" "b") {:tag :foo :attrs {:a "b"} :content ["a" "b"]}
-    #?@(:clj ;; wait for https://github.com/clojure/clojurescript/commit/9484a134bdf039c10ec3c26c8aaa3acd0dcd9875
-        [#xml/element {:tag :foo :content ["C"]} {:tag :foo :attrs {} :content ["C"]}])))
+    (element :foo {:a "b"} "a" "b") {:tag :foo :attrs {:a "b"} :content ["a" "b"]}))