let debug = false
let debug_print s =
- if debug then prerr_endline ("Helm_registry debugging: " ^ s)
+ if debug then prerr_endline ("Helm_registry debugging: " ^ (Lazy.force s))
(** <helpers> *)
exception Cyclic_definition of string
exception Type_error of string (* expected type, value, msg *)
exception Parse_error of string * int * int * string (* file, line, col, msg *)
-exception Invalid_value of (string * string) * string (* key, value, descr *)
(* root XML tag: used by save_to, ignored by load_from *)
let root_tag = "helm_registry"
raise (Malformed_key key)
let set' registry ~key ~value =
- debug_print (sprintf "Setting %s = %s" key value);
+ debug_print (lazy (sprintf "Setting %s = %s" key value));
key_is_valid key;
Hashtbl.add registry key value
List.map unmarshaller (get registry key)
with Key_not_found _ -> []
+let get_pair registry fst_unmarshaller snd_unmarshaller key =
+ let v = singleton (get registry key) in
+ match Str.split spaces_rex v with
+ | [fst; snd] -> fst_unmarshaller fst, snd_unmarshaller snd
+ | _ -> raise (Type_error "not a pair")
+
let set_list registry marshaller ~key ~value =
List.iter (fun v -> set registry ~key ~value:(marshaller v)) value
| _ -> assert false
in
Hashtbl.fold
- (fun k v tree -> add_key ("helm_registry" :: (Str.split dot_RE k)) v tree)
+ (fun k v tree -> add_key ((Str.split dot_RE k)) v tree)
registry
- (Element ("helm_registry", [], []))
+ (Element (root_tag, [], []))
let rec stream_of_xml_tree = function
| Cdata s -> Xml.xml_cdata s
Xml.pp_to_outchan token_stream oc;
close_out oc
-let load_from_absolute registry fname =
- let path = ref [] in (* <section> elements entered so far *)
+let rec load_from_absolute ?path registry fname =
+ let _path = ref (match path with None -> [] | Some p -> p)in
+ (* <section> elements entered so far *)
let in_key = ref false in (* have we entered a <key> element? *)
let cdata = ref "" in (* collected cdata (inside <key> *)
- let push_path name = path := name :: !path in
- let pop_path () = path := List.tl !path in
+ let push_path name = _path := name :: !_path in
+ let pop_path () = _path := List.tl !_path in
let start_element tag attrs =
match tag, attrs with
| "section", ["name", name] -> push_path name
| "key", ["name", name] -> in_key := true; push_path name
| "helm_registry", _ -> ()
+ | "include", ["href", fname] ->
+ debug_print (lazy ("including file " ^ fname));
+ load_from_absolute ~path:!_path registry fname
| tag, _ ->
raise (Parse_error (fname, ~-1, ~-1,
(sprintf "unexpected element <%s> or wrong attribute set" tag)))
match tag with
| "section" -> pop_path ()
| "key" ->
- let key = String.concat "." (List.rev !path) in
+ let key = String.concat "." (List.rev !_path) in
set registry ~key ~value:!cdata;
cdata := "";
in_key := false;
pop_path ()
- | "helm_registry" -> ()
+ | "include" | "helm_registry" -> ()
| _ -> assert false
in
let character_data text =
} in
let xml_parser = XmlPushParser.create_parser callbacks in
let backup = backup_registry registry in
- Hashtbl.clear registry;
+ if path = None then Hashtbl.clear registry;
try
XmlPushParser.parse xml_parser (`File fname)
with exn ->
let get_opt unmarshaller = get_opt default_registry unmarshaller
let get_opt_default unmarshaller = get_opt_default default_registry unmarshaller
let get_list unmarshaller = get_list default_registry unmarshaller
+let get_pair unmarshaller = get_pair default_registry unmarshaller
let set_typed marshaller = set_typed default_registry marshaller
let set_opt unmarshaller = set_opt default_registry unmarshaller
let set_list marshaller = set_list default_registry marshaller