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
[ `Term of 'term
| `Auto of 'term auto_params ]
+type ntactic =
+ | NApply of loc * CicNotationPt.term
+ | NChange of loc * npattern * CicNotationPt.term
+ | NElim of loc * CicNotationPt.term * npattern
+ | NId of loc
+ | NIntro of loc * string
+
type ('term, 'lazy_term, 'reduction, 'ident) tactic =
(* Higher order tactics (i.e. tacticals) *)
| Do of loc * int * ('term, 'lazy_term, 'reduction, 'ident) tactic
(** To be increased each time the command type below changes, used for "safe"
* marshalling *)
-let magic = 14
+let magic = 17
type ('term,'obj) command =
| Index of loc * 'term option (* key *) * UriManager.uri (* value *)
| Coercion of loc * 'term * bool (* add_obj *) *
int (* arity *) * int (* saturations *)
- | UnificationHint of (loc * 'term)
+ | PreferCoercion of loc * 'term
+ | UnificationHint of loc * 'term * int (* term, precedence *)
| Default of loc * string * UriManager.uri list
| Drop of loc
| Include of loc * string
| Set of loc * string * string
| Print of loc * string
| Qed of loc
+ | NObj of loc * CicNotationPt.term CicNotationPt.obj
-type ('term, 'lazy_term, 'reduction, 'ident) punctuation_tactical =
+type punctuation_tactical =
| Dot of loc
| Semicolon of loc
| Branch of loc
| Wildcard of loc
| Merge of loc
-type ('term,'lazy_term,'reduction,'ident) non_punctuation_tactical =
+type non_punctuation_tactical =
| Focus of loc * int list
| Unfocus of loc
| Skip of loc
type ('term, 'lazy_term, 'reduction, 'obj, 'ident) code =
| Command of loc * ('term, 'obj) command
| Macro of loc * ('term,'lazy_term) macro
+ | NTactic of loc * ntactic * punctuation_tactical
| Tactic of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic option
- * ('term, 'lazy_term, 'reduction, 'ident) punctuation_tactical
- | NonPunctuationTactical of loc
- * ('term, 'lazy_term, 'reduction, 'ident) non_punctuation_tactical
- * ('term, 'lazy_term, 'reduction, 'ident) punctuation_tactical
+ * punctuation_tactical
+ | NonPunctuationTactical of loc * non_punctuation_tactical
+ * punctuation_tactical
type ('term, 'lazy_term, 'reduction, 'obj, 'ident) comment =
| Note of loc * string