let is_left n = n.next_sibling == dummy
- let start_element_handler parser_ ctx tag attr_list =
+
+ let text_string = QName.to_string QName.text
+ let attr_map_string = QName.to_string QName.attribute_map
+
+ let rec start_element_handler parser_ ctx tag attr_list =
+ do_text parser_ ctx;
let parent = top ctx in
let n = { tag = QName.of_string tag;
preorder = next ctx;
in
if parent.first_child == dummy then parent.first_child <- n
else parent.next_sibling <- n;
- push n ctx
-
- let rec consume_closing ctx n =
+ push n ctx;
+ match attr_list with
+ [] -> ()
+ | _ ->
+ start_element_handler parser_ ctx attr_map_string [];
+ List.iter (do_attribute parser_ ctx) attr_list;
+ end_element_handler parser_ ctx attr_map_string
+
+ and do_attribute parser_ ctx (att, value) =
+ let att_tag = " " ^ att in
+ start_element_handler parser_ ctx att_tag [];
+ start_element_handler parser_ ctx text_string [];
+ let n = top ctx in n.data <- value;
+ end_element_handler parser_ ctx text_string;
+ end_element_handler parser_ ctx att_tag
+
+ and consume_closing ctx n =
if n.next_sibling != dummy then
let _ = pop ctx in consume_closing ctx (top ctx)
-
- let end_element_handler parser_ ctx tag =
+ and end_element_handler parser_ ctx tag =
+ do_text parser_ ctx;
let node = top ctx in
if node.first_child == dummy then node.first_child <- nil
else begin
consume_closing ctx node
end
- let character_data_handler parser_ _ t text =
- Buffer.add_string t text
+ and do_text parser_ ctx =
+ if Buffer.length ctx.text_buffer != 0 then
+ let s = Buffer.contents ctx.text_buffer in
+ Buffer.clear ctx.text_buffer;
+ start_element_handler parser_ ctx text_string [];
+ let node = top ctx in
+ node.data <- s;
+ end_element_handler parser_ ctx text_string
+
+
+
+ let character_data_handler parser_ ctx text =
+ Buffer.add_string ctx.text_buffer text
let create_parser () =
let ctx = { text_buffer = Buffer.create 512;
let parser_ = Expat.parser_create ~encoding:None in
Expat.set_start_element_handler parser_ (start_element_handler parser_ ctx);
Expat.set_end_element_handler parser_ (end_element_handler parser_ ctx);
+ Expat.set_character_data_handler parser_ (character_data_handler parser_ ctx);
push { tag = QName.document;
preorder = next ctx;
data = "";
let load_xml_file = Parser.parse_file
let load_xml_string = Parser.parse_string
+
+let output_escape_string out s =
+ for i = 0 to String.length s - 1 do
+ match s.[i] with
+ | '<' -> output_string out "<"
+ | '>' -> output_string out ">"
+ | '&' -> output_string out "&"
+ | '"' -> output_string out """
+ | '\'' -> output_string out "'"
+ | c -> output_char out c
+ done
+
+let rec print_attributes out tree_ node =
+ if node != nil then begin
+ output_string out (QName.to_string node.tag);
+ output_string out "=\"";
+ output_escape_string out node.first_child.data;
+ output_char out '"';
+ print_attributes out tree_ node.next_sibling
+ end
+
let rec print_xml out tree_ node =
if node != nil then
- let tag = QName.to_string node.tag in
- output_char out '<';
- output_string out tag;
- (* print attributes *)
- if node.first_child == nil then output_string out "/>"
- else begin
- output_char out '>';
- print_xml out tree_ node.first_child;
- output_string out "</";
- output_string out tag;
- output_char out '>'
- end;
+ let () =
+ if node.tag == QName.text then
+ output_escape_string out node.data
+ else
+ let tag = QName.to_string node.tag in
+ output_char out '<';
+ output_string out tag;
+ let fchild =
+ if node.first_child.tag == QName.attribute_map then
+ let () =
+ print_attributes out tree_ node.first_child.first_child
+ in
+ node.first_child.next_sibling
+ else
+ node.first_child
+ in
+ if fchild == nil then output_string out "/>"
+ else begin
+ output_char out '>';
+ print_xml out tree_ fchild;
+ output_string out "</";
+ output_string out tag;
+ output_char out '>'
+ end
+ in
print_xml out tree_ node.next_sibling
-
let root t = t.root
let first_child _ n = n.first_child
let next_sibling _ n = n.next_sibling