X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2FdisambiguateTypes.ml;h=64fcdb5a839cc279a9575e52aea72c68bfcdb9b2;hb=12cc5b2b8e7f7bb0b5e315094b008a293a4df6b1;hp=d01f82ee9e25f24a5656dfdb1696c8c9b8332fb9;hpb=978a25d9392e5fc1a19fa37c86339c5d0b67ddd6;p=helm.git

diff --git a/helm/ocaml/cic_disambiguation/disambiguateTypes.ml b/helm/ocaml/cic_disambiguation/disambiguateTypes.ml
index d01f82ee9..64fcdb5a8 100644
--- a/helm/ocaml/cic_disambiguation/disambiguateTypes.ml
+++ b/helm/ocaml/cic_disambiguation/disambiguateTypes.ml
@@ -26,6 +26,8 @@
 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 *)
@@ -48,16 +50,24 @@ 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 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 :
+      title:string -> msg:string -> id:string -> UriManager.uri list ->
+      UriManager.uri list
+    val interactive_interpretation_choice:
       (string * string) list list -> int list
-    val input_or_locate_uri : title:string -> ?id:string -> unit -> UriManager.uri
+    val input_or_locate_uri:
+      title:string -> ?id:string -> unit -> UriManager.uri
   end
 
 let string_of_domain_item = function
@@ -67,12 +77,6 @@ let string_of_domain_item = function
 
 let string_of_domain dom =
   String.concat "; " (List.map string_of_domain_item dom)
-(*
-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
-*)
+
+let empty_environment = Environment.empty