X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=components%2Fgrafite%2FgrafiteAst.ml;h=10d7b6bccad33d454a73385686ea9c085e1944fe;hb=2e3e85acace6942eebcfac570ce6b33134d1a3dd;hp=54924ff4c87351c3cd04f4eb1a963841fbdd4f5b;hpb=45d71beffd253ffd767a9afbfcec5c4f44afd8a8;p=helm.git diff --git a/components/grafite/grafiteAst.ml b/components/grafite/grafiteAst.ml index 54924ff4c..10d7b6bcc 100644 --- a/components/grafite/grafiteAst.ml +++ b/components/grafite/grafiteAst.ml @@ -46,9 +46,10 @@ 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 @@ -57,7 +58,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 +70,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 @@ -79,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 @@ -89,22 +89,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 | 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 @@ -115,20 +121,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 = 8 +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 @@ -143,6 +154,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 @@ -161,7 +173,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 *)