diff options
author | 2013-05-08 18:01:07 +0200 | |
---|---|---|
committer | 2013-05-08 18:01:07 +0200 | |
commit | 095eac936751bab72e3c6bbdfa3ede51f7198721 (patch) | |
tree | 44cf2859ba6b8486f056efaaf7ee6c2d855f2aae /tactics/eqdecide.ml4 | |
parent | 4e6d6dab2ef2de6c1ad7972fc981e55a4fde7ae3 (diff) | |
parent | 0b14713e3efd7f8f1cc8a06555d0ec8fbe496130 (diff) |
Merge branch 'experimental/master'
Diffstat (limited to 'tactics/eqdecide.ml4')
-rw-r--r-- | tactics/eqdecide.ml4 | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/tactics/eqdecide.ml4 b/tactics/eqdecide.ml4 index a16e99bb..fd6393e3 100644 --- a/tactics/eqdecide.ml4 +++ b/tactics/eqdecide.ml4 @@ -1,6 +1,6 @@ (************************************************************************) (* v * The Coq Proof Assistant / The Coq Development Team *) -(* <O___,, * INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2011 *) +(* <O___,, * INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2012 *) (* \VV/ **************************************************************) (* // * This file is distributed under the terms of the *) (* * GNU Lesser General Public License Version 2.1 *) @@ -14,8 +14,6 @@ (*i camlp4deps: "parsing/grammar.cma" i*) -(* $Id: eqdecide.ml4 14641 2011-11-06 11:59:10Z herbelin $ *) - open Util open Names open Namegen @@ -29,7 +27,6 @@ open Auto open Pattern open Matching open Hipattern -open Proof_trees open Proof_type open Tacmach open Coqlib @@ -163,8 +160,7 @@ let decideGralEquality g = let decideEqualityGoal = tclTHEN intros decideGralEquality -let decideEquality c1 c2 g = - let rectype = (pf_type_of g c1) in +let decideEquality rectype g = let decide = mkGenDecideEqGoal rectype g in (tclTHENS (cut decide) [default_auto;decideEqualityGoal]) g @@ -178,13 +174,12 @@ let compare c1 c2 g = [(tclTHEN intro (tclTHEN (onLastHyp simplest_case) clear_last)); - decideEquality c1 c2]) g + decideEquality (pf_type_of g c1)]) g (* User syntax *) TACTIC EXTEND decide_equality - [ "decide" "equality" constr(c1) constr(c2) ] -> [ decideEquality c1 c2 ] | [ "decide" "equality" ] -> [ decideEqualityGoal ] END |