X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Ftactics%2FproofEngineTypes.ml;h=68ea561f97988aa81c1cd614d66476971c227111;hb=771ee8b9d122fa963881c876e86f90531bb7434f;hp=8d1def22ebd7bd360df377967a3bd85885fd0355;hpb=728734356fbb8f3d66fb022c8a97b464f8893be8;p=helm.git

diff --git a/helm/ocaml/tactics/proofEngineTypes.ml b/helm/ocaml/tactics/proofEngineTypes.ml
index 8d1def22e..68ea561f9 100644
--- a/helm/ocaml/tactics/proofEngineTypes.ml
+++ b/helm/ocaml/tactics/proofEngineTypes.ml
@@ -23,6 +23,8 @@
  * http://cs.unibo.it/helm/.
  *)
 
+(* $Id$ *)
+
   (**
     current proof (proof uri * metas * (in)complete proof * term to be prooved)
   *)
@@ -56,19 +58,44 @@ type tactic = status -> proof * goal list
   (** creates an opaque tactic from a status->proof*goal list function *)
 let mk_tactic t = t
 
+type reduction = Cic.context -> Cic.term -> Cic.term
+
+let const_lazy_term t =
+  (fun _ metasenv ugraph -> t, metasenv, ugraph)
+
+type lazy_reduction =
+  Cic.context -> Cic.metasenv -> CicUniv.universe_graph ->
+    reduction * Cic.metasenv * CicUniv.universe_graph
+
+let const_lazy_reduction red =
+  (fun _ metasenv ugraph -> red, metasenv, ugraph)
+
+type ('term, 'lazy_term) pattern =
+  'lazy_term option * (string * 'term) list * 'term option
+
+type lazy_pattern = (Cic.term, Cic.lazy_term) pattern
+
+let conclusion_pattern t =
+  let t' = 
+    match t with
+    | None -> None
+    | Some t -> Some (fun _ m u -> t, m, u)
+  in
+  t',[],Some (Cic.Implicit (Some `Hole))
+
   (** tactic failure *)
-exception Fail of string
+exception Fail of string Lazy.t
 
   (** 
     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)
+  t status
 
   (** constraint: the returned value will always be constructed by Cic.Name **)
 type mk_fresh_name_type =
  Cic.metasenv -> Cic.context -> Cic.name -> typ:Cic.term -> Cic.name
+
+let goals_of_proof (_,metasenv,_,_) = List.map (fun (g,_,_) -> g) metasenv
+