New: refinement is now used to disambiguate parsing.

[helm.git] / helm / gTopLevel / proofEngine.ml

diff --git a/helm/gTopLevel/proofEngine.ml b/helm/gTopLevel/proofEngine.ml
index 7b4c68ab54a9884e88baeae1acf4d970038348d8..7d637551fdc693fef96b6ce9f2b4d3b7e7e02071 100644 (file)
--- a/helm/gTopLevel/proofEngine.ml
+++ b/helm/gTopLevel/proofEngine.ml
@@ -169,8 +169,8 @@ let intros () = apply_tactic PrimitiveTactics.intros_tac
 let cut term = apply_tactic (PrimitiveTactics.cut_tac ~term)
 let letin term = apply_tactic (PrimitiveTactics.letin_tac ~term)
 let exact term = apply_tactic (PrimitiveTactics.exact_tac ~term)
-let elim_simpl_intros term =
-  apply_tactic (PrimitiveTactics.elim_simpl_intros_tac ~term)
+let elim_intros_simpl term =
+  apply_tactic (PrimitiveTactics.elim_intros_simpl_tac ~term)
 let change ~goal_input:what ~input:with_what =
   apply_tactic (PrimitiveTactics.change_tac ~what ~with_what)
 
@@ -206,28 +206,32 @@ let fold_simpl term =
 
   (* other tactics *)
 
-let elim_type term = apply_tactic (VariousTactics.elim_type_tac ~term)
+let elim_type term = apply_tactic (EliminationTactics.elim_type_tac ~term)
 let ring () = apply_tactic Ring.ring_tac
 let fourier () = apply_tactic FourierR.fourier_tac
-let rewrite_simpl term = apply_tactic (VariousTactics.rewrite_simpl_tac ~term)
 
-let reflexivity () = apply_tactic VariousTactics.reflexivity_tac
-let symmetry () = apply_tactic VariousTactics.symmetry_tac
-let transitivity term = apply_tactic (VariousTactics.transitivity_tac ~term)
+let rewrite_simpl term = apply_tactic (EqualityTactics.rewrite_simpl_tac ~term)
+let rewrite_back_simpl term = apply_tactic (EqualityTactics.rewrite_back_simpl_tac ~term)
+let replace ~goal_input:what ~input:with_what = 
+  apply_tactic (EqualityTactics.replace_tac ~what ~with_what)
 
-let exists () = apply_tactic VariousTactics.exists_tac
-let split () = apply_tactic VariousTactics.split_tac 
-let left () = apply_tactic VariousTactics.left_tac
-let right () = apply_tactic VariousTactics.right_tac
+let reflexivity () = apply_tactic EqualityTactics.reflexivity_tac
+let symmetry () = apply_tactic EqualityTactics.symmetry_tac
+let transitivity term = apply_tactic (EqualityTactics.transitivity_tac ~term)
+
+let exists () = apply_tactic IntroductionTactics.exists_tac
+let split () = apply_tactic IntroductionTactics.split_tac 
+let left () = apply_tactic IntroductionTactics.left_tac
+let right () = apply_tactic IntroductionTactics.right_tac
 
 let assumption () = apply_tactic VariousTactics.assumption_tac
 
 let generalize term = apply_tactic (VariousTactics.generalize_tac ~term)
 
-let absurd term = apply_tactic (VariousTactics.absurd_tac ~term)
-let contradiction () = apply_tactic VariousTactics.contradiction_tac
+let absurd term = apply_tactic (NegationTactics.absurd_tac ~term)
+let contradiction () = apply_tactic NegationTactics.contradiction_tac
 
-let decompose ~clist = apply_tactic (VariousTactics.decompose_tac ~clist)
+let decompose ~clist = apply_tactic (EliminationTactics.decompose_tac ~clist)
 
 (*
 let decide_equality () = apply_tactic VariousTactics.decide_equality_tac