| NCase1 of loc * string
| NChange of loc * npattern * CicNotationPt.term
| NElim of loc * CicNotationPt.term * npattern
- | NEval of loc * npattern * [ `Whd of bool ]
| NGeneralize of loc * npattern
| NId of loc
| NIntro of loc * string
| NLetIn of loc * npattern * CicNotationPt.term * string
+ | NReduce of loc * [ `Normalize of bool | `Whd of bool ] * npattern
| NRewrite of loc * direction * CicNotationPt.term * npattern
type ('term, 'lazy_term, 'reduction, 'ident) tactic =
type print_kind = [ `Env | `Coer ]
-type presentation_style = Declarative
- | Procedural of int option
+type inline_param = IPPrefix of string
+ | IPAs of Cic.object_flavour
+ | IPProcedural
+ | IPNoDefaults
+ | IPLevel of int
+ | IPDepth of int
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 *)
(** To be increased each time the command type below changes, used for "safe"
* marshalling *)
-let magic = 19
+let magic = 21
type ('term,'obj) command =
| Index of loc * 'term option (* key *) * UriManager.uri (* value *)
| UnificationHint of loc * 'term * int (* term, precedence *)
| Default of loc * string * UriManager.uri list
| Drop of loc
- | Include of loc * string
+ | Include of loc * bool (* source? *) * string
| Obj of loc * 'obj
| Relation of
loc * string * 'term * 'term * 'term option * 'term option * 'term option
| Print of loc * string
| Qed of loc
| NObj of loc * CicNotationPt.term CicNotationPt.obj
+ | NUnivConstraint of loc * bool * NUri.uri * NUri.uri
+ | NQed of loc
type punctuation_tactical =
| Dot of loc
* punctuation_tactical
| NonPunctuationTactical of loc * non_punctuation_tactical
* punctuation_tactical
+ | NNonPunctuationTactical of loc * non_punctuation_tactical
+ * punctuation_tactical
type ('term, 'lazy_term, 'reduction, 'obj, 'ident) comment =
| Note of loc * string