X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite%2FgrafiteAst.ml;h=e8811830380cef794daf7f38c68348ae8a959dd8;hb=ac1f50b898154dc3d74aa8fa2fff212a7d3a235c;hp=6bde8baee99f366f26dc66094544096c87f3aff3;hpb=ccd1ec9a248921b2c81817b1a7f6f0a2f27d5c32;p=helm.git

diff --git a/helm/software/components/grafite/grafiteAst.ml b/helm/software/components/grafite/grafiteAst.ml
index 6bde8baee..e88118303 100644
--- a/helm/software/components/grafite/grafiteAst.ml
+++ b/helm/software/components/grafite/grafiteAst.ml
@@ -32,10 +32,6 @@ type loc = Token.flocation
 type ('term, 'lazy_term, 'ident) pattern =
   'lazy_term option * ('ident * 'term) list * 'term option
 
-type ('term, 'ident) type_spec =
-   | Ident of 'ident
-   | Type of UriManager.uri * int 
-
 type 'lazy_term reduction =
   [ `Normalize
   | `Reduce
@@ -46,19 +42,21 @@ 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
+  | 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
   | Constructor of loc * int
   | Contradiction of loc
   | Cut of loc * 'ident option * 'term
-  | Decompose of loc * ('term, 'ident) type_spec list * 'ident option * 'ident list
+  | Decompose of loc * 'ident list
   | Demodulate of loc
   | Destruct of loc * 'term
-  | Elim of loc * 'term * 'term option * int option * 'ident list
+  | Elim of loc * 'term * 'term option * ('term, 'lazy_term, 'ident) pattern *
+	    int option * 'ident list
   | ElimType of loc * 'term * 'term option * int option * 'ident list
   | Exact of loc * 'term
   | Exists of loc
@@ -78,7 +76,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
@@ -88,22 +86,28 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   (* Costruttori Aggiunti *)
   | Assume of loc * 'ident * '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
+  | 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
+  | 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
+  | ExistsElim of loc * 'term option * 'ident * 'term * 'ident * 'lazy_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,20 +118,25 @@ type 'term macro =
   (* real macros *)
   | Check of loc * 'term 
   | Hint of loc
+  | 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 = 9
+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_obj *) * int (* arity *)
-  | Obj of loc * 'obj
 
 type ('term, 'lazy_term, 'reduction, 'ident) tactical =
   | Tactic of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic
@@ -161,7 +170,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 *)