X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FnCicPp.ml;h=6a38873fc360d9b238f3ff13bbed0174fc521bd7;hb=e02c6eaf8d50025c3be8bbf6988ab8b2a37b40da;hp=cde028be4417b58b8985607368e1f18a4875912b;hpb=efea8f34e71084fcc6e7791e4927f2f7f8d3f1af;p=helm.git diff --git a/helm/software/components/ng_kernel/nCicPp.ml b/helm/software/components/ng_kernel/nCicPp.ml index cde028be4..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 @@ -102,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 "("; @@ -121,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) @@ -137,7 +163,7 @@ let ppterm ~context ~subst ~metasenv:_ ?(inside_fix=false) t = 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) -> @@ -152,34 +178,9 @@ let ppterm ~context ~subst ~metasenv:_ ?(inside_fix=false) t = Buffer.contents buff ;; -let ppobj = function - | (u,_,metasenv,subst,NCic.Fixpoint (b, fl, _)) -> - "{"^NUri.string_of_uri u^"}\n"^ - (if b then "let rec " else "let corec ") ^ - String.concat "\nand " - (List.map (fun (_,name,n,ty,bo) -> - 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, _)) -> - "{"^NUri.string_of_uri u^"} with "^string_of_int leftno^" fixed params\n"^ - (if b then "inductive " else "coinductive ")^ - String.concat "\nand " - (List.map (fun (_,name,ty,cl) -> - name^": "^ppterm ~metasenv ~subst ~context:[] ty^ " :=\n"^ - String.concat "\n" - (List.map (fun (_,name,ty) -> - " | "^name^": "^ppterm ~metasenv ~subst ~context:[] ty) - cl)) tyl) ^ "." - | (u,_,metasenv,subst,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, _)) -> - "{"^NUri.string_of_uri u^"}\n"^ - "definition " ^ name ^ " : " ^ - ppterm ~metasenv ~subst ~context:[] ty ^ " := \n"^ - ppterm ~metasenv ~subst ~context:[] bo ^ "\n" +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 @@ -219,5 +220,39 @@ let rec ppsubst ~subst ~metasenv = function let ppsubst ~metasenv subst = ppsubst ~metasenv ~subst subst;; -let _ = NCicSubstitution.set_ppterm ppterm;; + +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 " + (List.map (fun (_,name,n,ty,bo) -> + name^ " on " ^ string_of_int n ^ " : " ^ + ppterm ~metasenv ~subst ~context:[] ty ^ " :=\n"^ + ppterm ~metasenv ~subst ~context:[] ~inside_fix:true bo) fl) + | 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 " + (List.map (fun (_,name,ty,cl) -> + name^": "^ppterm ~metasenv ~subst ~context:[] ty^ " :=\n"^ + String.concat "\n" + (List.map (fun (_,name,ty) -> + " | "^name^": "^ppterm ~metasenv ~subst ~context:[] ty) + cl)) tyl) ^ "." + | NCic.Constant (_,name,None,ty, _) -> + "{"^NUri.string_of_uri u^"}\n"^ + "axiom " ^ name ^ " : " ^ + 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 _ = NCicSubstitution.set_ppterm (ppterm ~margin:80);;