moved dummy_floc from Disambiguate to DisambiguateTypes, since it is now needed by...

[helm.git] / helm / ocaml / cic_disambiguation / disambiguateTypes.mli

diff --git a/helm/ocaml/cic_disambiguation/disambiguateTypes.mli b/helm/ocaml/cic_disambiguation/disambiguateTypes.mli
index 89d52901532e359ce463d11ecd526c6e29aa3480..df598a3f713f20ded29e8c8ed8dd80f7dd18ba17 100644 (file)
--- a/helm/ocaml/cic_disambiguation/disambiguateTypes.mli
+++ b/helm/ocaml/cic_disambiguation/disambiguateTypes.mli
@@ -29,17 +29,37 @@ 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
 
 type codomain_item =
   string *  (* description *)
-  (environment -> string -> Cic.term list -> Cic.term)
+  (singleton_environment -> string -> Cic.term list -> Cic.term)
     (* environment, literal number, arguments as needed *)
 
-and environment = codomain_item Environment.t
+and environment = codomain_item list Environment.t
+
+and singleton_environment = codomain_item Environment.t
 
 (* a simple case of extension of a disambiguation environment *)
-val env_of_list: (string * string * Cic.term) list -> environment -> environment
+val singleton_env_of_list:
+  (string * string * Cic.term) list -> singleton_environment ->
+    singleton_environment
+
+val env_of_list:
+  (string * string * Cic.term) list -> environment ->
+    environment
 
 module type Callbacks =
   sig
@@ -65,14 +85,16 @@ val string_of_domain: domain_item list -> string
 
 (** {3 type shortands} *)
 
-type term = CicAst.term
-type tactic = (term, string) TacticAst.tactic
-type tactical = (term, string) TacticAst.tactical
+type term = CicNotationPt.term
+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 CicAst.location * string
-type script = CicAst.location * script_entry list
+  | Comment of CicNotationPt.location * string
+type script = CicNotationPt.location * script_entry list
 
 val empty_environment: environment
 
+val dummy_floc: Lexing.position * Lexing.position
+