X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2FdisambiguateTypes.mli;h=4d077f2f877f0c79314d2cb7b8884337e7454b05;hb=4167cea65ca58897d1a3dbb81ff95de5074700cc;hp=084ce012287df5d1665871fa68d0817a2a3c445a;hpb=e20f3963028a966fc93ba0d611c4aa8341d20e2c;p=helm.git

diff --git a/helm/ocaml/cic_disambiguation/disambiguateTypes.mli b/helm/ocaml/cic_disambiguation/disambiguateTypes.mli
index 084ce0122..4d077f2f8 100644
--- a/helm/ocaml/cic_disambiguation/disambiguateTypes.mli
+++ b/helm/ocaml/cic_disambiguation/disambiguateTypes.mli
@@ -29,11 +29,19 @@ type domain_item =
  | Num of int                 (* instance num *)
 
 (* module Domain:      Set.S with type elt = domain_item *)
-module Environment: Map.S with type key = domain_item
+module Environment:
+sig
+  include Map.S with type key = domain_item
+  val cons: domain_item -> ('a * 'b) -> ('a * 'b) list t -> ('a * 'b) list t
+  val hd: 'a list t -> 'a t
+
+    (** last alias cons-ed will be processed first *)
+  val fold_flatten: (domain_item -> 'a -> 'b -> 'b) -> 'a list t -> 'b -> 'b
+end
 
   (** to be raised when a choice is invalid due to some given parameter (e.g.
    * wrong number of Cic.term arguments received) *)
-exception Invalid_choice
+exception Invalid_choice of string Lazy.t
 
 type codomain_item =
   string *  (* description *)
@@ -42,8 +50,15 @@ type codomain_item =
 
 and environment = codomain_item Environment.t
 
+type multiple_environment = codomain_item list Environment.t
+
 (* a simple case of extension of a disambiguation environment *)
-val env_of_list: (string * string * Cic.term) list -> environment -> environment
+val env_of_list:
+  (string * string * Cic.term) list -> environment -> environment
+
+val multiple_env_of_list:
+  (string * string * Cic.term) list -> multiple_environment ->
+    multiple_environment
 
 module type Callbacks =
   sig
@@ -70,13 +85,13 @@ val string_of_domain: domain_item list -> string
 (** {3 type shortands} *)
 
 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
 
-val empty_environment: environment
+val dummy_floc: Lexing.position * Lexing.position