*)
type direction = [ `Left | `Right ]
-type reduction_kind = [ `Reduce | `Simpl | `Whd ]
+type reduction_kind = [ `Reduce | `Simpl | `Whd | `Normalize ]
(* type 'term pattern = Pattern of 'term *)
(* everywhere includes goal and hypotheses *)
type ('term, 'ident) tactic =
| Absurd of loc * 'term
| Apply of loc * 'term
- | Auto of loc
+ | 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
| 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,
type print_kind = [ `Env | `Coer ]
type 'term macro =
- | Abort of loc
+ (* Whelp's stuff *)
+ | WHint of loc * 'term
+ | WMatch of loc * 'term
+ | WInstance of loc * 'term
+ | WLocate of loc * string
+ | WElim of loc * 'term
+ (* real macros *)
+(* | Abort of loc *)
| Print of loc * string
| Check of loc * 'term
| Hint of loc
- | Match of loc * 'term
| Quit of loc
- | Redo of loc * int option
- | Undo of loc * int option
+(* | Redo of loc * int option
+ | Undo of loc * int option *)
(* | Print of loc * print_kind *)
| Search_pat of loc * search_kind * string (* searches with string pattern *)
| Search_term of loc * search_kind * 'term (* searches with term pattern *)
(* try a sequence of loc * tacticals until one succeeds, fail otherwise *)
| Try of loc * ('term, 'ident) tactical (* try a tactical and mask failures *)
-type ('term, 'ident) statement =
+
+type ('term, 'ident) code =
| Command of loc * 'term command
| Macro of loc * 'term macro
(* Macro are substantially queries, but since we are not the kind of
* peolpe that like to push "start" to turn off the computer
* we added this command *)
| Tactical of loc * ('term, 'ident) tactical
+
+type ('term, 'ident) comment =
+ | Note of loc * string
+ | Code of loc * ('term, 'ident) code
+
+type ('term, 'ident) statement =
+ | Executable of loc * ('term, 'ident) code
+ | Comment of loc * ('term, 'ident) comment