Minor widget rearrangement.

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

diff --git a/helm/gTopLevel/ring.ml b/helm/gTopLevel/ring.ml
index 399d2c2892334297ed970f25b47fe363ede544e8..25fa093f20601591b6041fa8eb79808800ebad5f 100644 (file)
--- a/helm/gTopLevel/ring.ml
+++ b/helm/gTopLevel/ring.ml
@@ -404,6 +404,7 @@ let status_of_single_goal_tactic_result =
   | _ ->
     raise (Fail "status_of_single_goal_tactic_result: the tactic did not produce exactly a new goal")
 
+(* Galla: spostata in variousTactics.ml 
   (**
     auxiliary tactic "elim_type"
     @param status current proof engine status
@@ -413,6 +414,7 @@ let elim_type_tac ~term ~status =
   warn "in Ring.elim_type_tac";
   Tacticals.thens ~start:(cut_tac ~term)
    ~continuations:[elim_simpl_intros_tac ~term:(Cic.Rel 1) ; Tacticals.id_tac] ~status
+*)
 
   (**
     auxiliary tactic, use elim_type and try to close 2nd subgoal using proof
@@ -421,11 +423,12 @@ let elim_type_tac ~term ~status =
     @param proof term used to prove second subgoal generated by elim_type
   *)
 let elim_type2_tac ~term ~proof ~status =
+  let module E = EliminationTactics in
   warn "in Ring.elim_type2";
-  Tacticals.thens ~start:(elim_type_tac ~term)
+  Tacticals.thens ~start:(E.elim_type_tac ~term)
    ~continuations:[Tacticals.id_tac ; exact_tac ~term:proof] ~status
 
-(* spostata in variousTactics.ml
+(* Galla: spostata in variousTactics.ml
   (**
     Reflexivity tactic, try to solve current goal using "refl_eqT"
     Warning: this isn't equale to the coq's Reflexivity because this one tries
@@ -498,7 +501,7 @@ let ring_tac ~status:((proof, goal) as status) =
         Tacticals.try_tactics
           ~status
           ~tactics:[
-            "reflexivity", VariousTactics.reflexivity_tac ;
+            "reflexivity", EqualityTactics.reflexivity_tac ;
             "exact t1'_eq_t1''", exact_tac ~term:t1'_eq_t1'' ;
             "exact t2'_eq_t2''", exact_tac ~term:t2'_eq_t2'' ;
             "exact sym_eqt su t1 ...", exact_tac
@@ -570,7 +573,7 @@ let ring_tac ~status:((proof, goal) as status) =
                       in
                       try (* try to solve main goal *)
                         warn "trying reflexivity ....";
-                        VariousTactics.reflexivity_tac ~status:status'
+                        EqualityTactics.reflexivity_tac ~status:status'
                       with (Fail _) ->  (* leave conclusion to the user *)
                         warn "reflexivity failed, solution's left as an ex :-)";
                         purge_hyps_tac ~count:!new_hyps ~status:status')]