X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2FdisambiguateTypes.ml;h=4a2e43a205dc88b25c6be961955246ca19dd5050;hb=a7063fc0997a9d9eae6c329443e67ab92c4b6a0f;hp=3e969c87a16e92d6e8dff37d318d31c9f8f6282b;hpb=205b08e72f245d4ba210127cf58b1e4b96d5f93a;p=helm.git

diff --git a/helm/ocaml/cic_disambiguation/disambiguateTypes.ml b/helm/ocaml/cic_disambiguation/disambiguateTypes.ml
index 3e969c87a..4a2e43a20 100644
--- a/helm/ocaml/cic_disambiguation/disambiguateTypes.ml
+++ b/helm/ocaml/cic_disambiguation/disambiguateTypes.ml
@@ -23,6 +23,9 @@
  * http://helm.cs.unibo.it/
  *)
 
+(* $Id$ *)
+
+(*
 type term = CicNotationPt.term
 type tactic = (term, term, GrafiteAst.reduction, string) GrafiteAst.tactic
 type tactical = (term, term, GrafiteAst.reduction, string) GrafiteAst.tactical
@@ -30,13 +33,14 @@ 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
@@ -73,20 +77,21 @@ end
 
 type codomain_item =
   string *  (* description *)
-  (singleton_environment -> string -> Cic.term list -> Cic.term)
+  (environment -> string -> Cic.term list -> Cic.term)
     (* environment, literal number, arguments as needed *)
 
-and environment = codomain_item list Environment.t
+and environment = codomain_item Environment.t
+
+type multiple_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 = 
+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 singleton_env_of_list l e = 
+let env_of_list l e = 
   List.fold_left
    (fun e (name,descr,t) -> Environment.add (Id name) (descr,fun _ _ _ -> t) e)
    e l
@@ -112,16 +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
-
-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)
-