X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2FdisambiguateTypes.ml;h=c30316769b5cb1ad94dce5a26bc899c197120d8f;hb=f981a524748846acc29b76b6e616af110b4ee13d;hp=358f2d49ec99ea62d790bd0b74daa076b0d891ef;hpb=78a92e3cc2deb60d306da93d9dcf987c1cb219ba;p=helm.git

diff --git a/helm/ocaml/cic_disambiguation/disambiguateTypes.ml b/helm/ocaml/cic_disambiguation/disambiguateTypes.ml
index 358f2d49e..c30316769 100644
--- a/helm/ocaml/cic_disambiguation/disambiguateTypes.ml
+++ b/helm/ocaml/cic_disambiguation/disambiguateTypes.ml
@@ -23,16 +23,20 @@
  * http://helm.cs.unibo.it/
  *)
 
-type term = CicAst.term
-type tactic = (term, string) TacticAst.tactic
-type tactical = (term, string) TacticAst.tactic TacticAst.tactical
-type command = term CommandAst.command
-type script = term CommandAst.Script.script
+type term = CicNotationPt.term
+type tactic = (term, string) GrafiteAst.tactic
+type tactical = (term, 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 *)
+  | Id of string               (* literal *)
+  | Symbol of string * int     (* literal, instance num *)
+  | Num of int                 (* instance num *)
+
+exception Invalid_choice
 
 module OrderedDomain =
   struct
@@ -50,16 +54,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 -> UriManager.uri
+    val input_or_locate_uri:
+      title:string -> ?id:string -> unit -> UriManager.uri
   end
 
 let string_of_domain_item = function
@@ -69,12 +81,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