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=5f29d25d87093d71cf26875d045e7af5e99ec614;hpb=b0b6b600e029435bfce53f41cd267c669a1f8dc2;p=helm.git diff --git a/helm/software/components/ng_kernel/nCicPp.ml b/helm/software/components/ng_kernel/nCicPp.ml index 5f29d25d8..83422cd8f 100644 --- a/helm/software/components/ng_kernel/nCicPp.ml +++ b/helm/software/components/ng_kernel/nCicPp.ml @@ -11,17 +11,6 @@ (* $Id$ *) -let ppterm = - ref (fun ~context:_ ~subst:_ ~metasenv:_ ?inside_fix _ -> - ignore (inside_fix) ; "Please, set a pp callback") -;; - -let set_ppterm f = ppterm := f;; - -let ppterm ~context ~subst ~metasenv ?inside_fix t = - !ppterm ~context ~subst ~metasenv ?inside_fix t -;; - module C = NCic module R = NReference @@ -54,7 +43,15 @@ let r2s pp_fix_name r = with NCicLibrary.ObjectNotFound _ -> R.string_of_reference r ;; -let trivial_pp_term ~context ~subst:_ ~metasenv:_ ?(inside_fix=false) t = +let string_of_implicit_annotation = function + | `Closed -> "▪" + | `Type -> "" + | `Hole -> "□" + | `Term -> "Term" + | `Typeof x -> "Ty("^string_of_int x^")" +;; + +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 @@ -63,7 +60,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 "("; @@ -112,18 +110,24 @@ let trivial_pp_term ~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 "("; @@ -131,15 +135,24 @@ let trivial_pp_term ~context ~subst:_ ~metasenv:_ ?(inside_fix=false) t = List.iter (fun x -> F.fprintf f "@;";aux ctx x) (List.tl l); if not toplevel then F.fprintf f ")"; F.fprintf f "@]" - | C.Implicit _ -> F.fprintf f "?" + | C.Implicit annot -> + F.fprintf f "?%s" (string_of_implicit_annotation annot) + | 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; - List.iter (fun x -> aux ctx x; F.fprintf f ",") l; + 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.Type []) -> F.fprintf f "IllFormedUniverse" + | 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) -> @@ -154,6 +167,12 @@ let trivial_pp_term ~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"^ @@ -184,13 +203,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 ~margin:80);; +