type direction = [ `Left | `Right ]
type reduction_kind = [ `Reduce | `Simpl | `Whd | `Normalize ]
-(* type 'term pattern = Pattern of 'term *)
-
- (* everywhere includes goal and hypotheses *)
-type 'term pattern = [ `Goal | `Everywhere ]
-
- (* when an 'ident option is None, the default is to apply the tactic
- to the current goal *)
type loc = CicAst.location
+type ('term, 'ident) pattern =
+ ('ident * 'term) list * 'term option
+
type ('term, 'ident) tactic =
| Absurd of loc * 'term
| Apply of loc * 'term
- | Auto of loc * int option
| Assumption of loc
- | Change of loc * 'term * 'term * 'ident option (* what, with what, where *)
- | Change_pattern of loc * 'term pattern * 'term * 'ident option
- (* what, with what, where *)
+ | Auto of loc * int option * int option (* depth, width *)
+ | Change of loc * 'term * 'term * ('term,'ident) pattern (* what, with what, where *)
+ | Clear of loc * 'ident
+ | ClearBody of loc * 'ident
+ | Compare of loc * 'term
+ | Constructor of loc * int
| Contradiction of loc
- | Cut of loc * 'term
- | Decompose of loc * 'ident * 'ident list (* where, which principles *)
- | Discriminate of loc * 'ident
+ | Cut of loc * 'ident option * 'term
+ | DecideEquality of loc
+ | Decompose of loc * 'term
+ | Discriminate of loc * 'term
| Elim of loc * 'term * 'term option (* what to elim, which principle to use *)
| ElimType of loc * 'term
| Exact of loc * 'term
| Exists of loc
- | Fold of loc * reduction_kind * 'term
+ | Fail of loc
+ | Fold of loc * reduction_kind * 'term * ('term, 'ident) pattern
| Fourier of loc
+ | FwdSimpl of loc * 'term
+ | Generalize of loc * 'term * 'ident option * ('term, 'ident) pattern
| Goal of loc * int (* change current goal, argument is goal number 1-based *)
- | Injection of loc * 'ident
+ | IdTac of loc
+ | Injection of loc * 'term
| Intros of loc * int option * 'ident list
+ | LApply of loc * 'term option * 'term * 'ident option
| Left of loc
| LetIn of loc * 'term * 'ident
-(* | Named_intros of loc * 'ident list (* joined with Intros above *) *)
-(* | Reduce of loc * reduction_kind * 'term pattern * 'ident option (* what, where *) *)
- | ReduceAt of loc * reduction_kind * 'ident * 'term
- | Reduce of loc * reduction_kind * ('term list * 'term pattern) option
- (* kind, (what, where)
- * if second argument is None, reduction is applied to the current goal,
- * otherwise to each occurrence of loc * terms given in list occuring in term
- * pattern *)
+ | Reduce of loc * reduction_kind * ('term, 'ident) pattern
| Reflexivity of loc
- | Replace of loc * 'term * 'term (* what, with what *)
- | Replace_pattern of loc * 'term pattern * 'term
- | Rewrite of loc * direction * 'term * 'ident option
+ | Replace of loc * ('term, 'ident) pattern * 'term
+ | Rewrite of loc * direction * 'term * ('term, 'ident) pattern
| Right of loc
| Ring of loc
| Split of loc
type ('term,'obj) command =
| Set of loc * string * string
+ | Drop of loc
| Qed of loc
(** name.
* Name is needed when theorem was started without providing a name
type ('term, 'ident) tactical =
| Tactic of loc * ('term, 'ident) tactic
- | Fail of loc
| Do of loc * int * ('term, 'ident) tactical
- | IdTac of loc
| Repeat of loc * ('term, 'ident) tactical
| Seq of loc * ('term, 'ident) tactical list (* sequential composition *)
| Then of loc * ('term, 'ident) tactical * ('term, 'ident) tactical list