X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FnCicPp.ml;h=782fd9566ba53f5af38a7825b31eec1d7bd10262;hb=13553fb82419f58ab61131bd4a6e04352e388b50;hp=8bcbf6ad9755d0a5fc43a7a5cc686f09e0c8ffbe;hpb=34b3404a33922e9c4b8f25c7b14dadd260990de3;p=helm.git diff --git a/helm/software/components/ng_kernel/nCicPp.ml b/helm/software/components/ng_kernel/nCicPp.ml index 8bcbf6ad9..782fd9566 100644 --- a/helm/software/components/ng_kernel/nCicPp.ml +++ b/helm/software/components/ng_kernel/nCicPp.ml @@ -57,7 +57,9 @@ let trivial_pp_term ~context ~subst ~metasenv ?(inside_fix=false) t = | C.Prod ("_",s,t) -> if not toplevel then F.fprintf f "("; F.fprintf f "@["; - aux ~toplevel:true ctx s; + (match s with + | C.Prod ("_",_,_) -> aux ~toplevel:false ctx s + | _ -> aux ~toplevel:true ctx s); F.fprintf f "@;→ "; aux ~toplevel:true ("_"::ctx) t; F.fprintf f "@]"; @@ -139,8 +141,8 @@ let ppobj = function ppterm ~metasenv ~subst ~context:[] ty ^ " :=\n"^ ppterm ~metasenv ~subst ~context:[] ~inside_fix:true bo) fl) | (u,_,metasenv,subst,NCic.Inductive (b, leftno,tyl, _)) -> - "{"^NUri.string_of_uri u^"}\n"^ - "inductive ("^string_of_int leftno^") "^ + "{"^NUri.string_of_uri u^"} with "^string_of_int leftno^" fixed params\n"^ + "inductive "^ String.concat "\nand " (List.map (fun (_,name,ty,cl) -> name^": "^ppterm ~metasenv ~subst ~context:[] ty^ " :=\n"^ @@ -149,9 +151,11 @@ let ppobj = function " | "^name^": "^ppterm ~metasenv ~subst ~context:[] ty) cl)) tyl) ^ "." | (u,_,metasenv,subst,NCic.Constant (_,name,None,ty, _)) -> + "{"^NUri.string_of_uri u^"}\n"^ "axiom " ^ name ^ " : " ^ ppterm ~metasenv ~subst ~context:[] ty ^ "\n" | (u,_,metasenv,subst,NCic.Constant (_,name,Some bo,ty, _)) -> + "{"^NUri.string_of_uri u^"}\n"^ "definition " ^ name ^ " : " ^ ppterm ~metasenv ~subst ~context:[] ty ^ " := \n"^ ppterm ~metasenv ~subst ~context:[] bo ^ "\n"