DXML-75 EndElementEvent enriched with common information

Author: RAMart

src/main/clojure/clojure/data/xml/event.clj

@@ -33,16 +33,12 @@
 ; Represents a parse event.
 (defrecord StartElementEvent [tag attrs nss location-info])
 (defrecord EmptyElementEvent [tag attrs nss location-info])
+(defrecord EndElementEvent [tag nss location-info])
 (defrecord CharsEvent [str])
 (defrecord CDataEvent [str])
 (defrecord CommentEvent [str])
 (defrecord QNameEvent [qn])
 
-;; EndElementEvent doesn't have any data, so make it a singleton
-(deftype EndElementEvent [])
-(def end-element-event (EndElementEvent.))
-(defn ->EndElementEvent [] end-element-event)
-
 ;; Event Generation for stuff to show up in generated xml
 
 (let [second-arg #(do %2)
@@ -52,9 +48,11 @@
                      attrs #((if (seq content)
                                ->StartElementEvent ->EmptyElementEvent)
                              tag %1 (pu/merge-prefix-map (element-nss* element) %2) nil)))
-       :next-events (fn elem-next-events [{:keys [tag content]} next-items]
+       :next-events (fn elem-next-events [{:keys [tag content] :as element} next-items]
                       (if (seq content)
-                        (list* content end-element-event next-items)
+                        (list* content
+                               (->EndElementEvent tag (element-nss* element) nil)
+                               next-items)
                         next-items))}
       string-event-generation {:gen-event (comp ->CharsEvent #'xml-str)
                                :next-events second-arg}
@@ -110,4 +108,4 @@
     :else (throw (ex-info "Illegal argument, not an event object" {:event event}))))
 
 (defn event-exit? [event]
-  (identical? end-element-event event))
+  (instance? EndElementEvent event))

src/main/clojure/clojure/data/xml/jvm/parse.clj

@@ -89,12 +89,17 @@
              (cons (->StartElementEvent tag attrs ns-env location)
                    next-events))
            (recur))
-         XMLStreamConstants/END_ELEMENT
-         (if (include-node? :element)
-           (do (assert (seq ns-envs) "Balanced end")
-               (cons (->EndElementEvent)
-                     (pull-seq sreader opts (rest ns-envs))))
-           (recur))
+        XMLStreamConstants/END_ELEMENT
+        (if (include-node? :element)
+          (do (assert (seq ns-envs) "Balanced end")
+              (let [ns-env (nss-hash sreader (or (first ns-envs) pu/EMPTY))
+                    tag (qname (when namespace-aware (.getNamespaceURI sreader))
+                               (.getLocalName sreader)
+                               (.getPrefix sreader))
+                    next-events (pull-seq sreader opts (rest ns-envs))]
+                (cons (->EndElementEvent tag ns-env location)
+                      next-events)))
+          (recur))
          XMLStreamConstants/CHARACTERS
          (if-let [text (and (include-node? :characters)
                             (not (and skip-whitespace