type ('term, 'lazy_term, 'reduction, 'ident) tactic =
| Absurd of loc * 'term
| Apply of loc * 'term
- | ApplyS of loc * 'term
+ | ApplyS of loc * 'term * (string * string) list
| Assumption of loc
| Auto of loc * (string * string) list
+ | Cases of loc * 'term * 'ident list
| Change of loc * ('term, 'lazy_term, 'ident) pattern * 'lazy_term
| Clear of loc * 'ident list
| ClearBody of loc * 'ident
(* Costruttori Aggiunti *)
| Assume of loc * 'ident * 'term
| Suppose of loc * 'term *'ident * 'term option
- | By_term_we_proved of loc *'term option * 'term * 'ident * 'term option
- | We_need_to_prove of loc * 'term * 'ident * 'term option
+ | By_term_we_proved of loc *'term option * 'term * 'ident option * 'term option
+ | We_need_to_prove of loc * 'term * 'ident option * 'term option
| Bydone of loc * 'term option
| We_proceed_by_induction_on of loc * 'term * 'term
| Byinduction of loc * 'term * 'ident
| ExistsElim of loc * 'term * 'ident * 'term * 'ident * 'term
| AndElim of loc * 'term * 'ident * 'term * 'ident * 'term
| RewritingStep of
- loc * 'term option * 'term * 'term option * Cic.name option
+ loc * (string option * 'term) option * 'term *
+ [ `Term of 'term | `Auto of (string * string) list ] *
+ bool (* last step*)
type search_kind = [ `Locate | `Hint | `Match | `Elim ]
type print_kind = [ `Env | `Coer ]
+type style = Declarative
+ | Procedural
+
type 'term macro =
(* Whelp's stuff *)
| WHint of loc * 'term
(* real macros *)
| Check of loc * 'term
| Hint of loc
+ | Inline of loc * style * string * string (* URI or base-uri, name prefix *)
(** To be increased each time the command type below changes, used for "safe"
* marshalling *)
-let magic = 9
+let magic = 11
-type 'obj command =
+type ('term,'obj) command =
+ | Index of loc * 'term option (* key *) * UriManager.uri (* value *)
+ | Coercion of loc * UriManager.uri * bool (* add_obj *) * int (* arity *)
| Default of loc * string * UriManager.uri list
+ | Drop of loc
| Include of loc * string
+ | Obj of loc * 'obj
+ | Relation of
+ loc * string * 'term * 'term * 'term option * 'term option * 'term option
| Set of loc * string * string
- | Drop of loc
| Print of loc * string
| Qed of loc
- | Coercion of loc * UriManager.uri * bool (* add_obj *) * int (* arity *)
- | Obj of loc * 'obj
type ('term, 'lazy_term, 'reduction, 'ident) tactical =
| Tactic of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic
| _ -> false
type ('term, 'lazy_term, 'reduction, 'obj, 'ident) code =
- | Command of loc * 'obj command
+ | Command of loc * ('term, 'obj) command
| Macro of loc * 'term macro
| Tactical of loc * ('term, 'lazy_term, 'reduction, 'ident) tactical
* ('term, 'lazy_term, 'reduction, 'ident) tactical option(* punctuation *)