X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FnCicPp.ml;h=cebdaf0b29908916a601c04756058aed1d1c8450;hb=023b925489d007fc1a39087e2770aac4b2740159;hp=991b26ffc2800c81b8217fb502b4537231989498;hpb=703515866ff6b77ab0e8b186c6703ec634fc23df;p=helm.git diff --git a/helm/software/components/ng_kernel/nCicPp.ml b/helm/software/components/ng_kernel/nCicPp.ml index 991b26ffc..cebdaf0b2 100644 --- a/helm/software/components/ng_kernel/nCicPp.ml +++ b/helm/software/components/ng_kernel/nCicPp.ml @@ -1,12 +1,15 @@ -let ppterm = - ref (fun ~context ~subst ~metasenv ?inside_fix t -> "Please, set a pp callback") -;; - -let set_ppterm f = ppterm := f;; +(* + ||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_______________________________________________________________ *) -let ppterm ~context ~subst ~metasenv ?inside_fix t = - !ppterm ~context ~subst ~metasenv ?inside_fix t -;; +(* $Id$ *) module C = NCic module R = NReference @@ -14,36 +17,33 @@ module R = NReference let r2s pp_fix_name r = try match r with - | R.Ref (_,u,R.Ind (_,i)) -> + | 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)) -> + | 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 )) -> + | 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)) -> + | 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 ppterm ~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 +52,8 @@ 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 ctx)) + with Failure "nth" | Invalid_argument "List.nth" -> + 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 "("; @@ -121,10 +122,30 @@ let trivial_pp_term ~context ~subst ~metasenv ?(inside_fix=false) t = if not toplevel then F.fprintf f ")"; F.fprintf f "@]" | C.Implicit _ -> F.fprintf f "?" - | C.Meta (n,_) -> F.fprintf f "?%d" n + | C.Meta (n,lc) when List.mem_assoc n subst -> + let _,_,t,_ = List.assoc n subst in + aux ctx (NCicSubstitution.subst_meta lc t) + | C.Meta (n,(shift,C.Irl len)) -> + F.fprintf f "?%d(%d,%d)" n shift len + | C.Meta (n,(shift,C.Ctx l)) -> + F.fprintf f "?%d(%d,[" n shift; + if List.length l > 0 then + begin + aux ctx (NCicSubstitution.lift shift (List.hd l)); + List.iter (fun x -> F.fprintf f ",";aux ctx x) + (List.map (NCicSubstitution.lift shift) (List.tl l)); + end; + F.fprintf f "])" | 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 "Type0" + | 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 "@?"; @@ -142,7 +163,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"^ @@ -161,13 +182,42 @@ let ppobj = function ppterm ~metasenv ~subst ~context:[] bo ^ "\n" ;; -let rec ppcontext ~subst ~metasenv = function +let rec ppcontext ?(sep="\n") ~subst ~metasenv = function | [] -> "" | (name, NCic.Decl t) :: tl -> - ppcontext ~subst ~metasenv tl ^ - name ^ ": " ^ ppterm ~subst ~metasenv ~context:tl t ^ "\n" + ppcontext ~sep ~subst ~metasenv tl ^ + name ^ ": " ^ ppterm ~subst ~metasenv ~context:tl t ^ sep | (name, NCic.Def (bo,ty)) :: tl-> - ppcontext ~subst ~metasenv tl ^ + ppcontext ~sep ~subst ~metasenv tl ^ name ^ ": " ^ ppterm ~subst ~metasenv ~context:tl ty ^ - " := " ^ ppterm ~subst ~metasenv ~context:tl bo ^ "\n" + " := " ^ ppterm ~subst ~metasenv ~context:tl bo ^ sep ;; + +let rec ppmetasenv ~subst metasenv = function + | [] -> "" + | (i,(name, ctx, ty)) :: tl -> + let name = match name with Some n -> "("^n^")" | _ -> "" in + ppcontext ~sep:"; " ~subst ~metasenv ctx ^ + " ⊢ ?"^string_of_int i^name^" : " ^ + ppterm ~metasenv ~subst ~context:ctx ty ^ "\n" ^ + ppmetasenv ~subst metasenv tl +;; + +let ppmetasenv ~subst metasenv = ppmetasenv ~subst metasenv metasenv;; + +let rec ppsubst ~subst ~metasenv = function + | [] -> "" + | (i,(name, ctx, t, ty)) :: tl -> + + let name = match name with Some n -> "("^n^")" | _ -> "" in + ppcontext ~sep:"; " ~subst ~metasenv ctx ^ + " ⊢ ?"^string_of_int i^name^" := " ^ + ppterm ~metasenv ~subst ~context:ctx t ^ " : " ^ + ppterm ~metasenv ~subst ~context:ctx ty ^ "\n" ^ + ppsubst ~subst ~metasenv tl +;; + +let ppsubst ~metasenv subst = ppsubst ~metasenv ~subst subst;; + +let _ = NCicSubstitution.set_ppterm ppterm;; +