X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FnCicPp.ml;h=5b4c9940cbd623c700c197b501d937a5a04ab5f3;hb=246f3c2f2d26655129efacf830ecff47094795b4;hp=8884621cbd59508504d89bd0f741e4cd062ecc06;hpb=e48acbc0d00717ce8f12412673ece4e4ee0e9642;p=helm.git diff --git a/helm/software/components/ng_kernel/nCicPp.ml b/helm/software/components/ng_kernel/nCicPp.ml index 8884621cb..5b4c9940c 100644 --- a/helm/software/components/ng_kernel/nCicPp.ml +++ b/helm/software/components/ng_kernel/nCicPp.ml @@ -11,52 +11,47 @@ (* $Id$ *) -let ppterm = - ref (fun ~context ~subst ~metasenv ?inside_fix t -> "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 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 string_of_implicit_annotation = function + | `Closed -> "▪" + | `Type -> "" + | `Hole -> "□" + | `Term -> "Term" + | `Typeof x -> "Ty("^string_of_int x^")" ;; -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 @@ -65,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 "("; @@ -114,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 "("; @@ -133,19 +135,86 @@ 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.Meta (n,_) -> F.fprintf f "?%d" n + | 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; + 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 "@?"; 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 " @@ -153,9 +222,9 @@ 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"^ - "inductive "^ + (if b then "inductive " else "coinductive ")^ String.concat "\nand " (List.map (fun (_,name,ty,cl) -> name^": "^ppterm ~metasenv ~subst ~context:[] ty^ " :=\n"^ @@ -163,24 +232,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);; +