X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2FdisambiguateTypes.ml;h=4a2e43a205dc88b25c6be961955246ca19dd5050;hb=489ee5290cce2247291b8c5c53b98d493e7f6b99;hp=c30316769b5cb1ad94dce5a26bc899c197120d8f;hpb=e20f3963028a966fc93ba0d611c4aa8341d20e2c;p=helm.git

diff --git a/helm/ocaml/cic_disambiguation/disambiguateTypes.ml b/helm/ocaml/cic_disambiguation/disambiguateTypes.ml
index c30316769..4a2e43a20 100644
--- a/helm/ocaml/cic_disambiguation/disambiguateTypes.ml
+++ b/helm/ocaml/cic_disambiguation/disambiguateTypes.ml
@@ -23,20 +23,24 @@
  * http://helm.cs.unibo.it/
  *)
 
+(* $Id$ *)
+
+(*
 type term = CicNotationPt.term
-type tactic = (term, string) GrafiteAst.tactic
-type tactical = (term, string) GrafiteAst.tactical
+type tactic = (term, term, GrafiteAst.reduction, string) GrafiteAst.tactic
+type tactical = (term, term, GrafiteAst.reduction, string) GrafiteAst.tactical
 type script_entry =
   | Command of tactical
   | Comment of CicNotationPt.location * string
 type script = CicNotationPt.location * script_entry list
+*)
 
 type domain_item =
   | Id of string               (* literal *)
   | 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 +49,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 +82,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)
@@ -81,6 +117,3 @@ 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
-