X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2FdisambiguateTypes.ml;h=b323f9231972b9dcda2368d2807af5e56f651738;hb=4167cea65ca58897d1a3dbb81ff95de5074700cc;hp=6c530c2bf4813d16bb06da7eb882d4562f0f04ac;hpb=d1126c6b78a3333bbf415daf027004496b77c2f4;p=helm.git

diff --git a/helm/ocaml/cic_disambiguation/disambiguateTypes.ml b/helm/ocaml/cic_disambiguation/disambiguateTypes.ml
index 6c530c2bf..b323f9231 100644
--- a/helm/ocaml/cic_disambiguation/disambiguateTypes.ml
+++ b/helm/ocaml/cic_disambiguation/disambiguateTypes.ml
@@ -36,7 +36,7 @@ type domain_item =
   | Symbol of string * int     (* literal, instance num *)
   | Num of int                 (* instance num *)
 
-exception Invalid_choice
+exception Invalid_choice of string Lazy.t
 
 module OrderedDomain =
   struct
@@ -45,7 +45,31 @@ 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 *)
@@ -54,7 +78,15 @@ type codomain_item =
 
 and environment = codomain_item Environment.t
 
+type multiple_environment = codomain_item list Environment.t
+
+
 (** adds a (name,uri) list l to a disambiguation environment e **)
+let multiple_env_of_list l e = 
+  List.fold_left
+   (fun e (name,descr,t) -> Environment.cons (Id name) (descr,fun _ _ _ -> t) e)
+   e l
+
 let env_of_list l e = 
   List.fold_left
    (fun e (name,descr,t) -> Environment.add (Id name) (descr,fun _ _ _ -> t) e)
@@ -82,5 +114,13 @@ let string_of_domain_item = function
 let string_of_domain dom =
   String.concat "; " (List.map string_of_domain_item dom)
 
-let empty_environment = Environment.empty
+let floc_of_loc (loc_begin, loc_end) =
+  let floc_begin =
+    { Lexing.pos_fname = ""; Lexing.pos_lnum = -1; Lexing.pos_bol = -1;
+      Lexing.pos_cnum = loc_begin }
+  in
+  let floc_end = { floc_begin with Lexing.pos_cnum = loc_end } in
+  (floc_begin, floc_end)
+
+let dummy_floc = floc_of_loc (-1, -1)