New syntax and semantics for the rewriting steps that make the pretty-printed

[helm.git] / components / grafite / grafiteAst.ml

diff --git a/components/grafite/grafiteAst.ml b/components/grafite/grafiteAst.ml
index 6c6b3786ff88af760114f1e1157d09209682f5be..9c5d56024917795facba7653bc89d1019a192754 100644 (file)
--- a/components/grafite/grafiteAst.ml
+++ b/components/grafite/grafiteAst.ml
@@ -46,7 +46,7 @@ type 'lazy_term reduction =
 type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   | Absurd of loc * 'term
   | Apply of loc * 'term
-  | ApplyS of loc * 'term
+  | ApplyS of loc * 'term * (string * string) list
   | Assumption of loc
   | Auto of loc * (string * string) list
   | Change of loc * ('term, 'lazy_term, 'ident) pattern * 'lazy_term
@@ -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,26 @@ 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 option * 'term option
+  | 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
+  | 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 * (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 ]
@@ -104,23 +114,26 @@ type 'term macro =
   | WLocate of loc * string
   | WElim of loc * 'term
   (* real macros *)
-  | Print of loc * string
   | Check of loc * 'term 
   | Hint of loc
-  | Quit of loc
+  | Inline of loc * string * string (* URI or base-uri, name prefix *) 
 
 (** To be increased each time the command type below changes, used for "safe"
  * marshalling *)
-let magic = 5
+let magic = 11
 
-type 'obj command =
+type ('term,'obj) command =
+  | Index of loc * 'term option (* key *) * UriManager.uri (* value *)
+  | 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
@@ -135,6 +148,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
@@ -153,7 +167,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 *)