aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorherbelin2004-03-01 14:54:09 +0000
committerherbelin2004-03-01 14:54:09 +0000
commit9bfe45ef4974157c18ef18876b7df8adfb286414 (patch)
treee4d6620376a697196908a6f153c3e4df7f18c72e
parentece6204d9ccb8e37f5050ba4ee5c3d43669bf6ef (diff)
Déplacement définition intro_pattern_expr dans Genarg
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@5406 85f007b7-540e-0410-9357-904b9bb8a0f7
-rw-r--r--proofs/tacexpr.ml9
-rw-r--r--tactics/elim.ml1
-rw-r--r--tactics/elim.mli3
3 files changed, 4 insertions, 9 deletions
diff --git a/proofs/tacexpr.ml b/proofs/tacexpr.ml
index c55fc31a85..062d415c3a 100644
--- a/proofs/tacexpr.ml
+++ b/proofs/tacexpr.ml
@@ -63,13 +63,6 @@ type 'a induction_arg =
| ElimOnIdent of identifier located
| ElimOnAnonHyp of int
-type intro_pattern_expr =
- | IntroOrAndPattern of case_intro_pattern_expr
- | IntroWildcard
- | IntroIdentifier of identifier
-
-and case_intro_pattern_expr = intro_pattern_expr list list
-
type inversion_kind =
| SimpleInversion
| FullInversion
@@ -226,7 +219,7 @@ and ('constr,'pat,'cst,'ind,'ref,'id,'tac) gen_tactic_arg =
| TacVoid
| MetaIdArg of loc * string
| ConstrMayEval of ('constr,'cst) may_eval
- | Identifier of identifier (* parsed under Reference (Ident _) *)
+ | IntroPattern of intro_pattern_expr
| Reference of 'ref
| Integer of int
| TacCall of loc *
diff --git a/tactics/elim.ml b/tactics/elim.ml
index e3235fc32a..7391464855 100644
--- a/tactics/elim.ml
+++ b/tactics/elim.ml
@@ -24,6 +24,7 @@ open Tacmach
open Tacticals
open Tactics
open Hiddentac
+open Genarg
open Tacexpr
let introElimAssumsThen tac ba =
diff --git a/tactics/elim.mli b/tactics/elim.mli
index 0fb104310c..4aeea99813 100644
--- a/tactics/elim.mli
+++ b/tactics/elim.mli
@@ -13,6 +13,7 @@ open Names
open Term
open Proof_type
open Tacmach
+open Genarg
open Tacticals
(*i*)
@@ -22,7 +23,7 @@ val introElimAssumsThen :
(branch_assumptions -> tactic) -> branch_args -> tactic
val introCaseAssumsThen :
- (Tacexpr.intro_pattern_expr list -> branch_assumptions -> tactic) ->
+ (intro_pattern_expr list -> branch_assumptions -> tactic) ->
branch_args -> tactic
val general_decompose : (identifier * constr -> bool) -> constr -> tactic