From 9e86c8d0eb60817cc583568343b265dddceae93d Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Wed, 9 Apr 2008 14:55:30 +0000 Subject: [PATCH 1/1] better pp --- helm/software/components/ng_kernel/nCicPp.ml | 85 ++++++++++--------- helm/software/components/ng_kernel/nCicPp.mli | 3 + 2 files changed, 50 insertions(+), 38 deletions(-) diff --git a/helm/software/components/ng_kernel/nCicPp.ml b/helm/software/components/ng_kernel/nCicPp.ml index 7573ad542..216da00a4 100644 --- a/helm/software/components/ng_kernel/nCicPp.ml +++ b/helm/software/components/ng_kernel/nCicPp.ml @@ -1,43 +1,49 @@ let ppterm = - ref (fun ~context ~subst ~metasenv t -> "Please, set a pp callback") + ref (fun ~context ~subst ~metasenv ?inside_fix t -> "Please, set a pp callback") ;; let set_ppterm f = ppterm := f;; -let ppterm ~context ~subst ~metasenv t = - !ppterm ~context ~subst ~metasenv t +let ppterm ~context ~subst ~metasenv ?inside_fix t = + !ppterm ~context ~subst ~metasenv ?inside_fix t ;; module C = NCic module R = NReference -let r2s = function - | R.Ref (_,u,R.Ind i) -> - (match snd(NCicEnvironment.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 - | _,_,_,_, 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 - | _,_,_,_, C.Constant (_,name,_,_,_) -> name - | _ -> assert false) - | R.Ref (_,u,(R.Fix (i,_)|R.CoFix i)) -> - (match snd(NCicEnvironment.get_obj u) with - | _,_,_,_, C.Fixpoint (_,fl,_) -> - 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 ^ ")" - | _ -> assert false) +let r2s pp_fix_name r = + try + match r with + | R.Ref (_,u,R.Ind i) -> + (match snd(NCicEnvironment.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 + | _,_,_,_, 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 + | _,_,_,_, C.Constant (_,name,_,_,_) -> name + | _ -> assert false) + | R.Ref (_,u,(R.Fix (i,_)|R.CoFix i)) -> + (match snd(NCicEnvironment.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 ^ ")" + | _ -> assert false) + with exn -> R.string_of_reference r ;; -let trivial_pp_term ~context ~subst ~metasenv 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 @@ -45,7 +51,7 @@ let trivial_pp_term ~context ~subst ~metasenv t = | C.Rel m -> (try F.fprintf f "%s" (List.nth ctx (m-1)) with Failure _ -> F.fprintf f " -%d" (m - List.length context)) - | C.Const r -> F.fprintf f "%s" (r2s r) + | C.Const r -> F.fprintf f "%s" (r2s inside_fix r) | C.Prod ("_",s,t) -> F.fprintf f "@["; aux ctx s; @@ -54,9 +60,9 @@ let trivial_pp_term ~context ~subst ~metasenv t = F.fprintf f "@]"; | C.Prod (name,s,t) -> F.fprintf f "@["; - F.fprintf f "∀%s:" name; + F.fprintf f "@[∀%s:@;" name; aux ctx s; - F.fprintf f ".@;"; + F.fprintf f "@].@;"; aux (name::ctx) t; F.fprintf f "@]"; | C.Lambda (name,s,t) -> @@ -81,12 +87,15 @@ let trivial_pp_term ~context ~subst ~metasenv t = F.fprintf f "@; @[[ "; if pl <> [] then begin - F.fprintf f "%s ⇒ " (r2s (R.mk_constructor 1 r)); + F.fprintf f "@[%s ⇒@;" (r2s inside_fix (R.mk_constructor 1 r)); aux ctx (List.hd pl); + F.fprintf f "@]"; ignore(List.fold_left (fun i t -> - F.fprintf f "@;| %s ⇒ " (r2s (R.mk_constructor i r)); - aux ctx t; i+1) + F.fprintf f "@;| @[%s ⇒@;" (r2s inside_fix (R.mk_constructor i r)); + aux ctx t; + F.fprintf f "@]"; + i+1) 2 (List.tl pl)); end; F.fprintf f "]@] @]"; @@ -108,14 +117,14 @@ let trivial_pp_term ~context ~subst ~metasenv t = let ppobj = function | (u,_,metasenv,subst,NCic.Fixpoint (b, fl, _)) -> - "let rec "^ + "{"^NUri.string_of_uri u^"}\n"^ + "let rec "^ String.concat "\nand " (fst (List.fold_right (fun (_,name,n,ty,bo) (l,i) -> - ((Filename.chop_extension (Filename.basename (NUri.string_of_uri u))^ - "("^string_of_int (i-1) ^") aka "^name^ + ((name^ " on " ^ string_of_int n ^ " : " ^ ppterm ~metasenv ~subst ~context:[] ty ^ " :=\n"^ - ppterm ~metasenv ~subst ~context:[] bo) :: l),i-1) fl + ppterm ~metasenv ~subst ~context:[] ~inside_fix:true bo) :: l),i-1) fl ([],List.length fl))) | (u,_,_,_,NCic.Inductive (b, _,tyl, _)) -> "inductive" | (u,_,metasenv,subst,NCic.Constant (_,name,None,ty, _)) -> diff --git a/helm/software/components/ng_kernel/nCicPp.mli b/helm/software/components/ng_kernel/nCicPp.mli index 96a141ff7..5a7fd75a9 100644 --- a/helm/software/components/ng_kernel/nCicPp.mli +++ b/helm/software/components/ng_kernel/nCicPp.mli @@ -2,18 +2,21 @@ val set_ppterm: (context:NCic.context -> subst:NCic.substitution -> metasenv:NCic.metasenv -> + ?inside_fix:bool -> NCic.term -> string) -> unit val ppterm: context:NCic.context -> subst:NCic.substitution -> metasenv:NCic.metasenv -> + ?inside_fix:bool -> NCic.term -> string val trivial_pp_term: context:NCic.context -> subst:NCic.substitution -> metasenv:NCic.metasenv -> + ?inside_fix:bool -> NCic.term -> string val ppobj: NCic.obj -> string -- 2.39.2