X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FnCicPp.ml;h=00ea9f24e32e5a79b2a71877d6361c9e13cd9a49;hb=a89360d64f1fcbba917ad743b97a2d973ecf6db2;hp=782fd9566ba53f5af38a7825b31eec1d7bd10262;hpb=13553fb82419f58ab61131bd4a6e04352e388b50;p=helm.git diff --git a/helm/software/components/ng_kernel/nCicPp.ml b/helm/software/components/ng_kernel/nCicPp.ml index 782fd9566..00ea9f24e 100644 --- a/helm/software/components/ng_kernel/nCicPp.ml +++ b/helm/software/components/ng_kernel/nCicPp.ml @@ -1,5 +1,19 @@ +(* + ||M|| This file is part of HELM, an Hypertextual, Electronic + ||A|| Library of Mathematics, developed at the Computer Science + ||T|| Department, University of Bologna, Italy. + ||I|| + ||T|| HELM is free software; you can redistribute it and/or + ||A|| modify it under the terms of the GNU General Public License + \ / version 2 or (at your option) any later version. + \ / This software is distributed as is, NO WARRANTY. + V_______________________________________________________________ *) + +(* $Id$ *) + let ppterm = - ref (fun ~context ~subst ~metasenv ?inside_fix t -> "Please, set a pp callback") + ref (fun ~context:_ ~subst:_ ~metasenv:_ ?inside_fix _ -> + ignore (inside_fix) ; "Please, set a pp callback") ;; let set_ppterm f = ppterm := f;; @@ -14,36 +28,33 @@ module R = NReference let r2s pp_fix_name r = try match r with - | R.Ref (_,u,R.Ind i) -> - (match snd(NCicEnvironment.get_obj u) with + | R.Ref (u,R.Ind (_,i,_)) -> + (match NCicLibrary.get_obj u with | _,_,_,_, C.Inductive (_,_,itl,_) -> let _,name,_,_ = List.nth itl i in name | _ -> assert false) - | R.Ref (_,u,R.Con (i,j)) -> - (match snd(NCicEnvironment.get_obj u) with + | R.Ref (u,R.Con (i,j,_)) -> + (match NCicLibrary.get_obj u with | _,_,_,_, C.Inductive (_,_,itl,_) -> let _,_,_,cl = List.nth itl i in let _,name,_ = List.nth cl (j-1) in name | _ -> assert false) - | R.Ref (_,u,(R.Decl | R.Def )) -> - (match snd(NCicEnvironment.get_obj u) with + | R.Ref (u,(R.Decl | R.Def _)) -> + (match NCicLibrary.get_obj u with | _,_,_,_, C.Constant (_,name,_,_,_) -> name | _ -> assert false) - | R.Ref (_,u,(R.Fix (i,_)|R.CoFix i)) -> - (match snd(NCicEnvironment.get_obj u) with + | R.Ref (u,(R.Fix (i,_,_)|R.CoFix i)) -> + (match NCicLibrary.get_obj u with | _,_,_,_, C.Fixpoint (_,fl,_) -> if pp_fix_name then let _,name,_,_,_ = List.nth fl i in name else - let name = NUri.string_of_uri u in - let name = Filename.basename name in - let name = Filename.chop_extension name in - name ^"("^ string_of_int i ^ ")" + NUri.name_of_uri u ^"("^ string_of_int i ^ ")" | _ -> assert false) - with exn -> R.string_of_reference r + with NCicLibrary.ObjectNotFound _ -> R.string_of_reference r ;; -let trivial_pp_term ~context ~subst ~metasenv ?(inside_fix=false) t = +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 @@ -52,7 +63,7 @@ let trivial_pp_term ~context ~subst ~metasenv ?(inside_fix=false) t = (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)) + with Failure _ -> F.fprintf f " -%d" (m - List.length ctx)) | C.Const r -> F.fprintf f "%s" (r2s inside_fix r) | C.Prod ("_",s,t) -> if not toplevel then F.fprintf f "("; @@ -123,8 +134,15 @@ let trivial_pp_term ~context ~subst ~metasenv ?(inside_fix=false) t = | 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 + | C.Sort (C.Type []) -> F.fprintf f "IllFormedUniverse" + | C.Sort (C.Type [false, u]) -> F.fprintf f "%s" (NUri.name_of_uri u) + | C.Sort (C.Type [true, u]) -> F.fprintf f "S(%s)" (NUri.name_of_uri u) + | C.Sort (C.Type l) -> + F.fprintf f "Max("; + aux ctx (C.Sort (C.Type [List.hd l])); + List.iter (fun x -> F.fprintf f ",";aux ctx (C.Sort (C.Type [x]))) + (List.tl l); + F.fprintf f ")" in aux ~toplevel:true (List.map fst context) t; F.fprintf f "@?"; @@ -134,7 +152,7 @@ let trivial_pp_term ~context ~subst ~metasenv ?(inside_fix=false) t = let ppobj = function | (u,_,metasenv,subst,NCic.Fixpoint (b, fl, _)) -> "{"^NUri.string_of_uri u^"}\n"^ - "let rec "^ + (if b then "let rec " else "let corec ") ^ String.concat "\nand " (List.map (fun (_,name,n,ty,bo) -> name^ " on " ^ string_of_int n ^ " : " ^ @@ -142,7 +160,7 @@ let ppobj = function 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 "^ + (if b then "inductive " else "coinductive ")^ String.concat "\nand " (List.map (fun (_,name,ty,cl) -> name^": "^ppterm ~metasenv ~subst ~context:[] ty^ " :=\n"^ @@ -160,3 +178,14 @@ let ppobj = function 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" +;;