id ;-) and lapply patched

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

diff --git a/helm/ocaml/tactics/eliminationTactics.ml b/helm/ocaml/tactics/eliminationTactics.ml
index 15645951e29a0af9920195a60dca96ff8ce9d2ec..4f840764a8d17466acf6f094e98dec00f1cac49f 100644 (file)
--- a/helm/ocaml/tactics/eliminationTactics.ml
+++ b/helm/ocaml/tactics/eliminationTactics.ml
@@ -27,11 +27,12 @@
 
   (** perform debugging output? *)
 let debug = false
+let debug_print = fun _ -> ()
 
   (** debugging print *)
 let warn s =
   if debug then
-    prerr_endline ("DECOMPOSE: " ^ s)
+    debug_print ("DECOMPOSE: " ^ s)
 
 
 
@@ -157,12 +158,18 @@ let decompose_tac ?(uris_choice_callback=(function l -> l)) term =
                             let new_context_len = List.length context in   
                              warn ("newcon=" ^ (string_of_int new_context_len) ^ " & oldcon=" ^ (string_of_int old_context_len) ^ " & old_nr_of_hyp=" ^ (string_of_int nr_of_hyp_still_to_elim));
                              let new_nr_of_hyp_still_to_elim = nr_of_hyp_still_to_elim + (new_context_len - old_context_len) - 1 in
+                             let hyp_name =
+                              match List.nth context new_nr_of_hyp_still_to_elim with
+                                 None
+                               | Some (Cic.Anonymous,_) -> assert false
+                               | Some (Cic.Name name,_) -> name
+                             in
                             ProofEngineTypes.apply_tactic
                              (T.then_ 
                                 ~start:(
                                   if (term'==term) (* if it's the first application of elim, there's no need to clear the hyp *) 
-                                   then begin prerr_endline ("%%%%%%% no clear"); T.id_tac end
-                                   else begin prerr_endline ("%%%%%%% clear " ^ (string_of_int (new_nr_of_hyp_still_to_elim))); (S.clear ~hyp:(List.nth context (new_nr_of_hyp_still_to_elim))) end)
+                                   then begin debug_print ("%%%%%%% no clear"); T.id_tac end
+                                   else begin debug_print ("%%%%%%% clear " ^ (string_of_int (new_nr_of_hyp_still_to_elim))); (S.clear ~hyp:hyp_name) end)
                                 ~continuation:(ProofEngineTypes.mk_tactic (elim_clear_tac ~term':(C.Rel new_nr_of_hyp_still_to_elim) ~nr_of_hyp_still_to_elim:new_nr_of_hyp_still_to_elim)))
                                 status
                         )))