X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FnCicPp.ml;h=6a38873fc360d9b238f3ff13bbed0174fc521bd7;hb=ffdd3ddd6ce10a5fa0729ab407647bd46c44b9d8;hp=73c3f572c0ff1dbade596812d08ae80c25f84ae6;hpb=1ef41da37d7b39da1521f53d3b22981556bfbe68;p=helm.git diff --git a/helm/software/components/ng_kernel/nCicPp.ml b/helm/software/components/ng_kernel/nCicPp.ml index 73c3f572c..6a38873fc 100644 --- a/helm/software/components/ng_kernel/nCicPp.ml +++ b/helm/software/components/ng_kernel/nCicPp.ml @@ -14,6 +14,9 @@ module C = NCic module R = NReference +let head_beta_reduce = ref (fun ~upto:_ _ -> assert false);; +let set_head_beta_reduce = (:=) head_beta_reduce;; + let r2s pp_fix_name r = try match r with @@ -43,6 +46,14 @@ let r2s pp_fix_name r = with NCicLibrary.ObjectNotFound _ -> R.string_of_reference r ;; +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 @@ -52,7 +63,8 @@ let ppterm ~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 "("; @@ -101,18 +113,32 @@ 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 (C.Meta (n,lc) :: args) when List.mem_assoc n subst -> + let _,_,t,_ = List.assoc n subst in + let hd = NCicSubstitution.subst_meta lc t in + aux ctx + (!head_beta_reduce ~upto:(List.length args) + (match hd with + | NCic.Appl l -> NCic.Appl (l@args) + | _ -> NCic.Appl (hd :: args))) | C.Appl l -> F.fprintf f "@["; if not toplevel then F.fprintf f "("; @@ -120,7 +146,8 @@ let ppterm ~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) @@ -130,12 +157,13 @@ let ppterm ~context ~subst ~metasenv:_ ?(inside_fix=false) t = F.fprintf f "?%d(%d,[" n shift; if List.length l > 0 then begin - aux ctx (List.hd l); - List.iter (fun x -> F.fprintf f ",";aux ctx x) (List.tl l); + 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) -> @@ -150,8 +178,54 @@ let ppterm ~context ~subst ~metasenv:_ ?(inside_fix=false) t = Buffer.contents buff ;; -let ppobj = function - | (u,_,metasenv,subst,NCic.Fixpoint (b, fl, _)) -> +let ppterm ~context ~subst ~metasenv ?(margin=80) ?inside_fix t = + Format.set_margin margin; + ppterm ~context ~subst ~metasenv ?inside_fix t +;; + +let rec ppcontext ?(sep="\n") ~subst ~metasenv = function + | [] -> "" + | (name, NCic.Decl t) :: tl -> + ppcontext ~sep ~subst ~metasenv tl ^ + name ^ ": " ^ ppterm ~subst ~metasenv ~context:tl t ^ sep + | (name, NCic.Def (bo,ty)) :: tl-> + ppcontext ~sep ~subst ~metasenv tl ^ + name ^ ": " ^ ppterm ~subst ~metasenv ~context:tl ty ^ + " := " ^ 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 ppobj (u,_,metasenv, subst, o) = + "metasenv:\n" ^ ppmetasenv ~subst metasenv ^ "\n" ^ + "subst:\n" ^ ppsubst subst ~metasenv ^ "\n" ^ + match o with + | NCic.Fixpoint (b, fl, _) -> "{"^NUri.string_of_uri u^"}\n"^ (if b then "let rec " else "let corec ") ^ String.concat "\nand " @@ -159,7 +233,7 @@ let ppobj = function name^ " on " ^ string_of_int n ^ " : " ^ ppterm ~metasenv ~subst ~context:[] ty ^ " :=\n"^ ppterm ~metasenv ~subst ~context:[] ~inside_fix:true bo) fl) - | (u,_,metasenv,subst,NCic.Inductive (b, leftno,tyl, _)) -> + | NCic.Inductive (b, leftno,tyl, _) -> "{"^NUri.string_of_uri u^"} with "^string_of_int leftno^" fixed params\n"^ (if b then "inductive " else "coinductive ")^ String.concat "\nand " @@ -169,24 +243,16 @@ let ppobj = function (List.map (fun (_,name,ty) -> " | "^name^": "^ppterm ~metasenv ~subst ~context:[] ty) cl)) tyl) ^ "." - | (u,_,metasenv,subst,NCic.Constant (_,name,None,ty, _)) -> + | NCic.Constant (_,name,None,ty, _) -> "{"^NUri.string_of_uri u^"}\n"^ "axiom " ^ name ^ " : " ^ - ppterm ~metasenv ~subst ~context:[] ty ^ "\n" - | (u,_,metasenv,subst,NCic.Constant (_,name,Some bo,ty, _)) -> + ppterm ~metasenv ~subst ~context:[] ty ^ "\n" + | NCic.Constant (_,name,Some bo,ty, _) -> "{"^NUri.string_of_uri u^"}\n"^ "definition " ^ name ^ " : " ^ 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" -;; +let _ = NCicSubstitution.set_ppterm (ppterm ~margin:80);; +