type binder_kind = [ `Lambda | `Pi | `Exists | `Forall ]
type induction_kind = [ `Inductive | `CoInductive ]
-type sort_kind = [ `Prop | `Set | `Type of CicUniv.universe | `CProp ]
+type sort_kind = [ `Prop | `Set | `Type of CicUniv.universe | `CProp of
+CicUniv.universe | `NType of string |`NCProp of string]
type fold_kind = [ `Left | `Right ]
type location = Stdpp.location
type term_attribute =
[ `Loc of location (* source file location *)
| `IdRef of string (* ACic pointer *)
- | `Level of int * Gramext.g_assoc (* precedence, associativity *)
- | `ChildPos of child_pos (* position of l1 pattern variables *)
+ | `Level of int
| `XmlAttrs of (string option * string * string) list
(* list of XML attributes: namespace, name, value *)
| `Raw of string (* unparsed version *)
(** To be increased each time the term type below changes, used for "safe"
* marshalling *)
-let magic = 2
+let magic = 6
type term =
(* CIC AST *)
(* literal, substitutions.
* Some [] -> user has given an empty explicit substitution list
* None -> user has given no explicit substitution list *)
- | Implicit
+ | Implicit of [`Vector | `JustOne | `Tagged of string]
| Meta of int * meta_subst list
| Num of string * int (* literal, instance *)
| Sort of sort_kind
| UserInput (* place holder for user input, used by MatitaConsole, not to be
used elsewhere *)
| Uri of string * subst list option (* as Ident, for long names *)
+ | NRef of NReference.reference
+
+ | NCic of NCic.term
(* Syntax pattern extensions *)
| Frac of term * term
| Over of term * term
| Atop of term * term
+ | InfRule of term * term * term
(* | array of term * literal option * literal option
|+ column separator, row separator +| *)
+ | Maction of term list
| Sqrt of term
| Root of term * term (* argument, index *)
| Break
| Box of box_spec * term list
| Group of term list
+ | Mstyle of (string * string) list * term list
+ | Mpadded of (string * string) list * term list
and magic_term =
(* level 1 magics *)
| Fail
| If of term * term * term (* test, pattern if true, pattern if false *)
+and term_level = Self of int | Level of int
+
and pattern_variable =
(* level 1 and 2 variables *)
| NumVar of string
| IdentVar of string
- | TermVar of string
+ | TermVar of string * term_level
(* level 1 variables *)
| Ascription of term * string
type cic_appl_pattern =
| UriPattern of UriManager.uri
+ | NRefPattern of NReference.reference
| VarPattern of string
| ImplicitPattern
| ApplPattern of cic_appl_pattern list
type 'term obj =
| Inductive of 'term capture_variable list * 'term inductive_type list
(** parameters, list of loc * mutual inductive types *)
- | Theorem of Cic.object_flavour * string * 'term * 'term option
+ | Theorem of Cic.object_flavour * string * 'term * 'term option * NCic.def_pragma
(** flavour, name, type, body
* - name is absent when an unnamed theorem is being proved, tipically in
* interactive usage
let apply_prec = 70
let simple_prec = 90
-let let_in_assoc = Gramext.NonA
-let binder_assoc = Gramext.RightA
-let apply_assoc = Gramext.LeftA
-let simple_assoc = Gramext.NonA
-