ported debian stuff to ocaml 3.08

[helm.git] / helm / ocaml / tactics / proofEngineTypes.ml

diff --git a/helm/ocaml/tactics/proofEngineTypes.ml b/helm/ocaml/tactics/proofEngineTypes.ml
index 178be54d441a6e16ef01b3d6ec876be3ff974da9..ac0713bd057dc364c44a193f71cb1b475a14e564 100644 (file)
--- a/helm/ocaml/tactics/proofEngineTypes.ml
+++ b/helm/ocaml/tactics/proofEngineTypes.ml
@@ -26,20 +26,34 @@
   (**
     current proof (proof uri * metas * (in)complete proof * term to be prooved)
   *)
-type proof = UriManager.uri * Cic.metasenv * Cic.term * Cic.term
+type proof = UriManager.uri option * Cic.metasenv * Cic.term * Cic.term
   (** current goal, integer index *)
 type goal = int
 type status = proof * goal
+
   (**
     a tactic: make a transition from one status to another one or, usually,
     raise a "Fail" (@see Fail) exception in case of failure
   *)
   (** an unfinished proof with the optional current goal *)
-type tactic = status:status -> proof * goal list
+type tactic = status -> proof * goal list
+
+  (** creates an opaque tactic from a status->proof*goal list function *)
+let mk_tactic t = t
 
   (** tactic failure *)
 exception Fail of string
 
+  (** 
+    calls the opaque tactic on the status, restoring the original 
+    universe graph if the tactic Fails
+  *)
+let apply_tactic t status = 
+  let saved_univ = CicUniv.get_working() in
+  try 
+    t status
+  with Fail s -> CicUniv.set_working saved_univ; raise (Fail s)
+
   (** constraint: the returned value will always be constructed by Cic.Name **)
 type mk_fresh_name_type =
- Cic.context -> Cic.name -> typ:Cic.term -> Cic.name
+ Cic.metasenv -> Cic.context -> Cic.name -> typ:Cic.term -> Cic.name