Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Revert r15851 "En cours pour bug 2836".

Sorry, was committed mistakenly.

This reverts commit e9cb84a.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@15857 85f007b7-540e-0410-9357-904b9bb8a0f7
  • Loading branch information...
commit e3a62779a8a604d7ee83e72a10254392362d80fe 1 parent 22e70c4
herbelin authored

Showing 1 changed file with 5 additions and 5 deletions. Show diff stats Hide diff stats

  1. +5 5 tactics/equality.ml
10 tactics/equality.ml
@@ -232,7 +232,7 @@ let is_applied_rewrite_relation = ref (fun _ _ _ _ -> None)
232 232 let register_is_applied_rewrite_relation = (:=) is_applied_rewrite_relation
233 233
234 234 (* find_elim determines which elimination principle is necessary to
235   - eliminate some eq on sort_of_gl. *)
  235 + eliminate lbeq on sort_of_gl. *)
236 236
237 237 let find_elim hdcncl lft2rgt dep cls args gl =
238 238 let inccl = (cls = None) in
@@ -286,11 +286,11 @@ let type_of_clause gl = function
286 286 | None -> pf_concl gl
287 287 | Some id -> pf_get_hyp_typ gl id
288 288
289   -let leibniz_rewrite_ebindings_clause cls lft2rgt tac sigma c t l with_evars frzevars dep_proof_ok gl (hdcncl,args) =
  289 +let leibniz_rewrite_ebindings_clause cls lft2rgt tac sigma c t l with_evars frzevars dep_proof_ok gl hdcncl =
290 290 let isatomic = isProd (whd_zeta hdcncl) in
291 291 let dep_fun = if isatomic then dependent else dependent_no_evar in
292 292 let dep = dep_proof_ok && dep_fun c (type_of_clause gl cls) in
293   - let elim = find_elim hdcncl lft2rgt dep cls args gl in
  293 + let elim = find_elim hdcncl lft2rgt dep cls (snd (decompose_app t)) gl in
294 294 general_elim_clause with_evars frzevars tac cls sigma c t l
295 295 (match lft2rgt with None -> false | Some b -> b)
296 296 {elimindex = None; elimbody = (elim,NoBindings)} gl
@@ -324,7 +324,7 @@ let general_rewrite_ebindings_clause cls lft2rgt occs frzevars dep_proof_ok ?tac
324 324 | Some (hdcncl,args) -> (* Fast path: direct leibniz-like rewrite *)
325 325 let lft2rgt = adjust_rewriting_direction args lft2rgt in
326 326 leibniz_rewrite_ebindings_clause cls lft2rgt tac sigma c (it_mkProd_or_LetIn t rels)
327   - l with_evars frzevars dep_proof_ok gl (hdcncl,args)
  327 + l with_evars frzevars dep_proof_ok gl hdcncl
328 328 | None ->
329 329 try
330 330 rewrite_side_tac (!general_rewrite_clause cls
@@ -336,7 +336,7 @@ let general_rewrite_ebindings_clause cls lft2rgt occs frzevars dep_proof_ok ?tac
336 336 | Some (hdcncl,args) ->
337 337 let lft2rgt = adjust_rewriting_direction args lft2rgt in
338 338 leibniz_rewrite_ebindings_clause cls lft2rgt tac sigma c
339   - (it_mkProd_or_LetIn t' (rels' @ rels)) l with_evars frzevars dep_proof_ok gl (hdcncl,args)
  339 + (it_mkProd_or_LetIn t' (rels' @ rels)) l with_evars frzevars dep_proof_ok gl hdcncl
340 340 | None -> raise e
341 341 (* error "The provided term does not end with an equality or a declared rewrite relation." *)
342 342

0 comments on commit e3a6277

Please sign in to comment.
Something went wrong with that request. Please try again.