X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Ftactics%2FequalityTactics.ml;h=4a6c445e6e359702300d291c246bb6c30b89b3ef;hb=12cc5b2b8e7f7bb0b5e315094b008a293a4df6b1;hp=31c9b60b4705a755468ea0b19eae01fee6645b57;hpb=04cfb486c3fe1609839c6a435bc2db6d6cae581d;p=helm.git

diff --git a/helm/ocaml/tactics/equalityTactics.ml b/helm/ocaml/tactics/equalityTactics.ml
index 31c9b60b4..4a6c445e6 100644
--- a/helm/ocaml/tactics/equalityTactics.ml
+++ b/helm/ocaml/tactics/equalityTactics.ml
@@ -32,7 +32,6 @@ let rewrite_tac ~direction ~pattern equality =
   let module PER = ProofEngineReduction in
   let module PEH = ProofEngineHelpers in
   let module PT = PrimitiveTactics in
-  let module HLO = HelmLibraryObjects in
   assert (wanted = None);   (* this should be checked syntactically *)
   assert (hyps_pat = []); (*CSC: not implemented yet! *)
   let proof,goal = status in
@@ -43,18 +42,26 @@ let rewrite_tac ~direction ~pattern equality =
   in
   let curi, metasenv, pbo, pty = proof in
   let (metano,context,gty) as conjecture = CicUtil.lookup_meta goal metasenv in
-  let eq_uri = HLO.Logic.eq_URI in
-  let ty_eq,_ = 
+  let ty_eq,ugraph = 
     CicTypeChecker.type_of_aux' metasenv context equality 
-      CicUniv.empty_ugraph
-  in 
+      CicUniv.empty_ugraph in 
+  let (ty_eq,metasenv,arguments,fresh_meta) =
+   ProofEngineHelpers.saturate_term
+    (ProofEngineHelpers.new_meta_of_proof proof) metasenv context ty_eq in
+  let equality =
+   if List.length arguments = 0 then
+    equality
+   else
+    C.Appl (equality :: arguments) in
   let eq_ind, ty, t1, t2 =
     match ty_eq with
-    | C.Appl [C.MutInd (uri, 0, []); ty; t1; t2] when U.eq uri eq_uri ->
-        let eq_ind = 
-          C.Const (if_right_to_left HLO.Logic.eq_ind_URI HLO.Logic.eq_ind_r_URI,[])
+    | C.Appl [C.MutInd (uri, 0, []); ty; t1; t2]
+      when LibraryObjects.is_eq_URI uri ->
+        let ind_uri =
+         if_right_to_left LibraryObjects.eq_ind_URI LibraryObjects.eq_ind_r_URI
         in
-        if_right_to_left (eq_ind, ty, t2, t1) (eq_ind, ty, t1, t2)
+        let eq_ind = C.Const (ind_uri uri,[]) in
+         if_right_to_left (eq_ind, ty, t2, t1) (eq_ind, ty, t1, t2)
     | _ -> raise (PET.Fail "Rewrite: argument is not a proof of an equality") in
   (* now we always do as if direction was `LeftToRight *)
   let fresh_name = 
@@ -65,9 +72,10 @@ let rewrite_tac ~direction ~pattern equality =
   let lifted_conjecture =
     metano,(Some (fresh_name,Cic.Decl ty))::context,lifted_gty in
   let lifted_pattern = Some lifted_t1,[],CicSubstitution.lift 1 concl_pat in
-  let _,selected_terms_with_context =
+  let subst,metasenv,ugraph,_,selected_terms_with_context =
    ProofEngineHelpers.select
-    ~metasenv ~conjecture:lifted_conjecture ~pattern:lifted_pattern in
+    ~metasenv ~ugraph ~conjecture:lifted_conjecture ~pattern:lifted_pattern in
+  let metasenv = CicMetaSubst.apply_subst_metasenv subst metasenv in
   let what,with_what = 
    (* Note: Rel 1 does not live in the context context_of_t           *)
    (* The replace_lifting_csc_0 function will take care of lifting it *)
@@ -78,8 +86,11 @@ let rewrite_tac ~direction ~pattern equality =
   let abstr_gty =
    ProofEngineReduction.replace_lifting_csc 0
     ~equality:(==) ~what ~with_what:with_what ~where:lifted_gty in
+  let abstr_gty = CicMetaSubst.apply_subst subst abstr_gty in
+  let t1 = CicMetaSubst.apply_subst subst t1 in
+  let t2 = CicMetaSubst.apply_subst subst t2 in
+  let equality = CicMetaSubst.apply_subst subst equality in
   let gty' = CicSubstitution.subst t2 abstr_gty in
-  let fresh_meta = ProofEngineHelpers.new_meta_of_proof proof in
   let irl = CicMkImplicit.identity_relocation_list_for_metavariable context in
   let metasenv' = (fresh_meta,context,gty')::metasenv in
   let pred = C.Lambda (fresh_name, ty, abstr_gty) in
@@ -110,6 +121,7 @@ let rewrite_simpl_tac ~direction ~pattern equality =
 ;;
 
 let replace_tac ~pattern ~with_what =
+(*
  let replace_tac ~pattern:(wanted,hyps_pat,concl_pat) ~with_what status =
   let (proof, goal) = status in
   let module C = Cic in
@@ -175,7 +187,7 @@ let replace_tac ~pattern ~with_what =
             ~start:(
               P.cut_tac 
                (C.Appl [
-                 (C.MutInd (HelmLibraryObjects.Logic.eq_URI, 0, [])) ;
+                 (C.MutInd (LibraryObjects.eq_URI (), 0, [])) ;
                  ty_of_with_what ; 
                  what ; 
                  with_what]))
@@ -206,6 +218,7 @@ let replace_tac ~pattern ~with_what =
    aux 0 whats status
  in
    ProofEngineTypes.mk_tactic (replace_tac ~pattern ~with_what)
+*) assert false
 ;;
 
 
@@ -224,10 +237,10 @@ let symmetry_tac =
     let metano,context,ty = CicUtil.lookup_meta goal metasenv in
      match (R.whd context ty) with
         (C.Appl [(C.MutInd (uri, 0, [])); _; _; _])
-	 when (U.eq uri HelmLibraryObjects.Logic.eq_URI) ->
+	 when LibraryObjects.is_eq_URI uri ->
 	  ProofEngineTypes.apply_tactic 
            (PrimitiveTactics.apply_tac 
-	    ~term: (C.Const (HelmLibraryObjects.Logic.sym_eq_URI, []))) 
+	    ~term: (C.Const (LibraryObjects.sym_eq_URI uri, []))) 
 	   (proof,goal)
 
       | _ -> raise (ProofEngineTypes.Fail "Symmetry failed")
@@ -246,11 +259,11 @@ let transitivity_tac ~term =
     let metano,context,ty = CicUtil.lookup_meta goal metasenv in
      match (R.whd context ty) with
         (C.Appl [(C.MutInd (uri, 0, [])); _; _; _]) 
-	when (uri = HelmLibraryObjects.Logic.eq_URI) ->
+	when LibraryObjects.is_eq_URI uri ->
          ProofEngineTypes.apply_tactic 
 	 (T.thens
           ~start:(PrimitiveTactics.apply_tac
-            ~term: (C.Const (HelmLibraryObjects.Logic.trans_eq_URI, [])))
+            ~term: (C.Const (LibraryObjects.trans_eq_URI uri, [])))
           ~continuations:
             [PrimitiveTactics.exact_tac ~term ; T.id_tac ; T.id_tac])
           status