X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=components%2Fgrafite%2FgrafiteAst.ml;h=9a453ae42d196f2ddc844e5d5856d82035ca2737;hb=936f80cf031a7b034dd70fef49abb90e69f2e680;hp=c7d644e6071f611d5afa30976d9a022bab5d26d0;hpb=e53c9d7cf1a5d3d33c41cad5b046b018a62a9d2d;p=helm.git diff --git a/components/grafite/grafiteAst.ml b/components/grafite/grafiteAst.ml index c7d644e60..9a453ae42 100644 --- a/components/grafite/grafiteAst.ml +++ b/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 @@ -43,33 +39,51 @@ type 'lazy_term reduction = | `Unfold of 'lazy_term option | `Whd ] +type 'ident intros_spec = int option * 'ident option list + type ('term, 'lazy_term, 'reduction, 'ident) tactic = + (* Higher order tactics (i.e. tacticals) *) + | Do of loc * int * ('term, 'lazy_term, 'reduction, 'ident) tactic + | Repeat of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic + | Seq of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic list + (* sequential composition *) + | Then of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic * + ('term, 'lazy_term, 'reduction, 'ident) tactic list + | First of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic list + (* try a sequence of loc * tactic until one succeeds, fail otherwise *) + | Try of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic + (* try a tactic and mask failures *) + | Solve of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic list + | Progress of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic + (* Real tactics *) | 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 + | AutoBatch of loc * (string * string) list + | Cases of loc * 'term * 'ident intros_spec | Change of loc * ('term, 'lazy_term, 'ident) pattern * 'lazy_term | Clear of loc * 'ident list | ClearBody of loc * 'ident + | Compose of loc * 'term * 'term * 'ident intros_spec | 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 option list | Demodulate of loc | Destruct of loc * 'term - | Elim of loc * 'term * 'term option * int option * 'ident list - | ElimType of loc * 'term * 'term option * int option * 'ident list + | Elim of loc * 'term * 'term option * ('term, 'lazy_term, 'ident) pattern * + 'ident intros_spec + | ElimType of loc * 'term * 'term option * 'ident intros_spec | Exact of loc * 'term | Exists of loc | Fail of loc | Fold of loc * 'reduction * 'lazy_term * ('term, 'lazy_term, 'ident) pattern | Fourier of loc - | FwdSimpl of loc * string * 'ident list + | FwdSimpl of loc * string * 'ident option list | 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 - | Intros of loc * int option * 'ident list + | Intros of loc * 'ident intros_spec | Inversion of loc * 'term | LApply of loc * bool * int option * 'term list * 'term * 'ident option | Left of loc @@ -78,7 +92,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 option list | Right of loc | Ring of loc | Split of loc @@ -88,22 +102,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,12 +134,16 @@ type 'term macro = (* real macros *) | Check of loc * 'term | Hint of loc + | AutoInteractive of loc * (string * string) list + | 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 = 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 @@ -131,21 +155,7 @@ type ('term,'obj) command = | Print of loc * string | Qed of loc -type ('term, 'lazy_term, 'reduction, 'ident) tactical = - | Tactic of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic - | Do of loc * int * ('term, 'lazy_term, 'reduction, 'ident) tactical - | Repeat of loc * ('term, 'lazy_term, 'reduction, 'ident) tactical - | Seq of loc * ('term, 'lazy_term, 'reduction, 'ident) tactical list - (* sequential composition *) - | Then of loc * ('term, 'lazy_term, 'reduction, 'ident) tactical * - ('term, 'lazy_term, 'reduction, 'ident) tactical list - | First of loc * ('term, 'lazy_term, 'reduction, 'ident) tactical list - (* try a sequence of loc * tactical until one succeeds, fail otherwise *) - | 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 - +type ('term, 'lazy_term, 'reduction, 'ident) punctuation_tactical = | Dot of loc | Semicolon of loc | Branch of loc @@ -153,20 +163,20 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactical = | Pos of loc * int list | Wildcard of loc | Merge of loc + +type ('term,'lazy_term,'reduction,'ident) non_punctuation_tactical = | Focus of loc * int list | Unfocus of loc | Skip of loc -let is_punctuation = - function - | Dot _ | Semicolon _ | Branch _ | Shift _ | Merge _ | Pos _ -> true - | _ -> false - type ('term, 'lazy_term, 'reduction, 'obj, 'ident) code = | 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 *) + | Tactic of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic option + * ('term, 'lazy_term, 'reduction, 'ident) punctuation_tactical + | NonPunctuationTactical of loc + * ('term, 'lazy_term, 'reduction, 'ident) non_punctuation_tactical + * ('term, 'lazy_term, 'reduction, 'ident) punctuation_tactical type ('term, 'lazy_term, 'reduction, 'obj, 'ident) comment = | Note of loc * string