X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fcomponents%2Fng_tactics%2FnCicElim.ml;h=582f7353b01a5f08441f175c94acb1a907587ee2;hb=53b8e2af661ad4165aa0b1deccd0a7522d96ce2e;hp=24fd7d8e9aa0eb65104e4bc7154632985f1e0d39;hpb=638616469ffdd7ba446ed0466e60ccf81a7b42cd;p=helm.git diff --git a/matita/components/ng_tactics/nCicElim.ml b/matita/components/ng_tactics/nCicElim.ml index 24fd7d8e9..582f7353b 100644 --- a/matita/components/ng_tactics/nCicElim.ml +++ b/matita/components/ng_tactics/nCicElim.ml @@ -130,9 +130,10 @@ let mk_elim status uri leftno it (outsort,suffix) pragma = List.map (function name -> name, None) args in let recno = List.length final_params in let where = recno - 1 in + let attrs = `Generated, `Definition, pragma in let res = NotationPt.LetRec (`Inductive, - [final_params, (rec_name,ty), bo, where], rec_name) + [final_params, (rec_name,ty), bo, where], attrs) in (* prerr_endline @@ -166,9 +167,7 @@ let mk_elim status uri leftno it (outsort,suffix) pragma = (function x::_ -> x | _ -> assert false) 80 (NotationPres.mpres_of_box boxml))); *) - NotationPt.Theorem - (`Definition,srec_name, - NotationPt.Implicit `JustOne,Some res,pragma) + res ;; let ast_of_sort s = @@ -225,9 +224,7 @@ let pp (status: #NCic.status) = let rec pp rels = function NCic.Rel i -> List.nth rels (i - 1) - | NCic.Const _ as t -> - NotationPt.Ident - (status#ppterm ~metasenv:[] ~subst:[] ~context:[] t,None) + | NCic.Const _ as t -> NotationPt.NCic t | NCic.Sort s -> NotationPt.Sort (fst (ast_of_sort s)) | NCic.Meta _ | NCic.Implicit _ -> assert false @@ -238,7 +235,7 @@ let pp (status: #NCic.status) = | NCic.Lambda (n,s,t) -> let n = mk_id n in NotationPt.Binder (`Lambda, (n,Some (pp rels s)), pp (n::rels) t) - | NCic.LetIn (n,s,ty,t) -> + | NCic.LetIn (n,ty,s,t) -> let n = mk_id n in NotationPt.LetIn ((n, Some (pp rels ty)), pp rels s, pp (n::rels) t) | NCic.Match (NReference.Ref (uri,_) as r,outty,te,patterns) -> @@ -301,17 +298,17 @@ let mk_projection status leftno tyname consname consty (projname,_,_) i = in let params,bo = aux [] consty leftno in let pprojname = mk_id projname in + let attrs = `Generated, `Definition, `Projection in let res = NotationPt.LetRec (`Inductive, - [params, (pprojname,None), bo, leftno], pprojname) in + [params, (pprojname,None), bo, leftno], attrs) in (* prerr_endline (BoxPp.render_to_string ~map_unicode_to_tex:false (function x::_ -> x | _ -> assert false) 80 (NotationPres.render (fun _ -> None) (TermContentPres.pp_ast res)));*) - NotationPt.Theorem - (`Definition,projname,NotationPt.Implicit `JustOne,Some res,`Projection) + res ;; let mk_projections status (_,_,_,_,obj) =