X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite%2FgrafiteAst.ml;h=763911b79ea245ae572da11306a1008d5d5d7695;hb=b2a9b21233b1b7c645175e26fc3f3ab03a308c08;hp=d114d9322785ec15cba42c1ce1c010b26bb3c62e;hpb=4573f1fecaf83f4706f39702555d5319d132477b;p=helm.git

diff --git a/helm/software/components/grafite/grafiteAst.ml b/helm/software/components/grafite/grafiteAst.ml
index d114d9322..763911b79 100644
--- a/helm/software/components/grafite/grafiteAst.ml
+++ b/helm/software/components/grafite/grafiteAst.ml
@@ -32,6 +32,9 @@ type loc = Stdpp.location
 type ('term, 'lazy_term, 'ident) pattern =
   'lazy_term option * ('ident * 'term) list * 'term option
 
+type npattern = 
+ CicNotationPt.term option * (string * CicNotationPt.term) list * CicNotationPt.term option
+
 type 'lazy_term reduction =
   [ `Normalize
   | `Simpl
@@ -46,6 +49,18 @@ type 'term just =
  [ `Term of 'term
  | `Auto of 'term auto_params ]
 
+type ntactic =
+   | NApply of loc * CicNotationPt.term
+   | 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
+   | NRewrite of loc * direction * CicNotationPt.term * npattern
+
 type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   (* Higher order tactics (i.e. tacticals) *)
   | Do of loc * int * ('term, 'lazy_term, 'reduction, 'ident) tactic
@@ -150,7 +165,7 @@ type ('term,'lazy_term) macro =
 
 (** To be increased each time the command type below changes, used for "safe"
  * marshalling *)
-let magic = 16
+let magic = 17
 
 type ('term,'obj) command =
   | Index of loc * 'term option (* key *) * UriManager.uri (* value *)
@@ -167,8 +182,9 @@ type ('term,'obj) command =
   | Set of loc * string * string
   | Print of loc * string
   | Qed of loc
+  | NObj of loc * CicNotationPt.term CicNotationPt.obj
 
-type ('term, 'lazy_term, 'reduction, 'ident) punctuation_tactical =
+type punctuation_tactical =
   | Dot of loc
   | Semicolon of loc
   | Branch of loc
@@ -177,7 +193,7 @@ type ('term, 'lazy_term, 'reduction, 'ident) punctuation_tactical =
   | Wildcard of loc
   | Merge of loc
 
-type ('term,'lazy_term,'reduction,'ident) non_punctuation_tactical =
+type non_punctuation_tactical =
   | Focus of loc * int list
   | Unfocus of loc
   | Skip of loc
@@ -185,11 +201,11 @@ type ('term,'lazy_term,'reduction,'ident) non_punctuation_tactical =
 type ('term, 'lazy_term, 'reduction, 'obj, 'ident) code =
   | Command of loc * ('term, 'obj) command
   | Macro of loc * ('term,'lazy_term) macro 
+  | NTactic of loc * ntactic * punctuation_tactical
   | Tactic of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic option
-      * ('term, 'lazy_term, 'reduction, 'ident) punctuation_tactical
-  | NonPunctuationTactical of loc
-      * ('term, 'lazy_term, 'reduction, 'ident) non_punctuation_tactical
-      * ('term, 'lazy_term, 'reduction, 'ident) punctuation_tactical
+      * punctuation_tactical
+  | NonPunctuationTactical of loc * non_punctuation_tactical
+      * punctuation_tactical
              
 type ('term, 'lazy_term, 'reduction, 'obj, 'ident) comment =
   | Note of loc * string