X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=components%2Fgrafite%2FgrafiteAst.ml;h=10d7b6bccad33d454a73385686ea9c085e1944fe;hb=2e3e85acace6942eebcfac570ce6b33134d1a3dd;hp=26a65b53139f4dc8ba26e576b34ac3ba2cfae405;hpb=885b29af55a246589b6a8966d9d1438fbb8155d3;p=helm.git

diff --git a/components/grafite/grafiteAst.ml b/components/grafite/grafiteAst.ml
index 26a65b531..10d7b6bcc 100644
--- a/components/grafite/grafiteAst.ml
+++ b/components/grafite/grafiteAst.ml
@@ -49,6 +49,7 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   | ApplyS of loc * 'term * (string * string) list
   | Assumption of loc
   | Auto of loc * (string * string) list
+  | Cases of loc * 'term * 'ident list
   | Change of loc * ('term, 'lazy_term, 'ident) pattern * 'lazy_term
   | Clear of loc * 'ident list
   | ClearBody of loc * 'ident
@@ -78,7 +79,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
+      ('term, 'lazy_term, 'ident) pattern * 'ident list
   | Right of loc
   | Ring of loc
   | Split of loc
@@ -92,18 +93,24 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   | We_need_to_prove of loc * 'term * 'ident option * 'term option
   | Bydone of loc * 'term option 
   | We_proceed_by_induction_on of loc * 'term * 'term
+  | We_proceed_by_cases_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
+     loc * (string option * 'term) option * 'term  *
+      [ `Term of 'term | `Auto of (string * string) list ] *
+      bool (* last step*)
   
 type search_kind = [ `Locate | `Hint | `Match | `Elim ]
 
 type print_kind = [ `Env | `Coer ]
 
+type presentation_style = Declarative
+                        | Procedural of int option
+
 type 'term macro = 
   (* Whelp's stuff *)
   | WHint of loc * 'term 
@@ -114,7 +121,8 @@ type 'term macro =
   (* real macros *)
   | Check of loc * 'term 
   | Hint of loc
-  | Inline of loc * string * string (* URI or base-uri, name prefix *) 
+  | 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 *)