X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite%2FgrafiteAst.ml;h=2b0f4db5f1ad329091df4241cbf1247e466e67cf;hb=c036cf8b560ad40dbc06e94530af938e6f994aca;hp=2dc077f063ffb125125795b091a9fc91f7c52dce;hpb=cf4088e2cabcbce9b112f1e1fd5cfd38fe16d427;p=helm.git

diff --git a/helm/software/components/grafite/grafiteAst.ml b/helm/software/components/grafite/grafiteAst.ml
index 2dc077f06..2b0f4db5f 100644
--- a/helm/software/components/grafite/grafiteAst.ml
+++ b/helm/software/components/grafite/grafiteAst.ml
@@ -27,7 +27,7 @@
 
 type direction = [ `LeftToRight | `RightToLeft ]
 
-type loc = Token.flocation
+type loc = Stdpp.location
 
 type ('term, 'lazy_term, 'ident) pattern =
   'lazy_term option * ('ident * 'term) list * 'term option
@@ -65,12 +65,13 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   | Change of loc * ('term, 'lazy_term, 'ident) pattern * 'lazy_term
   | Clear of loc * 'ident list
   | ClearBody of loc * 'ident
+  | Compose of loc * 'term * 'term option * int * 'ident intros_spec
   | Constructor of loc * int
   | Contradiction of loc
   | Cut of loc * 'ident option * 'term
   | Decompose of loc * 'ident option list
   | Demodulate of loc
-  | Destruct of loc * 'term
+  | Destruct of loc * 'term list option
   | Elim of loc * 'term * 'term option * ('term, 'lazy_term, 'ident) pattern *
 	    'ident intros_spec
   | ElimType of loc * 'term * 'term option * 'ident intros_spec
@@ -95,7 +96,6 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   | Right of loc
   | Ring of loc
   | Split of loc
-  | Subst of loc
   | Symmetry of loc
   | Transitivity of loc * 'term
   (* Costruttori Aggiunti *)
@@ -113,7 +113,7 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   | AndElim of loc * 'term * 'ident * 'term * 'ident * 'term
   | RewritingStep of
      loc * (string option * 'term) option * 'term  *
-      [ `Term of 'term | `Auto of (string * string) list ] *
+      [ `Term of 'term | `Auto of (string * string) list | `Proof ] *
       bool (* last step*)
   
 type search_kind = [ `Locate | `Hint | `Match | `Elim ]
@@ -125,25 +125,26 @@ type presentation_style = Declarative
 
 type 'term macro = 
   (* Whelp's stuff *)
-  | WHint of loc * 'term 
+  | WHint of loc * 'term
   | WMatch of loc * 'term 
   | WInstance of loc * 'term 
   | WLocate of loc * string
   | WElim of loc * 'term
   (* real macros *)
   | Check of loc * 'term 
-  | Hint of loc
+  | Hint of loc * bool
   | AutoInteractive of loc * (string * string) list
   | Inline of loc * presentation_style * string * string 
      (* URI or base-uri, name prefix *) 
 
 (** To be increased each time the command type below changes, used for "safe"
  * marshalling *)
-let magic = 11
+let magic = 12
 
 type ('term,'obj) command =
   | Index of loc * 'term option (* key *) * UriManager.uri (* value *)
-  | Coercion of loc * UriManager.uri * bool (* add_obj *) * int (* arity *)
+  | Coercion of loc * UriManager.uri * bool (* add_obj *) *
+     int (* arity *) * int (* saturations *)
   | Default of loc * string * UriManager.uri list
   | Drop of loc
   | Include of loc * string