added support for multi-aliases in disambiguation environment(s)

[helm.git] / helm / ocaml / cic_disambiguation / disambiguateTypes.ml

diff --git a/helm/ocaml/cic_disambiguation/disambiguateTypes.ml b/helm/ocaml/cic_disambiguation/disambiguateTypes.ml
index 6c530c2bf4813d16bb06da7eb882d4562f0f04ac..bb513aa6cdbc0cba1141fcdc7cc1f9115a024eca 100644 (file)
--- a/helm/ocaml/cic_disambiguation/disambiguateTypes.ml
+++ b/helm/ocaml/cic_disambiguation/disambiguateTypes.ml
@@ -45,17 +45,48 @@ module OrderedDomain =
   end
 
 (* module Domain = Set.Make (OrderedDomain) *)
-module Environment = Map.Make (OrderedDomain)
+module Environment =
+struct
+  module Environment' = Map.Make (OrderedDomain)
+
+  include Environment'
+
+  let cons k v env =
+    try
+      let current = find k env in
+      let dsc, _ = v in
+      add k (v :: (List.filter (fun (dsc', _) -> dsc' <> dsc) current)) env
+    with Not_found ->
+      add k [v] env
+
+  let hd list_env =
+    try
+      map List.hd list_env
+    with Failure _ -> assert false
+
+  let fold_flatten f env base =
+    fold
+      (fun k l acc -> List.fold_right (fun v acc -> f k v acc) l acc)
+      env base
+
+end
 
 type codomain_item =
   string *  (* description *)
-  (environment -> string -> Cic.term list -> Cic.term)
+  (singleton_environment -> string -> Cic.term list -> Cic.term)
     (* environment, literal number, arguments as needed *)
 
-and environment = codomain_item Environment.t
+and environment = codomain_item list Environment.t
+
+and singleton_environment = codomain_item Environment.t
 
 (** adds a (name,uri) list l to a disambiguation environment e **)
 let env_of_list l e = 
+  List.fold_left
+   (fun e (name,descr,t) -> Environment.cons (Id name) (descr,fun _ _ _ -> t) e)
+   e l
+
+let singleton_env_of_list l e = 
   List.fold_left
    (fun e (name,descr,t) -> Environment.add (Id name) (descr,fun _ _ _ -> t) e)
    e l