X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite%2FgrafiteAst.ml;h=813a080719cfbf039ea234c4dab8e1c81460004a;hb=4693f3b9de6d867921b51f61e9a7dc36c3da1b77;hp=6b9a3eba18a632837b1ad66221169a6b34979c83;hpb=8ae1653eb75d2b57c50e077c49cb9d078313ea9d;p=helm.git

diff --git a/helm/software/components/grafite/grafiteAst.ml b/helm/software/components/grafite/grafiteAst.ml
index 6b9a3eba1..813a08071 100644
--- a/helm/software/components/grafite/grafiteAst.ml
+++ b/helm/software/components/grafite/grafiteAst.ml
@@ -63,6 +63,20 @@ type ntactic =
    | NReduce of loc * [ `Normalize of bool | `Whd of bool ] * npattern
    | NRewrite of loc * direction * CicNotationPt.term * npattern
    | NAuto of loc * CicNotationPt.term auto_params
+   | NDot of loc
+   | NSemicolon of loc
+   | NBranch of loc
+   | NShift of loc
+   | NPos of loc * int list
+   | NWildcard of loc
+   | NMerge of loc
+   | NSkip of loc
+   | NFocus of loc * int list
+   | NUnfocus of loc
+   | NTry of loc * ntactic
+   | NAssumption of loc
+   | NRepeat of loc * ntactic
+   | NBlock of loc * ntactic list
 
 type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   (* Higher order tactics (i.e. tacticals) *)
@@ -150,13 +164,14 @@ type print_kind = [ `Env | `Coer ]
 
 type inline_param = IPPrefix of string         (* undocumented *)
 		  | IPAs of Cic.object_flavour (* preferred flavour *)
+		  | IPCoercions                (* show coercions *)
+                  | IPDebug of int             (* set debug level *)
                   | IPProcedural               (* procedural rendering *)
                   | IPNoDefaults               (* no default-based tactics *)
 		  | IPLevel of int             (* granularity level *)
                   | IPDepth of int             (* undocumented *)
                   | IPComments                 (* show statistics *)
-		  | IPCoercions                (* show coercions *)
-                  | IPDebug of int             (* set debug level *)
+                  | IPCR                       (* detect convertible rewriting *)
 
 type ('term,'lazy_term) macro = 
   (* Whelp's stuff *)
@@ -175,7 +190,7 @@ type ('term,'lazy_term) macro =
 
 (** To be increased each time the command type below changes, used for "safe"
  * marshalling *)
-let magic = 22
+let magic = 26
 
 type ('term,'obj) command =
   | Index of loc * 'term option (* key *) * UriManager.uri (* value *)
@@ -185,18 +200,24 @@ type ('term,'obj) command =
      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
-  | Include of loc * bool (* normal? *) * string 
+  | Include of loc * bool (* normal? *) * [`New | `OldAndNew] * string 
   | Obj of loc * 'obj
   | Relation of
      loc * string * 'term * 'term * 'term option * 'term option * 'term option
   | Set of loc * string * string
   | Print of loc * string
   | Qed of loc
+
+type ncommand =
+  | UnificationHint of loc * CicNotationPt.term * int (* term, precedence *)
   | NObj of loc * CicNotationPt.term CicNotationPt.obj
   | NUnivConstraint of loc * bool * NUri.uri * NUri.uri
+  | NCopy of loc * string * NUri.uri * (NUri.uri * NUri.uri) list
+  | NCoercion of loc * string *
+      CicNotationPt.term * CicNotationPt.term *
+      (string * CicNotationPt.term) * CicNotationPt.term
   | NQed of loc
 
 type punctuation_tactical =
@@ -215,14 +236,13 @@ type non_punctuation_tactical =
 
 type ('term, 'lazy_term, 'reduction, 'obj, 'ident) code =
   | Command of loc * ('term, 'obj) command
+  | NCommand of loc * ncommand
   | Macro of loc * ('term,'lazy_term) macro 
-  | NTactic of loc * ntactic * punctuation_tactical
+  | NTactic of loc * ntactic list
   | Tactic of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic option
       * 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