Correction du bug #1315:

- ajouts des opérations clear_evar_hyps_in_evar,
  clear_evar_hyps_in_constr et clear_evar_hyps dans Evarutil, qui
  permettent de supprimer des hypothèses dans le contexte des evars, 
  en créant une nouvelle evar avec un contexte restreint;

- adaptation de clear_hyps dans Logic pour qu'elle mette à jour le
  contexte des evars;

- adaptation de prim_refiner pour qu'elle renvoie le evar_map modifié;

- déplacement de la tactique Change_evars dans prim_rule.



git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@9518 85f007b7-540e-0410-9357-904b9bb8a0f7

2 files changed, 18 insertions, 19 deletions

diff --git a/kernel/environ.ml b/kernel/environ.ml
index 57043057a3..2d821991e0 100644
--- a/kernel/environ.ml
+++ b/kernel/environ.ml
@@ -241,9 +241,9 @@ let global_vars_set env constr =
   let rec filtrec acc c =
     let vl = vars_of_global env c in
     let acc = List.fold_right Idset.add vl acc in
-    fold_constr filtrec acc c
+      fold_constr filtrec acc c
   in 
-  filtrec Idset.empty constr
+    filtrec Idset.empty constr
 
 (* like [global_vars] but don't get through evars *)
 let global_vars_set_drop_evar env constr = 
@@ -339,18 +339,6 @@ type unsafe_type_judgment = {
 
 let compile_constant_body = Cbytegen.compile_constant_body  
 
-(*s Special functions for the refiner (logic.ml) *)
-
-let clear_hyps ids check (ctxt,vals) =
-  let ctxt,vals,rmv = 
-    List.fold_right2 (fun (id,_,_ as d) v (ctxt,vals,rmv) ->
-      if List.mem id ids then (ctxt,vals,id::rmv)
-      else begin
-	check rmv d;
-	(d::ctxt,v::vals,rmv)
-      end) ctxt vals ([],[],[])
-  in ((ctxt,vals),rmv)
-
 exception Hyp_not_found
 
 let rec apply_to_hyp (ctxt,vals) id f =
@@ -393,3 +381,16 @@ let insert_after_hyp (ctxt,vals) id d check =
     | [],[] -> raise Hyp_not_found
     | _, _ -> assert false
   in aux ctxt vals
+
+(* To be used in Logic.clear_hyps *)
+let remove_hyps ids check (ctxt, vals) =
+  let ctxt,vals,rmv = 
+    List.fold_right2 (fun (id,_,_ as d) v (ctxt,vals,rmv) ->
+      if List.mem id ids then 
+	(ctxt,vals,id::rmv)
+      else 	  
+	let nd = check d in
+	  (nd::ctxt,v::vals,rmv))
+		     ctxt vals ([],[],[])
+  in ((ctxt,vals),rmv)
+
diff --git a/kernel/environ.mli b/kernel/environ.mli
index 5fa5f56740..175b18b247 100644
--- a/kernel/environ.mli
+++ b/kernel/environ.mli
@@ -195,11 +195,6 @@ val compile_constant_body :
     env -> constr_substituted option -> bool -> bool -> Cemitcodes.body_code
                                  (* opaque *) (* boxed *)
 
-(*s Functions for proofs/logic.ml *)
-val clear_hyps : 
-    variable list -> (variable list -> named_declaration -> unit) -> 
-      named_context_val -> named_context_val * variable list
-
 exception Hyp_not_found
 
 (* [apply_to_hyp sign id f] split [sign] into [tail::(id,_,_)::head] and
@@ -221,3 +216,6 @@ val apply_to_hyp_and_dependent_on : named_context_val -> variable ->
 val insert_after_hyp : named_context_val -> variable ->
   named_declaration -> 
     (named_context -> unit) -> named_context_val
+
+val remove_hyps : identifier list -> (named_declaration -> named_declaration) -> named_context_val -> named_context_val * identifier list
+