All the equalityTactics have now been ported to use both the equality of

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

diff --git a/helm/ocaml/tactics/equalityTactics.ml b/helm/ocaml/tactics/equalityTactics.ml
index 31c9b60b4705a755468ea0b19eae01fee6645b57..3d54fd18bbc9e126c663b30ab7b1607711a2f389 100644 (file)
--- 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,19 @@ 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,_ = 
     CicTypeChecker.type_of_aux' metasenv context equality 
       CicUniv.empty_ugraph
   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 = 
@@ -175,7 +175,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]))
@@ -224,10 +224,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 +246,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