X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite%2FgrafiteAst.ml;h=6e48074ad56e4463174402abf3240ec93746970e;hb=16fc013c83981bb5c2bb24ac4e06bc0ca1fda80d;hp=2deacf2ac48bf5cde54bb68b3075889371a08788;hpb=5fa31e43ffe25aa7b1539653b137968b5cf9899a;p=helm.git

diff --git a/helm/software/components/grafite/grafiteAst.ml b/helm/software/components/grafite/grafiteAst.ml
index 2deacf2ac..6e48074ad 100644
--- a/helm/software/components/grafite/grafiteAst.ml
+++ b/helm/software/components/grafite/grafiteAst.ml
@@ -51,11 +51,17 @@ type 'term just =
 
 type ntactic =
    | NApply 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
    | 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) *)
@@ -141,8 +147,12 @@ type search_kind = [ `Locate | `Hint | `Match | `Elim ]
 
 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 *)
@@ -156,18 +166,21 @@ type ('term,'lazy_term) macro =
   | 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 = 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
@@ -179,6 +192,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
@@ -202,6 +216,8 @@ type ('term, 'lazy_term, 'reduction, 'obj, 'ident) code =
       * 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