X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FnCicPp.ml;h=83422cd8f238ee1f207afb8931f57bcb2d7b16c4;hb=347a92a83c3fa154c850d94b1a211fbb8334d4f1;hp=2b0787a72cfc4d1b35a7b3ac0b909deb9745cbd3;hpb=04e07924ddd8d0a95e01103103bd8c2a3e79c6c5;p=helm.git diff --git a/helm/software/components/ng_kernel/nCicPp.ml b/helm/software/components/ng_kernel/nCicPp.ml index 2b0787a72..83422cd8f 100644 --- a/helm/software/components/ng_kernel/nCicPp.ml +++ b/helm/software/components/ng_kernel/nCicPp.ml @@ -110,18 +110,24 @@ let ppterm ~context ~subst ~metasenv:_ ?(inside_fix=false) t = F.fprintf f "@; @[[ "; if pl <> [] then begin - F.fprintf f "@[%s ⇒@;" (r2s inside_fix (R.mk_constructor 1 r)); + F.fprintf f "@[%s ⇒@;" + (try r2s inside_fix (R.mk_constructor 1 r) + with R.IllFormedReference _ -> "#ERROR#"); 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)); + F.fprintf f "@;| @[%s ⇒@;" + (try r2s inside_fix (R.mk_constructor i r) + with R.IllFormedReference _ -> "#ERROR#"); aux ~toplevel:true ctx t; F.fprintf f "@]"; i+1) 2 (List.tl pl)); end; F.fprintf f "]@] @]"; + | C.Appl [] | C.Appl [_] | C.Appl (C.Appl _::_) -> + F.fprintf f "BAD APPLICATION" | C.Appl l -> F.fprintf f "@["; if not toplevel then F.fprintf f "("; @@ -161,6 +167,12 @@ let ppterm ~context ~subst ~metasenv:_ ?(inside_fix=false) t = Buffer.contents buff ;; +let ppterm ~context ~subst ~metasenv ?(margin=80) ?inside_fix t = + Format.set_margin margin; + ppterm ~context ~subst ~metasenv ?inside_fix t +;; + + let ppobj = function | (u,_,metasenv,subst,NCic.Fixpoint (b, fl, _)) -> "{"^NUri.string_of_uri u^"}\n"^ @@ -228,5 +240,5 @@ let rec ppsubst ~subst ~metasenv = function let ppsubst ~metasenv subst = ppsubst ~metasenv ~subst subst;; -let _ = NCicSubstitution.set_ppterm ppterm;; +let _ = NCicSubstitution.set_ppterm (ppterm ~margin:80);;