X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite%2FgrafiteAst.ml;h=5668b3cba14ffae959ef58c39c5f041cf2d624e5;hb=83a4859b0a6fec3953dae70cd6177eecd850d012;hp=d5eb9c241259efcb7fc1ff0e24d328b92f68bad8;hpb=0ad4c9bd12acf983a6490bf783f69fcbbab42989;p=helm.git

diff --git a/helm/software/components/grafite/grafiteAst.ml b/helm/software/components/grafite/grafiteAst.ml
index d5eb9c241..5668b3cba 100644
--- a/helm/software/components/grafite/grafiteAst.ml
+++ b/helm/software/components/grafite/grafiteAst.ml
@@ -27,20 +27,21 @@
 
 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
 
 type 'lazy_term reduction =
   [ `Normalize
-  | `Reduce
   | `Simpl
   | `Unfold of 'lazy_term option
   | `Whd ]
 
 type 'ident intros_spec = int option * 'ident option list
 
+type 'term auto_params = 'term list * (string*string) 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,9 +59,9 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   (* Real tactics *)
   | Absurd of loc * 'term
   | Apply of loc * 'term
-  | ApplyS of loc * 'term * (string * string) list
+  | ApplyS of loc * 'term * 'term auto_params
   | Assumption of loc
-  | AutoBatch of loc * (string * string) list
+  | AutoBatch of loc * 'term auto_params
   | Cases of loc * 'term * 'ident intros_spec
   | Change of loc * ('term, 'lazy_term, 'ident) pattern * 'lazy_term
   | Clear of loc * 'ident list
@@ -70,8 +71,8 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   | Contradiction of loc
   | Cut of loc * 'ident option * 'term
   | Decompose of loc * 'ident option list
-  | Demodulate of loc
-  | Destruct of loc * 'term
+  | Demodulate of loc * 'term auto_params
+  | 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
@@ -96,10 +97,9 @@ 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 *)
+  (* Declarative language *)
   | Assume of loc * 'ident * 'term
   | Suppose of loc * 'term *'ident * 'term option
   | By_term_we_proved of loc *'term option * 'term * 'ident option * 'term option
@@ -114,7 +114,8 @@ 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 | `Proof ] *
+      [ `Term of 'term | `Auto of 'term auto_params
+      | `Proof | `SolveWith of 'term ] *
       bool (* last step*)
   
 type search_kind = [ `Locate | `Hint | `Match | `Elim ]
@@ -134,17 +135,18 @@ type 'term macro =
   (* real macros *)
   | Check of loc * 'term 
   | Hint of loc * bool
-  | AutoInteractive of loc * (string * string) list
+  | AutoInteractive of loc * 'term auto_params
   | 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