X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=components%2Fgrafite%2FgrafiteAst.ml;h=9c5d56024917795facba7653bc89d1019a192754;hb=e6454d89343d6ad3195360a0d5a584d5ad3a3575;hp=6ab2b2fc694402d63316e77b53ebf83dd2a37bce;hpb=afea2be14c1c197e0804e8607fc6dcc49ce46955;p=helm.git

diff --git a/components/grafite/grafiteAst.ml b/components/grafite/grafiteAst.ml
index 6ab2b2fc6..9c5d56024 100644
--- 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
@@ -88,8 +88,8 @@ 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
   | Byinduction of loc * 'term * 'ident
@@ -98,7 +98,9 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   | 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 ]
 
@@ -114,13 +116,14 @@ type 'term macro =
   (* real macros *)
   | Check of loc * 'term 
   | Hint of loc
-  | Inline of loc * string (* the string is a URI or a base-uri *)
+  | 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 = 10
+let magic = 11
 
 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