merged cic_notation with disambiguation: good luck!

[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..084ce012287df5d1665871fa68d0817a2a3c445a 100644 (file)
--- a/helm/ocaml/cic_disambiguation/disambiguateTypes.mli
+++ b/helm/ocaml/cic_disambiguation/disambiguateTypes.mli
@@ -31,6 +31,10 @@ type domain_item =
 (* module Domain:      Set.S with type elt = domain_item *)
 module Environment: Map.S with type key = domain_item
 
+  (** 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)
@@ -65,14 +69,14 @@ 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, string) GrafiteAst.tactic
+type tactical = (term, 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