(* *)
(***********************************************************************)
-(*
- Time-stamp: <Last modified on 2013-04-22 16:42:50 CEST by Kim Nguyen>
-*)
-
type node = {
tag : QName.t;
preorder : int;
type t = {
root : node;
size : int;
+ by_preorder : node array;
(* TODO add other intersting stuff *)
}
"NODE " ^ string_of_int n.preorder)
let debug_node fmt node =
- Format.fprintf fmt "{ tag=%s; preorder=%i; data=%S; first_child=%a; next_sibling=%a; parent=%a }"
+ Format.fprintf fmt
+ "{ tag=%s; preorder=%i; data=%S;\
+first_child=%a; next_sibling=%a; parent=%a }"
(QName.to_string node.tag)
node.preorder
node.data
let debug_ctx fmt ctx =
- Format.fprintf fmt "Current context: { preorder = %i\n; stack = \n%a\n }\n-------------\n"
+ Format.fprintf fmt "Current context: { preorder = %i\n; stack = \n%a\n }\
+\n-------------\n"
ctx.current_preorder
(Pretty.print_list ~sep:";\n" debug_node) ctx.stack
List.iter (do_attribute parser_ ctx) attr_list
and do_attribute parser_ ctx (att, value) =
- let att_tag = QName.to_string (QName.attribute (QName.of_string att)) in
- start_element_handler parser_ ctx att_tag [];
+ start_element_handler parser_ ctx att [];
let n = top ctx in
n.data <- value;
n.kind <- Tree.NodeKind.Attribute;
- end_element_handler parser_ ctx att_tag
+ end_element_handler parser_ ctx att
and consume_closing ctx n =
if n.next_sibling != dummy then
and processing_instruction_handler parser_ ctx tag data =
do_text parser_ ctx;
- let pi = QName.to_string
- (QName.processing_instruction (QName.of_string tag))
- in
- start_element_handler parser_ ctx pi [];
+ start_element_handler parser_ ctx tag [];
let node = top ctx in
node.data <- data;
node.kind <- Tree.NodeKind.ProcessingInstruction;
- end_element_handler parser_ ctx pi
+ end_element_handler parser_ ctx tag
let character_data_handler _parser ctx text =
Expat.final psr;
let root = List.hd ctx.stack in
root.next_sibling <- nil;
+ let a = Array.make ctx.current_preorder nil in
+ let rec loop n =
+ if n != nil then
+ begin
+ a.(n.preorder) <- n;
+ loop n.first_child;
+ loop n.next_sibling;
+ end
+ in
+ loop root;
{ root = root;
- size = ctx.current_preorder
+ size = ctx.current_preorder;
+ by_preorder = a
}
)
Expat.Expat_error e -> error e parser_
let parse_file fd =
- let buffer = String.create 4096 in
+ let buffer = String.make 4096 '\000' in
let parser_, finalize = create_parser () in
let rec loop () =
let read = input fd buffer 0 4096 in
let rec print_attributes ?(sep=true) out tree_ node =
if (node.kind == Tree.NodeKind.Attribute) then
- let tag = QName.to_string (QName.remove_prefix node.tag) in
+ let tag = QName.to_string node.tag in
if sep then output_char out ' ';
output_string out tag;
output_string out "=\"";
output_string out "-->"
| ProcessingInstruction ->
output_string out "<?";
- output_string out (QName.to_string (QName.remove_prefix node.tag));
+ output_string out (QName.to_string node.tag);
output_char out ' ';
output_string out node.data;
output_string out "?>"
let data _ n = n.data
let kind _ n = n.kind
let preorder _ n = n.preorder
-
+let by_preorder t i =
+ if i >= 0 && i < t.size then Array.unsafe_get t.by_preorder i
+ else let e = Invalid_argument "by_preorder" in raise e
let print_node fmt n = Parser.debug_node fmt n