X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite%2FgrafiteAst.ml;h=b0c25bc1e361f2a8ea892bd3686c9b8fa80cbd96;hb=25994144125d60389df12799062793d30203bcab;hp=d7b929de323fa12c0d6be8e37e4890ddeb8d5b02;hpb=50afaf262195266d156f594cff7e92a6e8898b3e;p=helm.git

diff --git a/helm/software/components/grafite/grafiteAst.ml b/helm/software/components/grafite/grafiteAst.ml
index d7b929de3..b0c25bc1e 100644
--- a/helm/software/components/grafite/grafiteAst.ml
+++ b/helm/software/components/grafite/grafiteAst.ml
@@ -39,6 +39,8 @@ type 'lazy_term reduction =
   | `Unfold of 'lazy_term option
   | `Whd ]
 
+type 'ident intros_spec = int option * 'ident option list
+
 type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   (* Higher order tactics (i.e. tacticals) *)
   | Do of loc * int * ('term, 'lazy_term, 'reduction, 'ident) tactic
@@ -58,29 +60,30 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   | Apply of loc * 'term
   | ApplyS of loc * 'term * (string * string) list
   | Assumption of loc
-  | Auto of loc * (string * string) list
-  | Cases of loc * 'term * 'ident list
+  | AutoBatch of loc * (string * string) list
+  | Cases of loc * 'term * 'ident intros_spec
   | 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 list
+  | Decompose of loc * 'ident option list
   | Demodulate of loc
   | Destruct of loc * 'term
   | Elim of loc * 'term * 'term option * ('term, 'lazy_term, 'ident) pattern *
-	    int option * 'ident list
-  | ElimType of loc * 'term * 'term option * int option * 'ident list
+	    'ident intros_spec
+  | ElimType of loc * 'term * 'term option * 'ident intros_spec
   | Exact of loc * 'term
   | Exists of loc
   | Fail of loc
   | Fold of loc * 'reduction * 'lazy_term * ('term, 'lazy_term, 'ident) pattern
   | Fourier of loc
-  | FwdSimpl of loc * string * 'ident list
+  | FwdSimpl of loc * string * 'ident option list
   | Generalize of loc * ('term, 'lazy_term, 'ident) pattern * 'ident option
   | IdTac of loc
-  | Intros of loc * int option * 'ident list
+  | Intros of loc * 'ident intros_spec
   | Inversion of loc * 'term
   | LApply of loc * bool * int option * 'term list * 'term * 'ident option
   | Left of loc
@@ -89,7 +92,7 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   | Reflexivity of loc
   | Replace of loc * ('term, 'lazy_term, 'ident) pattern * 'lazy_term
   | Rewrite of loc * direction * 'term *
-      ('term, 'lazy_term, 'ident) pattern * 'ident list
+      ('term, 'lazy_term, 'ident) pattern * 'ident option list
   | Right of loc
   | Ring of loc
   | Split of loc
@@ -111,7 +114,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 ]
@@ -123,24 +126,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