type ('term, 'lazy_term, 'ident) pattern =
'lazy_term option * ('ident * 'term) list * 'term option
+type npattern =
+ CicNotationPt.term option * (string * CicNotationPt.term) list * CicNotationPt.term option
+
type 'lazy_term reduction =
[ `Normalize
| `Simpl
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
| `Auto of 'term auto_params ]
type ntactic =
- NApply of loc * CicNotationPt.term
+ | 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
+ | 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
+ | NAuto of loc * CicNotationPt.term auto_params
+ | NDot of loc
+ | NSemicolon of loc
+ | NBranch of loc
+ | NShift of loc
+ | NPos of loc * int list
+ | NPosbyname of loc * string
+ | NWildcard of loc
+ | NMerge of loc
+ | NSkip of loc
+ | NFocus of loc * int list
+ | 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) *)
type print_kind = [ `Env | `Coer ]
-type presentation_style = Declarative
- | Procedural of int option
+type inline_param = IPPrefix of string (* undocumented *)
+ | IPAs of Cic.object_flavour (* preferred flavour *)
+ | IPCoercions (* show coercions *)
+ | IPDebug of int (* set debug level *)
+ | IPProcedural (* procedural rendering *)
+ | IPNoDefaults (* no default-based tactics *)
+ | IPLevel of int (* granularity level *)
+ | IPDepth of int (* undocumented *)
+ | IPComments (* show statistics *)
+ | IPCR (* detect convertible rewriting *)
type ('term,'lazy_term) macro =
(* Whelp's stuff *)
| Check of loc * 'term
| Hint of loc * bool
| AutoInteractive of loc * 'term auto_params
- | Inline of loc * presentation_style * string * string * Cic.object_flavour option
- (* URI or base-uri, name prefix, flavour *)
+ | 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 = 17
+let magic = 33
type ('term,'obj) command =
| Index of loc * 'term option (* key *) * UriManager.uri (* value *)
+ | Select of loc * UriManager.uri
+ | Pump of loc * int
| Coercion of loc * 'term * bool (* add_obj *) *
int (* arity *) * int (* saturations *)
| PreferCoercion of loc * 'term
- | UnificationHint of loc * 'term * int (* term, precedence *)
+ | Inverter of loc * string * 'term * bool list
| Default of loc * string * UriManager.uri list
| Drop of loc
- | Include of loc * 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
| Set of loc * string * string
| Print of loc * string
| Qed of loc
+
+type ncommand =
+ | UnificationHint of loc * CicNotationPt.term * int (* term, precedence *)
| NObj of loc * CicNotationPt.term CicNotationPt.obj
+ | 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 =
| Dot of loc
type ('term, 'lazy_term, 'reduction, 'obj, 'ident) code =
| Command of loc * ('term, 'obj) command
+ | NCommand of loc * ncommand
| Macro of loc * ('term,'lazy_term) macro
- | NTactic of loc * ntactic option * punctuation_tactical
+ | NMacro of loc * nmacro
+ | NTactic of loc * ntactic list
| Tactic of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic option
* punctuation_tactical
| NonPunctuationTactical of loc * non_punctuation_tactical