X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite%2FgrafiteAst.ml;h=fc9ea8c5d8964c3ad5b0c647eaf234b59c1b2ecd;hb=f3ad825f16c02c0c5fca620980882e409871e6f1;hp=5668b3cba14ffae959ef58c39c5f041cf2d624e5;hpb=5649890273cf8e660bba744e84ce5fee1e5efe69;p=helm.git diff --git a/helm/software/components/grafite/grafiteAst.ml b/helm/software/components/grafite/grafiteAst.ml index 5668b3cba..fc9ea8c5d 100644 --- a/helm/software/components/grafite/grafiteAst.ml +++ b/helm/software/components/grafite/grafiteAst.ml @@ -42,6 +42,10 @@ 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 ('term, 'lazy_term, 'reduction, 'ident) tactic = (* Higher order tactics (i.e. tacticals) *) | Do of loc * int * ('term, 'lazy_term, 'reduction, 'ident) tactic @@ -102,16 +106,17 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactic = (* 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 option * 'ident * 'term * 'ident * 'lazy_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 'term auto_params