(* $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
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 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
if not toplevel then F.fprintf f ")";
F.fprintf f "@]"
| C.Implicit _ -> F.fprintf f "?"
- | C.Meta (n,_) -> F.fprintf f "?%d" n
+ | 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 (List.hd l);
+ List.iter (fun x -> F.fprintf f ",";aux ctx x) (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 "IllFormedUniverse"
+ | 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 "@?";
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"^
- "inductive "^
+ (if b then "inductive " else "coinductive ")^
String.concat "\nand "
(List.map (fun (_,name,ty,cl) ->
name^": "^ppterm ~metasenv ~subst ~context:[] ty^ " :=\n"^