X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2FdisambiguateTypes.ml;h=078297a26e966739f12eac162de6cc0b49a5525b;hb=8aaf525856e25bcd8f355e505fd00f45c62bc18f;hp=545099da1ee362c73cf348ed4ee40df41d8f0f6b;hpb=6459acbd4bb69475cfaa0b37a9771ced94193667;p=helm.git

diff --git a/helm/ocaml/cic_disambiguation/disambiguateTypes.ml b/helm/ocaml/cic_disambiguation/disambiguateTypes.ml
index 545099da1..078297a26 100644
--- a/helm/ocaml/cic_disambiguation/disambiguateTypes.ml
+++ b/helm/ocaml/cic_disambiguation/disambiguateTypes.ml
@@ -1,3 +1,33 @@
+(* Copyright (C) 2004, HELM Team.
+ * 
+ * This file is part of HELM, an Hypertextual, Electronic
+ * Library of Mathematics, developed at the Computer Science
+ * Department, University of Bologna, Italy.
+ * 
+ * HELM is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * HELM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HELM; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA  02111-1307, USA.
+ * 
+ * For details, see the HELM World-Wide-Web page,
+ * http://helm.cs.unibo.it/
+ *)
+
+type term = CicAst.term
+type tactic = (term, string) TacticAst.tactic
+type tactical = (term, string) TacticAst.tactical
+type script_entry = Command of tactical | Comment of CicAst.location * string
+type script = CicAst.location * script_entry list
 
 type domain_item =
  | Id of string               (* literal *)
@@ -10,7 +40,7 @@ module OrderedDomain =
     let compare = Pervasives.compare
   end
 
-module Domain = Set.Make (OrderedDomain)
+(* module Domain = Set.Make (OrderedDomain) *)
 module Environment = Map.Make (OrderedDomain)
 
 type codomain_item =
@@ -20,17 +50,23 @@ type codomain_item =
 
 and 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.add (Id name) (descr,fun _ _ _ -> t) e)
+   e l
+
 module type Callbacks =
   sig
-    val output_html : ?append_NL:bool -> Ui_logger.html_msg -> unit
-    val interactive_user_uri_choice :
+    val interactive_user_uri_choice:
       selection_mode:[`SINGLE | `MULTIPLE] ->
       ?ok:string ->
       ?enable_button_for_non_vars:bool ->
       title:string -> msg:string -> id:string -> string list -> string list
-    val interactive_interpretation_choice :
-      (string * string) list list -> int
-    val input_or_locate_uri : title:string -> UriManager.uri
+    val interactive_interpretation_choice:
+      (string * string) list list -> int list
+    val input_or_locate_uri:
+      title:string -> ?id:string -> unit -> UriManager.uri
   end
 
 let string_of_domain_item = function
@@ -39,9 +75,7 @@ let string_of_domain_item = function
   | Num i -> Printf.sprintf "NUM(instance %d)" i
 
 let string_of_domain dom =
-  let buf = Buffer.create 1024 in
-  Domain.iter
-    (fun item -> Buffer.add_string buf (string_of_domain_item item ^ "; "))
-    dom;
-  Buffer.contents buf
+  String.concat "; " (List.map string_of_domain_item dom)
+
+let empty_environment = Environment.empty