X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=inline;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FnCicPp.ml;h=72088e48b1c4bd9b1544ce228c0590ded9056464;hb=1ebf8777baa6ab8624e02908f9c8b4b13a6a572f;hp=216da00a40fc96aeaf617c458a399e10faafde82;hpb=9e86c8d0eb60817cc583568343b265dddceae93d;p=helm.git diff --git a/helm/software/components/ng_kernel/nCicPp.ml b/helm/software/components/ng_kernel/nCicPp.ml index 216da00a4..72088e48b 100644 --- a/helm/software/components/ng_kernel/nCicPp.ml +++ b/helm/software/components/ng_kernel/nCicPp.ml @@ -47,70 +47,86 @@ let trivial_pp_term ~context ~subst ~metasenv ?(inside_fix=false) t = let buff = Buffer.create 100 in let f = Format.formatter_of_buffer buff in let module F = Format in - let rec aux ctx = function + let rec aux ?(toplevel=false) ctx = function | C.Rel m -> - (try F.fprintf f "%s" (List.nth ctx (m-1)) - with Failure _ -> F.fprintf f " -%d" (m - List.length context)) + (try + let name = List.nth ctx (m-1) in + F.fprintf f "%s" (if name = "_" then "__"^string_of_int m else name) + with Failure _ -> F.fprintf f " -%d" (m - List.length context)) | C.Const r -> F.fprintf f "%s" (r2s inside_fix r) | C.Prod ("_",s,t) -> + if not toplevel then F.fprintf f "("; F.fprintf f "@["; - aux ctx s; + (match s with + | C.Prod ("_",_,_) -> aux ~toplevel:false ctx s + | _ -> aux ~toplevel:true ctx s); F.fprintf f "@;→ "; - aux ("_"::ctx) t; + aux ~toplevel:true ("_"::ctx) t; F.fprintf f "@]"; + if not toplevel then F.fprintf f ")"; | C.Prod (name,s,t) -> + if not toplevel then F.fprintf f "("; F.fprintf f "@["; F.fprintf f "@[∀%s:@;" name; - aux ctx s; + aux ~toplevel:true ctx s; F.fprintf f "@].@;"; - aux (name::ctx) t; + aux ~toplevel:true (name::ctx) t; F.fprintf f "@]"; + if not toplevel then F.fprintf f ")"; | C.Lambda (name,s,t) -> + if not toplevel then F.fprintf f "("; F.fprintf f "@["; F.fprintf f "λ%s:" name; - aux ctx s; + aux ~toplevel:true ctx s; F.fprintf f ".@;"; - aux (name::ctx) t; + aux ~toplevel:true (name::ctx) t; F.fprintf f "@]"; + if not toplevel then F.fprintf f ")"; | C.LetIn (name,ty,t,b) -> - F.fprintf f "let %s:" name; - aux ctx ty; - F.fprintf f "≝@;"; - aux ctx t; - F.fprintf f "in@;"; - (aux (name::ctx) b) + if not toplevel then F.fprintf f "("; + F.fprintf f "@["; + F.fprintf f "let %s:@;" name; + aux ~toplevel:true ctx ty; + F.fprintf f "@;≝ "; + aux ~toplevel:true ctx t; + F.fprintf f "@;in@;"; + (aux ~toplevel:true (name::ctx) b); + F.fprintf f "@]"; + if not toplevel then F.fprintf f ")"; | C.Match (r,oty,t,pl) -> F.fprintf f "@[match "; - aux ctx t; + aux ~toplevel:true ctx t; F.fprintf f "@;return "; - aux ctx oty; + aux ~toplevel:true ctx oty; F.fprintf f "@; @[[ "; if pl <> [] then begin F.fprintf f "@[%s ⇒@;" (r2s inside_fix (R.mk_constructor 1 r)); - aux ctx (List.hd pl); + aux ~toplevel:true ctx (List.hd pl); F.fprintf f "@]"; ignore(List.fold_left (fun i t -> F.fprintf f "@;| @[%s ⇒@;" (r2s inside_fix (R.mk_constructor i r)); - aux ctx t; + aux ~toplevel:true ctx t; F.fprintf f "@]"; i+1) 2 (List.tl pl)); end; F.fprintf f "]@] @]"; | C.Appl l -> - F.fprintf f "@[("; + F.fprintf f "@["; + if not toplevel then F.fprintf f "("; aux ctx (List.hd l); List.iter (fun x -> F.fprintf f "@;";aux ctx x) (List.tl l); - F.fprintf f ")@]" + if not toplevel then F.fprintf f ")"; + F.fprintf f "@]" | C.Implicit _ -> F.fprintf f "?" | C.Meta (n,_) -> F.fprintf f "?%d" n | C.Sort C.Prop -> F.fprintf f "Prop" | C.Sort C.CProp -> F.fprintf f "CProp" | C.Sort (C.Type n) -> F.fprintf f "Type%d" n in - aux (List.map fst context) t; + aux ~toplevel:true (List.map fst context) t; F.fprintf f "@?"; Buffer.contents buff ;; @@ -119,19 +135,39 @@ let ppobj = function | (u,_,metasenv,subst,NCic.Fixpoint (b, fl, _)) -> "{"^NUri.string_of_uri u^"}\n"^ "let rec "^ - String.concat "\nand " (fst - (List.fold_right (fun (_,name,n,ty,bo) (l,i) -> - ((name^ - " on " ^ string_of_int n ^ " : " ^ + String.concat "\nand " + (List.map (fun (_,name,n,ty,bo) -> + name^ " on " ^ string_of_int n ^ " : " ^ ppterm ~metasenv ~subst ~context:[] ty ^ " :=\n"^ - ppterm ~metasenv ~subst ~context:[] ~inside_fix:true bo) :: l),i-1) fl - ([],List.length fl))) - | (u,_,_,_,NCic.Inductive (b, _,tyl, _)) -> "inductive" + ppterm ~metasenv ~subst ~context:[] ~inside_fix:true bo) fl) + | (u,_,metasenv,subst,NCic.Inductive (b, leftno,tyl, _)) -> + "{"^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"^ + String.concat "\n" + (List.map (fun (_,name,ty) -> + " | "^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" ;; + +let rec ppcontext ~subst ~metasenv = function + | [] -> "" + | (name, NCic.Decl t) :: tl -> + ppcontext ~subst ~metasenv tl ^ + name ^ ": " ^ ppterm ~subst ~metasenv ~context:tl t ^ "\n" + | (name, NCic.Def (bo,ty)) :: tl-> + ppcontext ~subst ~metasenv tl ^ + name ^ ": " ^ ppterm ~subst ~metasenv ~context:tl ty ^ + " := " ^ ppterm ~subst ~metasenv ~context:tl bo ^ "\n" +;;