Inductive definitions are now interpreted (but records are not interpreted yet).

[helm.git] / helm / software / components / grafite / grafiteAst.ml

diff --git a/helm/software/components/grafite/grafiteAst.ml b/helm/software/components/grafite/grafiteAst.ml
index 7b4411d02a23111fb64d98db310e1be8d523edea..f6555fa04c7dd5ed86bb8c4f6c6bbe8d7fee4feb 100644 (file)
--- a/helm/software/components/grafite/grafiteAst.ml
+++ b/helm/software/components/grafite/grafiteAst.ml
@@ -32,6 +32,9 @@ type loc = Stdpp.location
 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
@@ -48,8 +51,17 @@ type 'term just =
 
 type ntactic =
    | NApply of loc * CicNotationPt.term
-   | NChange of loc * CicNotationPt.term * 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
+   | 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
+   | NRewrite of loc * direction * CicNotationPt.term * npattern
 
 type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   (* Higher order tactics (i.e. tacticals) *)
@@ -155,13 +167,16 @@ type ('term,'lazy_term) macro =
 
 (** To be increased each time the command type below changes, used for "safe"
  * marshalling *)
-let magic = 17
+let magic = 19
 
 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
+  | Inverter of loc * string * 'term * bool list
   | UnificationHint of loc * 'term * int (* term, precedence *)
   | Default of loc * string * UriManager.uri list
   | Drop of loc
@@ -173,6 +188,7 @@ type ('term,'obj) command =
   | Print of loc * string
   | Qed of loc
   | NObj of loc * CicNotationPt.term CicNotationPt.obj
+  | NQed of loc
 
 type punctuation_tactical =
   | Dot of loc