...

[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 67d42c64454205a12c4dccd0a23823ea585926a9..6b9a3eba18a632837b1ad66221169a6b34979c83 100644 (file)
--- a/helm/software/components/grafite/grafiteAst.ml
+++ b/helm/software/components/grafite/grafiteAst.ml
@@ -56,12 +56,13 @@ type ntactic =
    | 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
+   | NReduce of loc * [ `Normalize of bool | `Whd of bool ] * npattern
    | NRewrite of loc * direction * CicNotationPt.term * npattern
+   | NAuto of loc * CicNotationPt.term auto_params
 
 type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   (* Higher order tactics (i.e. tacticals) *)
@@ -147,8 +148,15 @@ 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         (* undocumented *)
+                 | IPAs of Cic.object_flavour (* preferred flavour *)
+                  | 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 *)
 
 type ('term,'lazy_term) macro = 
   (* Whelp's stuff *)
@@ -162,12 +170,12 @@ 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 = 19
+let magic = 22
 
 type ('term,'obj) command =
   | Index of loc * 'term option (* key *) * UriManager.uri (* value *)
@@ -180,7 +188,7 @@ type ('term,'obj) command =
   | UnificationHint of loc * 'term * int (* term, precedence *)
   | Default of loc * string * UriManager.uri list
   | Drop of loc
-  | Include of loc * string
+  | Include of loc * bool (* normal? *) * string 
   | Obj of loc * 'obj
   | Relation of
      loc * string * 'term * 'term * 'term option * 'term option * 'term option
@@ -188,6 +196,8 @@ type ('term,'obj) command =
   | Print of loc * string
   | Qed of loc
   | NObj of loc * CicNotationPt.term CicNotationPt.obj
+  | NUnivConstraint of loc * bool * NUri.uri * NUri.uri
+  | NQed of loc
 
 type punctuation_tactical =
   | Dot of loc
@@ -211,6 +221,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