debian: rebuilt against ocaml 3.08.3

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

diff --git a/helm/ocaml/tactics/variousTactics.ml b/helm/ocaml/tactics/variousTactics.ml
index 395768db96088a65abb4b63fed6bb5650d665095..be08c4d9e9b69bf5114ba1f4c62d6384ea8a312e 100644 (file)
--- a/helm/ocaml/tactics/variousTactics.ml
+++ b/helm/ocaml/tactics/variousTactics.ml
@@ -28,26 +28,37 @@
 chiedere: find dovrebbe restituire una lista di hyp (?) da passare all'utonto con una
 funzione di callback che restituisce la (sola) hyp da applicare *)
 
-let assumption_tac ~status:((proof,goal) as status) =
+let assumption_tac =
+ let module PET = ProofEngineTypes in
+ let assumption_tac status =
+  let (proof, goal) = status in
   let module C = Cic in
   let module R = CicReduction in
   let module S = CicSubstitution in
-   let _,metasenv,_,_ = proof in
-    let _,context,ty = List.find (function (m,_,_) -> m=goal) metasenv in
-     let rec find n = function 
-        hd::tl -> 
-         (match hd with
+  let module PT = PrimitiveTactics in
+  let _,metasenv,_,_ = proof in
+  let _,context,ty = CicUtil.lookup_meta goal metasenv in
+  let rec find n = function 
+      hd::tl -> 
+        (match hd with
              (Some (_, C.Decl t)) when
-               (R.are_convertible context (S.lift n t) ty) -> n
+               fst (R.are_convertible context (S.lift n t) ty 
+                      CicUniv.empty_ugraph) -> n
            | (Some (_, C.Def (_,Some ty'))) when
-               (R.are_convertible context ty' ty) -> n
-           | (Some (_, C.Def (t,None))) when
-               (R.are_convertible context
-                (CicTypeChecker.type_of_aux' metasenv context (S.lift n t)) ty) -> n 
+               fst (R.are_convertible context (S.lift n ty') ty
+                       CicUniv.empty_ugraph) -> n
+           | (Some (_, C.Def (t,None))) ->
+              let ty_t, u = (* TASSI: FIXME *)
+                CicTypeChecker.type_of_aux' metasenv context (S.lift n t) 
+                  CicUniv.empty_ugraph in
+              let b,_ = R.are_convertible context ty_t ty u in
+                if b then n else find (n+1) tl
            | _ -> find (n+1) tl
          )
-      | [] -> raise (ProofEngineTypes.Fail "Assumption: No such assumption")
-     in PrimitiveTactics.apply_tac ~status ~term:(C.Rel (find 1 context))
+      | [] -> raise (PET.Fail "Assumption: No such assumption")
+     in PET.apply_tactic (PT.apply_tac ~term:(C.Rel (find 1 context))) status
+ in
+  PET.mk_tactic assumption_tac
 ;;
 
 (* ANCORA DA DEBUGGARE *)
@@ -58,41 +69,48 @@ exception AllSelectedTermsMustBeConvertible;;
 e li aggiunga nel context, poi si conta la lunghezza di questo nuovo
 contesto e si lifta di tot... COSA SIGNIFICA TUTTO CIO'?????? *)
 
-let generalize_tac
- ?(mk_fresh_name_callback = ProofEngineHelpers.mk_fresh_name)
- terms ~status:((proof,goal) as status)
-=
-  let module C = Cic in
-  let module P = PrimitiveTactics in
-  let module T = Tacticals in
-   let _,metasenv,_,_ = proof in
-   let _,context,ty = List.find (function (m,_,_) -> m=goal) metasenv in
-    let typ =
-     match terms with
-        [] -> assert false
-      | he::tl ->
-         (* We need to check that all the convertibility of all the terms *)
-         List.iter
-          (function t ->
-            if not (CicReduction.are_convertible context he t) then 
-             raise AllSelectedTermsMustBeConvertible
-          ) tl ;
-         (CicTypeChecker.type_of_aux' metasenv context he)
-    in
-     T.thens 
-      ~start:
-        (P.cut_tac 
-         (C.Prod(
-           (mk_fresh_name_callback context C.Anonymous typ), 
-           typ,
-           (ProofEngineReduction.replace_lifting_csc 1
-             ~equality:(==) 
-             ~what:terms
-             ~with_what:(List.map (function _ -> C.Rel 1) terms)
-             ~where:ty)
-         )))
-      ~continuations: [(P.apply_tac ~term:(C.Rel 1)) ; T.id_tac]
-      ~status
+let generalize_tac 
+ ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name ~subst:[]) terms
+ =
+  let module PET = ProofEngineTypes in
+  let generalize_tac mk_fresh_name_callback terms status =
+   let (proof, goal) = status in
+   let module C = Cic in
+   let module P = PrimitiveTactics in
+   let module T = Tacticals in
+    let _,metasenv,_,_ = proof in
+    let _,context,ty = CicUtil.lookup_meta goal metasenv in
+     let typ,_ =
+      match terms with
+         [] -> assert false
+       | he::tl ->
+           (* We need to check that all the convertibility of all the terms *)
+           let u = List.fold_left ( (* TASSI: FIXME *)
+            fun u t ->
+              let b,u1 = CicReduction.are_convertible context he t u in 
+                if not b then 
+                  raise AllSelectedTermsMustBeConvertible
+                else
+                  u1) CicUniv.empty_ugraph tl in
+             (CicTypeChecker.type_of_aux' metasenv context he u)
+     in
+      PET.apply_tactic 
+      (T.thens 
+       ~start:
+         (P.cut_tac 
+          (C.Prod(
+            (mk_fresh_name_callback metasenv context C.Anonymous ~typ:typ), 
+            typ,
+            (ProofEngineReduction.replace_lifting_csc 1
+              ~equality:(==) 
+              ~what:terms
+              ~with_what:(List.map (function _ -> C.Rel 1) terms)
+              ~where:ty)
+          )))
+       ~continuations: [(P.apply_tac ~term:(C.Rel 1)) ; T.id_tac])
+       status
+ in
+  PET.mk_tactic (generalize_tac mk_fresh_name_callback terms)
 ;;