diff options
| author | msozeau | 2008-06-16 10:17:13 +0000 |
|---|---|---|
| committer | msozeau | 2008-06-16 10:17:13 +0000 |
| commit | 21c8f5d0b74e72f61a086d92660d25ce35c482b7 (patch) | |
| tree | b1a67aaafd13560c3c23efd49ea7560d34ef906c /proofs | |
| parent | 4c5baa34e6fd790197c7bd6297b98ff63031d1fa (diff) | |
Add possibility to match on defined hypotheses, using brackets to
disambiguate syntax:
[ H := [ ?x ] : context C [ foo ] |- _ ] is ok, as well as [ H := ?x :
nat |- _ ] or [H := foo |- _ ], but [ H := ?x : context C [ foo ] ] will
not parse.
Add applicative contexts in tactics match, to be able to match arbitrary partial
applications, e.g.: match f 0 1 2 with appcontext C [ f ?x ] => ... end
will bind C to [ ∙ 1 2 ] and x to 0.
Minor improvements in coqdoc.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@11129 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'proofs')
| -rw-r--r-- | proofs/tacexpr.ml | 3 | ||||
| -rw-r--r-- | proofs/tactic_debug.ml | 8 | ||||
| -rw-r--r-- | proofs/tactic_debug.mli | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/proofs/tacexpr.ml b/proofs/tacexpr.ml index 1808fd3aac..f3152f3314 100644 --- a/proofs/tacexpr.ml +++ b/proofs/tacexpr.ml @@ -117,11 +117,12 @@ type pattern_expr = constr_expr (* Type of patterns *) type 'a match_pattern = | Term of 'a - | Subterm of identifier option * 'a + | Subterm of bool * identifier option * 'a (* Type of hypotheses for a Match Context rule *) type 'a match_context_hyps = | Hyp of name located * 'a match_pattern + | Def of name located * 'a match_pattern * 'a match_pattern (* Type of a Match rule for Match Context and Match *) type ('a,'t) match_rule = diff --git a/proofs/tactic_debug.ml b/proofs/tactic_debug.ml index 16bca302e7..6674d04ea9 100644 --- a/proofs/tactic_debug.ml +++ b/proofs/tactic_debug.ml @@ -6,7 +6,7 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -(*i $Id:$ i*) +(*i $Id$ i*) open Names open Constrextern @@ -129,7 +129,7 @@ let hyp_bound = function | Name id -> " (bound to "^(Names.string_of_id id)^")" (* Prints a matched hypothesis *) -let db_matched_hyp debug env (id,c) ido = +let db_matched_hyp debug env (id,_,c) ido = if debug <> DebugOff & !skip = 0 then msgnl (str "Hypothesis " ++ str ((Names.string_of_id id)^(hyp_bound ido)^ @@ -148,8 +148,8 @@ let db_mc_pattern_success debug = let pp_match_pattern env = function | Term c -> Term (extern_constr_pattern (names_of_rel_context env) c) - | Subterm (o,c) -> - Subterm (o,(extern_constr_pattern (names_of_rel_context env) c)) + | Subterm (b,o,c) -> + Subterm (b,o,(extern_constr_pattern (names_of_rel_context env) c)) (* Prints a failure message for an hypothesis pattern *) let db_hyp_pattern_failure debug env (na,hyp) = diff --git a/proofs/tactic_debug.mli b/proofs/tactic_debug.mli index 6da6dc61cf..ab59f208af 100644 --- a/proofs/tactic_debug.mli +++ b/proofs/tactic_debug.mli @@ -45,7 +45,7 @@ val db_pattern_rule : (* Prints a matched hypothesis *) val db_matched_hyp : - debug_info -> env -> identifier * constr -> name -> unit + debug_info -> env -> identifier * constr option * constr -> name -> unit (* Prints the matched conclusion *) val db_matched_concl : debug_info -> env -> constr -> unit |