X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite%2FgrafiteAst.ml;h=14c4877026b82615f5da807bb55f1f54b991ab3d;hb=4dc87cc7384ba61136bc82a23effe6a52160e720;hp=10d7b6bccad33d454a73385686ea9c085e1944fe;hpb=77d56df4d446307199a9d4e03478260c6c63baf8;p=helm.git diff --git a/helm/software/components/grafite/grafiteAst.ml b/helm/software/components/grafite/grafiteAst.ml index 10d7b6bcc..14c487702 100644 --- a/helm/software/components/grafite/grafiteAst.ml +++ b/helm/software/components/grafite/grafiteAst.ml @@ -27,50 +27,103 @@ type direction = [ `LeftToRight | `RightToLeft ] -type loc = Token.flocation +type loc = Stdpp.location 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 npattern = + CicNotationPt.term option * (string * CicNotationPt.term) list * CicNotationPt.term option type 'lazy_term reduction = [ `Normalize - | `Reduce | `Simpl | `Unfold of 'lazy_term option | `Whd ] +type 'ident intros_spec = int option * 'ident option list + +type 'term auto_params = 'term list * (string*string) list + +type 'term just = + [ `Term of 'term + | `Auto of 'term auto_params ] + +type ntactic = + | NApply of loc * CicNotationPt.term + | NAssert of loc * ((string * [`Decl of CicNotationPt.term | `Def of CicNotationPt.term * CicNotationPt.term]) list * CicNotationPt.term) list + | NCases of loc * CicNotationPt.term * npattern + | NCase1 of loc * string + | NChange of loc * npattern * CicNotationPt.term + | NElim of loc * CicNotationPt.term * npattern + | NGeneralize of loc * npattern + | NId of loc + | NIntro of loc * string + | NLetIn of loc * npattern * CicNotationPt.term * string + | NReduce of loc * [ `Normalize of bool | `Whd of bool ] * npattern + | NRewrite of loc * direction * CicNotationPt.term * npattern + | NAuto of loc * CicNotationPt.term auto_params + | NDot of loc + | NSemicolon of loc + | NBranch of loc + | NShift of loc + | NPos of loc * int list + | NWildcard of loc + | NMerge of loc + | NSkip of loc + | NFocus of loc * int list + | NUnfocus of loc + | NTry of loc * ntactic + | NAssumption of loc + | NRepeat of loc * ntactic + | NBlock of loc * ntactic 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 * (string * string) list + | ApplyRule of loc * 'term + | ApplyP of loc * 'term (* apply for procedural reconstruction *) + | ApplyS of loc * 'term * 'term auto_params | Assumption of loc - | Auto of loc * (string * string) list - | Cases of loc * 'term * 'ident list + | AutoBatch of loc * 'term auto_params + | Cases of loc * 'term * ('term, 'lazy_term, 'ident) pattern * + '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 option * int * '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 - | 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 + | Decompose of loc * 'ident option list + | Demodulate of loc * 'term auto_params + | Destruct of loc * 'term list option + | 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 @@ -79,61 +132,77 @@ 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 * 'ident list + ('term, 'lazy_term, 'ident) pattern * 'ident option list | Right of loc | Ring of loc | Split of loc - | Subst of loc | Symmetry of loc | Transitivity of loc * 'term - (* Costruttori Aggiunti *) + (* Declarative language *) | Assume of loc * 'ident * 'term | Suppose of loc * 'term *'ident * 'term option - | By_term_we_proved of loc *'term option * 'term * 'ident option * 'term option + | By_just_we_proved of loc * 'term just * + 'term * 'ident option * 'term option | We_need_to_prove of loc * 'term * 'ident option * 'term option - | Bydone of loc * 'term option + | Bydone of loc * 'term just | 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 + | ExistsElim of loc * 'term just * 'ident * 'term * 'ident * 'lazy_term + | AndElim of loc * 'term just * 'ident * 'term * 'ident * 'term | RewritingStep of loc * (string option * 'term) option * 'term * - [ `Term of 'term | `Auto of (string * string) list ] * + [ `Term of 'term | `Auto of 'term auto_params + | `Proof | `SolveWith of 'term ] * 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 = +type inline_param = IPPrefix of string (* undocumented *) + | IPAs of Cic.object_flavour (* preferred flavour *) + | IPCoercions (* show coercions *) + | IPDebug of int (* set debug level *) + | IPProcedural (* procedural rendering *) + | IPNoDefaults (* no default-based tactics *) + | IPLevel of int (* granularity level *) + | IPDepth of int (* undocumented *) + | IPComments (* show statistics *) + | IPCR (* detect convertible rewriting *) + +type ('term,'lazy_term) macro = (* Whelp's stuff *) - | WHint of loc * 'term + | WHint of loc * 'term | WMatch of loc * 'term | WInstance of loc * 'term | WLocate of loc * string | WElim of loc * 'term (* real macros *) + | Eval of loc * 'lazy_term reduction * 'term | Check of loc * 'term - | Hint of loc - | Inline of loc * presentation_style * string * string - (* URI or base-uri, name prefix *) + | Hint of loc * bool + | AutoInteractive of loc * 'term auto_params + | Inline of loc * string * inline_param list + (* URI or base-uri, parameters *) (** To be increased each time the command type below changes, used for "safe" * marshalling *) -let magic = 11 +let magic = 25 type ('term,'obj) command = | Index of loc * 'term option (* key *) * UriManager.uri (* value *) - | Coercion of loc * UriManager.uri * bool (* add_obj *) * int (* arity *) + | Select of loc * UriManager.uri + | Pump of loc * int + | Coercion of loc * 'term * bool (* add_obj *) * + int (* arity *) * int (* saturations *) + | PreferCoercion of loc * 'term + | Inverter of loc * string * 'term * bool list | Default of loc * string * UriManager.uri list | Drop of loc - | Include of loc * string + | Include of loc * bool (* normal? *) * [`New | `OldAndNew] * string | Obj of loc * 'obj | Relation of loc * string * 'term * 'term * 'term option * 'term option * 'term option @@ -141,21 +210,13 @@ 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 ncommand = + | UnificationHint of loc * CicNotationPt.term * int (* term, precedence *) + | NObj of loc * CicNotationPt.term CicNotationPt.obj + | NUnivConstraint of loc * bool * NUri.uri * NUri.uri + | NQed of loc +type punctuation_tactical = | Dot of loc | Semicolon of loc | Branch of loc @@ -163,20 +224,21 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactical = | Pos of loc * int list | Wildcard of loc | Merge of loc + +type 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 *) + | NCommand of loc * ncommand + | Macro of loc * ('term,'lazy_term) macro + | NTactic of loc * ntactic list + | Tactic of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic option + * punctuation_tactical + | NonPunctuationTactical of loc * non_punctuation_tactical + * punctuation_tactical type ('term, 'lazy_term, 'reduction, 'obj, 'ident) comment = | Note of loc * string