1) the home button of CicBrowser now works also for NG

[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 4006320be2a2a58e770e8cf80efdbecce13939db..dcfaf6c05f2ddd091c6ee1af55c92c7477bc7a94 100644 (file)
--- a/helm/software/components/grafite/grafiteAst.ml
+++ b/helm/software/components/grafite/grafiteAst.ml
@@ -56,11 +56,11 @@ 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
 
 type ('term, 'lazy_term, 'reduction, 'ident) tactic =
@@ -148,10 +148,11 @@ type search_kind = [ `Locate | `Hint | `Match | `Elim ]
 type print_kind = [ `Env | `Coer ]
 
 type inline_param = IPPrefix of string
-                  | IPProcedural
-                  | IPDepth of int
                  | IPAs of Cic.object_flavour
+                  | IPProcedural
                   | IPNoDefaults 
+                 | IPLevel of int
+                  | IPDepth of int
 
 type ('term,'lazy_term) macro = 
   (* Whelp's stuff *)
@@ -170,7 +171,7 @@ type ('term,'lazy_term) macro =
 
 (** To be increased each time the command type below changes, used for "safe"
  * marshalling *)
-let magic = 19
+let magic = 21
 
 type ('term,'obj) command =
   | Index of loc * 'term option (* key *) * UriManager.uri (* value *)
@@ -183,7 +184,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 (* source? *) * string 
   | Obj of loc * 'obj
   | Relation of
      loc * string * 'term * 'term * 'term option * 'term option * 'term option
@@ -191,6 +192,7 @@ 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 =
@@ -215,6 +217,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