X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=components%2Fgrafite%2FgrafiteAst.ml;h=c7d644e6071f611d5afa30976d9a022bab5d26d0;hb=9897efac755aac85095075b7e0a967fe340092c1;hp=73ae34584d282e549736ee7e6231d83f2bec1748;hpb=6995a7717fd0c760c0608ed9225e9f2dbc14d7d1;p=helm.git

diff --git a/components/grafite/grafiteAst.ml b/components/grafite/grafiteAst.ml
index 73ae34584..c7d644e60 100644
--- a/components/grafite/grafiteAst.ml
+++ b/components/grafite/grafiteAst.ml
@@ -57,7 +57,7 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   | Cut of loc * 'ident option * 'term
   | Decompose of loc * ('term, 'ident) type_spec list * 'ident option * 'ident list
   | Demodulate of loc
-  | Discriminate of loc * 'term
+  | Destruct of loc * 'term
   | Elim of loc * 'term * 'term option * int option * 'ident list
   | ElimType of loc * 'term * 'term option * int option * 'ident list
   | Exact of loc * 'term
@@ -69,7 +69,6 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   | Generalize of loc * ('term, 'lazy_term, 'ident) pattern * 'ident option
   | Goal of loc * int (* change current goal, argument is goal number 1-based *)
   | IdTac of loc
-  | Injection of loc * 'term
   | Intros of loc * int option * 'ident list
   | Inversion of loc * 'term
   | LApply of loc * bool * int option * 'term list * 'term * 'ident option
@@ -83,15 +82,24 @@ 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 *)
   | Assume of loc * 'ident * 'term
-  | Suppose of loc * 'term *'ident
-  | By_term_we_proved of loc * 'term * 'term * 'ident
-  | We_need_to_prove of loc * 'term * 'ident
-  | Bydone of loc * 'term
-
+  | Suppose of loc * 'term *'ident * 'term option
+  | By_term_we_proved of loc *'term option * 'term * 'ident * 'term option
+  | We_need_to_prove of loc * 'term * 'ident * 'term option
+  | Bydone of loc * 'term option 
+  | We_proceed_by_induction_on of loc * 'term * 'term
+  | Byinduction of loc * 'term * 'ident
+  | Thesisbecomes of loc * 'term
+  | Case of loc * string * (string * 'term) list 
+  | ExistsElim of loc * 'term * 'ident * 'term * 'ident * 'term
+  | AndElim of loc * 'term * 'ident * 'term * 'ident * 'term
+  | RewritingStep of
+     loc * 'term option * 'term  * 'term option * Cic.name option
+  
 type search_kind = [ `Locate | `Hint | `Match | `Elim ]
 
 type print_kind = [ `Env | `Coer ]
@@ -104,29 +112,24 @@ type 'term macro =
   | WLocate of loc * string
   | WElim of loc * 'term
   (* real macros *)
-(*   | Abort of loc *)
-  | Print of loc * string
   | Check of loc * 'term 
   | Hint of loc
-  | Quit of loc
-(*   | Redo of loc * int option
-  | Undo of loc * int option *)
-(*   | Print of loc * print_kind *)
-  | Search_pat of loc * search_kind * string  (* searches with string pattern *)
-  | Search_term of loc * search_kind * 'term  (* searches with term pattern *)
 
 (** To be increased each time the command type below changes, used for "safe"
  * marshalling *)
-let magic = 5
+let magic = 10
 
-type 'obj command =
+type ('term,'obj) command =
+  | Coercion of loc * UriManager.uri * bool (* add_obj *) * int (* arity *)
   | Default of loc * string * UriManager.uri list
+  | Drop of loc
   | Include of loc * string
+  | Obj of loc * 'obj
+  | Relation of
+     loc * string * 'term * 'term * 'term option * 'term option * 'term option
   | Set of loc * string * string
-  | Drop of loc
+  | Print of loc * string
   | Qed of loc
-  | Coercion of loc * UriManager.uri * bool (* add composites *)
-  | Obj of loc * 'obj
 
 type ('term, 'lazy_term, 'reduction, 'ident) tactical =
   | Tactic of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic
@@ -141,6 +144,7 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactical =
   | Try of loc * ('term, 'lazy_term, 'reduction, 'ident) tactical
       (* try a tactical and mask failures *)
   | Solve of loc * ('term, 'lazy_term, 'reduction, 'ident) tactical list
+  | Progress of loc * ('term, 'lazy_term, 'reduction, 'ident) tactical
 
   | Dot of loc
   | Semicolon of loc
@@ -159,7 +163,7 @@ let is_punctuation =
   | _ -> false
 
 type ('term, 'lazy_term, 'reduction, 'obj, 'ident) code =
-  | Command of loc * 'obj command
+  | Command of loc * ('term, 'obj) command
   | Macro of loc * 'term macro 
   | Tactical of loc * ('term, 'lazy_term, 'reduction, 'ident) tactical
       * ('term, 'lazy_term, 'reduction, 'ident) tactical option(* punctuation *)