type direction = [ `LeftToRight | `RightToLeft ]
-type loc = Token.flocation
+type loc = Stdpp.location
type ('term, 'lazy_term, 'ident) pattern =
'lazy_term option * ('ident * 'term) list * 'term option
type 'lazy_term reduction =
[ `Normalize
- | `Reduce
| `Simpl
| `Unfold of 'lazy_term option
| `Whd ]
type 'ident intros_spec = int option * 'ident option list
+type 'term auto_params = 'term list * (string*string) list
+
type ('term, 'lazy_term, 'reduction, 'ident) tactic =
(* Higher order tactics (i.e. tacticals) *)
| Do of loc * int * ('term, 'lazy_term, 'reduction, 'ident) tactic
(* Real tactics *)
| Absurd of loc * 'term
| Apply of loc * 'term
- | ApplyS of loc * 'term * (string * string) list
+ | ApplyS of loc * 'term * 'term auto_params
| Assumption of loc
- | AutoBatch of loc * (string * string) list
+ | AutoBatch of loc * 'term auto_params
| Cases of loc * 'term * 'ident intros_spec
| Change of loc * ('term, 'lazy_term, 'ident) pattern * 'lazy_term
| Clear of loc * 'ident list
| Contradiction of loc
| Cut of loc * 'ident option * 'term
| Decompose of loc * 'ident option list
- | Demodulate of loc
- | Destruct of loc * 'term
+ | Demodulate of loc * 'term auto_params
+ | Destruct of loc * 'term list option
| Elim of loc * 'term * 'term option * ('term, 'lazy_term, 'ident) pattern *
'ident intros_spec
| ElimType of loc * 'term * 'term option * 'ident intros_spec
| Right of loc
| Ring of loc
| Split of loc
- | Subst of loc
| Symmetry of loc
| Transitivity of loc * 'term
- (* Costruttori Aggiunti *)
+ (* Declarative language *)
| Assume of loc * 'ident * 'term
| Suppose of loc * 'term *'ident * 'term option
| By_term_we_proved of loc *'term option * 'term * 'ident option * 'term option
| AndElim of loc * 'term * 'ident * 'term * 'ident * 'term
| RewritingStep of
loc * (string option * 'term) option * 'term *
- [ `Term of 'term | `Auto of (string * string) list | `Proof ] *
+ [ `Term of 'term | `Auto of 'term auto_params
+ | `Proof | `SolveWith of 'term ] *
bool (* last step*)
type search_kind = [ `Locate | `Hint | `Match | `Elim ]
type 'term macro =
(* Whelp's stuff *)
- | WHint of loc * 'term
+ | WHint of loc * 'term
| WMatch of loc * 'term
| WInstance of loc * 'term
| WLocate of loc * string
| WElim of loc * 'term
(* real macros *)
| Check of loc * 'term
- | Hint of loc
- | AutoInteractive of loc * (string * string) list
+ | Hint of loc * bool
+ | AutoInteractive of loc * 'term auto_params
| Inline of loc * presentation_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 = 11
+let magic = 12
type ('term,'obj) command =
| Index of loc * 'term option (* key *) * UriManager.uri (* value *)
- | Coercion of loc * UriManager.uri * bool (* add_obj *) * int (* arity *)
+ | Coercion of loc * UriManager.uri * bool (* add_obj *) *
+ int (* arity *) * int (* saturations *)
| Default of loc * string * UriManager.uri list
| Drop of loc
| Include of loc * string