- let local_params = ref [] in (* association list <key, parameters> *)
- let global_params = ref [] in (* association list <name, value> *)
- let properties = ref [] in (* association list <name, value> *)
- let get_style_param key name =
- let params = (* try local params and fallback on global params *)
- try List.assoc key !local_params with Not_found -> global_params
- in
- List.assoc name !params (* may raise Not_found *)
- in
- let get_property name = List.assoc name !properties in
- let is_global_param x = Pcre.pmatch ~pat:"^param(\\.[^.]+){1}" x in
- let is_local_param x = Pcre.pmatch ~pat:"^param(\\.[^.]+){2}" x in
- let is_property x = Pcre.pmatch ~pat:"^prop\\.[^.]+" x in
- let add_global_param name value =
- let name = Pcre.replace ~pat:"^param\\." name in
- global_params := (name, value) :: !global_params
- in
- let add_local_param name value =
- let pieces = Pcre.extract ~pat:"^param\\.([^.]+)\\.(.*)" name in
- let (key, param) = (pieces.(1), pieces.(2)) in
- (try
- let previous_params = List.assoc key !local_params in
- let new_params = (param, value) :: previous_params in
- local_params := new_params :: (List.remove_assoc key !local_params)
- with Not_found -> (* first local parameter for 'key' *)
- local_params := [(param, value)] :: !local_params)
- in
- let add_property name value =
- properties :=
- (Pcre.replace ~pat:"^prop\\." name, value) :: !properties
+ let is_global_param x = Pcre.pmatch ~pat:"^param(\\.[^.]+){1}$" x in
+ let is_local_param x = Pcre.pmatch ~pat:"^param(\\.[^.]+){2}$" x in
+ let is_property x = Pcre.pmatch ~pat:"^prop\\.[^.]+$" x in
+ let (params, props) =
+ List.fold_left
+ (fun (old_params, old_properties) (name, value) ->
+ match name with
+ | name when is_global_param name ->
+ let name = Pcre.replace ~pat:"^param\\." name in
+ ((fun x -> (old_params x) @ [name, value]),
+ old_properties)
+ | name when is_local_param name ->
+ let pieces = Pcre.extract ~pat:"^param\\.([^.]+)\\.(.*)" name in
+ let (key, name) = (pieces.(1), pieces.(2)) in
+ ((function
+ | x when x = key -> [name, value] @ (old_params x)
+ | x -> old_params x),
+ old_properties)
+ | name when is_property name ->
+ let name = Pcre.replace ~pat:"^prop\\." name in
+ (old_params, ((name, value) :: old_properties))
+ | _ -> (old_params, old_properties))
+ ((fun _ -> []), []) (* no parameters, no properties *)
+ req#params