X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite%2FgrafiteAst.ml;h=5896e116fa6f17de2ff832c77c297578105e97bd;hb=fe438bca2111e4aa8b5fbc83e2e2cb896679f580;hp=6c51fc80abf190dc8898985ebfb50215097041f1;hpb=55b82bd235d82ff7f0a40d980effe1efde1f5073;p=helm.git

diff --git a/helm/software/components/grafite/grafiteAst.ml b/helm/software/components/grafite/grafiteAst.ml
index 6c51fc80a..5896e116f 100644
--- a/helm/software/components/grafite/grafiteAst.ml
+++ b/helm/software/components/grafite/grafiteAst.ml
@@ -37,8 +37,7 @@ type ('term, 'ident) type_spec =
    | Type of UriManager.uri * int 
 
 type 'lazy_term reduction =
-  [ `Demodulate
-  | `Normalize
+  [ `Normalize
   | `Reduce
   | `Simpl
   | `Unfold of 'lazy_term option
@@ -47,18 +46,17 @@ type 'lazy_term reduction =
 type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   | Absurd of loc * 'term
   | Apply of loc * 'term
+  | ApplyS of loc * 'term
   | Assumption of loc
-  | Auto of loc * int option * int option * string option * string option 
-      (* depth, width, paramodulation, full *) (* ALB *)
+  | Auto of loc * (string * string) list
   | Change of loc * ('term, 'lazy_term, 'ident) pattern * 'lazy_term
-  | Clear of loc * 'ident
+  | Clear of loc * 'ident list
   | ClearBody of loc * 'ident
-  | Compare of loc * 'term
   | Constructor of loc * int
   | Contradiction of loc
   | Cut of loc * 'ident option * 'term
-  | DecideEquality of loc
-  | Decompose of loc * ('term, 'ident) type_spec list * 'ident * 'ident list
+  | Decompose of loc * ('term, 'ident) type_spec list * 'ident option * 'ident list
+  | Demodulate of loc
   | Discriminate of loc * 'term
   | Elim of loc * 'term * 'term option * int option * 'ident list
   | ElimType of loc * 'term * 'term option * int option * 'ident list
@@ -74,7 +72,7 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   | Injection of loc * 'term
   | Intros of loc * int option * 'ident list
   | Inversion of loc * 'term
-  | LApply of loc * int option * 'term list * 'term * 'ident option
+  | LApply of loc * bool * int option * 'term list * 'term * 'ident option
   | Left of loc
   | LetIn of loc * 'term * 'ident
   | Reduce of loc * 'reduction * ('term, 'lazy_term, 'ident) pattern 
@@ -142,7 +140,8 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactical =
   | Semicolon of loc
   | Branch of loc
   | Shift of loc
-  | Pos of loc * int
+  | Pos of loc * int list
+  | Wildcard of loc
   | Merge of loc
   | Focus of loc * int list
   | Unfocus of loc