X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite%2FgrafiteAst.ml;h=6bf050fec3f1ffb8013b369a4a768fe34eaf25ff;hb=df1201e37d6f2631dc31ffc87b979a6c81180a3a;hp=169873bf0466c60cf2649bd351d6c79710510a0f;hpb=b97a7976503b2d2e5cbc9199f848135a324775a8;p=helm.git

diff --git a/helm/software/components/grafite/grafiteAst.ml b/helm/software/components/grafite/grafiteAst.ml
index 169873bf0..6bf050fec 100644
--- a/helm/software/components/grafite/grafiteAst.ml
+++ b/helm/software/components/grafite/grafiteAst.ml
@@ -63,6 +63,16 @@ 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
 
 type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   (* Higher order tactics (i.e. tacticals) *)
@@ -148,12 +158,16 @@ type search_kind = [ `Locate | `Hint | `Match | `Elim ]
 
 type print_kind = [ `Env | `Coer ]
 
-type inline_param = IPPrefix of string
-		  | IPAs of Cic.object_flavour
-                  | IPProcedural
-                  | IPNoDefaults 
-		  | IPLevel of int
-                  | IPDepth of int
+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 *)
+                  | IPCR                       (* detect convertible rewriting *)
 
 type ('term,'lazy_term) macro = 
   (* Whelp's stuff *)
@@ -172,7 +186,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 = 23
 
 type ('term,'obj) command =
   | Index of loc * 'term option (* key *) * UriManager.uri (* value *)
@@ -182,16 +196,18 @@ 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 (* source? *) * string 
+  | Include of loc * bool (* normal? *) * 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
   | NQed of loc
@@ -212,14 +228,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