type 'ident intros_spec = int option * 'ident option list
-type 'term auto_params = 'term list * (string*string) list
+type 'term auto_params = 'term list option * (string*string) list
type 'term just =
[ `Term of 'term
type ntactic =
| NApply of loc * CicNotationPt.term
+ | NSmartApply of loc * CicNotationPt.term
| NAssert of loc * ((string * [`Decl of CicNotationPt.term | `Def of CicNotationPt.term * CicNotationPt.term]) list * CicNotationPt.term) list
| NCases of loc * CicNotationPt.term * npattern
| NCase1 of loc * string
| NChange of loc * npattern * CicNotationPt.term
+ | NConstructor of loc * int option * CicNotationPt.term list
+ | NCut of loc * CicNotationPt.term
+(* | NDiscriminate of loc * CicNotationPt.term
+ | NSubst of loc * CicNotationPt.term *)
+ | NDestruct of loc * string list option * string list
| NElim of loc * CicNotationPt.term * npattern
| NGeneralize of loc * npattern
| NId of loc
| NIntro of loc * string
+ | NIntros of loc * string list
+ | NInversion of loc * CicNotationPt.term * npattern
+ | NLApply of loc * CicNotationPt.term
| NLetIn of loc * npattern * CicNotationPt.term * string
| NReduce of loc * [ `Normalize of bool | `Whd of bool ] * npattern
| NRewrite of loc * direction * CicNotationPt.term * npattern
| NBranch of loc
| NShift of loc
| NPos of loc * int list
+ | NPosbyname of loc * string
| NWildcard of loc
| NMerge of loc
| NSkip of loc
| NUnfocus of loc
| NTry of loc * ntactic
| NAssumption of loc
+ | NRepeat of loc * ntactic
+ | NBlock of loc * ntactic list
type ('term, 'lazy_term, 'reduction, 'ident) tactic =
(* Higher order tactics (i.e. tacticals) *)
| Inline of loc * string * inline_param list
(* URI or base-uri, parameters *)
+type nmacro =
+ | NCheck of loc * CicNotationPt.term
+ | Screenshot of loc * string
+ | NAutoInteractive of loc * CicNotationPt.term auto_params
+ | NIntroGuess of loc
+
(** To be increased each time the command type below changes, used for "safe"
* marshalling *)
-let magic = 24
+let magic = 34
type ('term,'obj) command =
| Index of loc * 'term option (* key *) * UriManager.uri (* value *)
| Inverter of loc * string * 'term * bool list
| Default of loc * string * UriManager.uri list
| Drop of loc
- | Include of loc * bool (* normal? *) * string
+ | Include of loc * bool (* normal? *) * [`New | `OldAndNew] * string
| Obj of loc * 'obj
| Relation of
loc * string * 'term * 'term * 'term option * 'term option * 'term option
type ncommand =
| UnificationHint of loc * CicNotationPt.term * int (* term, precedence *)
| NObj of loc * CicNotationPt.term CicNotationPt.obj
- | NUnivConstraint of loc * bool * NUri.uri * NUri.uri
+ | NDiscriminator of loc * CicNotationPt.term
+ | NInverter of loc * string * CicNotationPt.term * bool list option * CicNotationPt.term option
+ | NUnivConstraint of loc * NUri.uri * NUri.uri
+ | NCopy of loc * string * NUri.uri * (NUri.uri * NUri.uri) list
+ | NCoercion of loc * string *
+ CicNotationPt.term * CicNotationPt.term *
+ (string * CicNotationPt.term) * CicNotationPt.term
| NQed of loc
type punctuation_tactical =
| Command of loc * ('term, 'obj) command
| NCommand of loc * ncommand
| Macro of loc * ('term,'lazy_term) macro
+ | NMacro of loc * nmacro
| NTactic of loc * ntactic list
| Tactic of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic option
* punctuation_tactical