same for xml_parser

src/markup.ml

@@ -93,12 +93,15 @@ struct
   let parse_xml
       report ?encoding namespace entity context source =
     let with_encoding (encoding : Encoding.t) k =
-      let report' = report [] in
+      let get_opens = ref None in
+      let parse = Xml_parser.parse ~get_opens context namespace report in
+      let report' x =
+        report (match !get_opens with None -> [] | Some f -> f ()) x in
       source
       |> encoding ~report:report'
       |> Input.preprocess Common.is_valid_xml_char report'
       |> Xml_tokenizer.tokenize report' entity
-      |> Xml_parser.parse context namespace report
+      |> parse
       |> k
     in
 
@@ -120,14 +123,15 @@ struct
 
   let parse_html report ?encoding context source =
     let get_opens = ref None in
-    let parse = Html_parser.parse ~get_opens in
-    let report' = report (match !get_opens with None -> [] | Some f -> f ()) in
+    let parse = Html_parser.parse ~get_opens context report in
+    let report' x =
+      report (match !get_opens with None -> [] | Some f -> f ()) x in
     let with_encoding (encoding : Encoding.t) k =
       source
       |> encoding ~report:report'
       |> Input.preprocess Common.is_valid_html_char report'
       |> Html_tokenizer.tokenize report'
-      |> parse context report
+      |> parse
       |> k
     in
 

src/xml_parser.ml

@@ -7,11 +7,13 @@ open Token_tag
 
 let is_whitespace_only strings = List.for_all is_whitespace_only strings
 
-let parse context namespace report tokens =
+let parse ?(get_opens=ref None) context namespace report tokens =
   let open_elements = ref [] in
-  let report =
-    report (List.map (fun (l,name,_,attrs) -> (name,l,attrs)) !open_elements)
+  let opens () =
+    List.map (fun (l,name,_,attrs) -> (name,l,attrs)) !open_elements
   in
+  get_opens := Some opens;
+  let report l error throw k = report (opens ()) l error throw k in
   let namespaces = Namespace.Parsing.init namespace in
   let is_fragment = ref false in
   let fragment_allowed = ref true in

src/xml_parser.mli

@@ -4,6 +4,7 @@
 open Common
 
 val parse :
+  ?get_opens : ((unit -> open_elements) option ref) ->
   [< `Document | `Fragment ] option ->
   (string -> string option) ->
   (open_elements -> Error.parse_handler) ->