X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FnCicPp.ml;h=cde028be4417b58b8985607368e1f18a4875912b;hb=efea8f34e71084fcc6e7791e4927f2f7f8d3f1af;hp=8ae842868301e4172fc2d22e1936fa1ed8f494bf;hpb=e2381427bca733bd36a099002fa8b7140f7a20d0;p=helm.git

diff --git a/helm/software/components/ng_kernel/nCicPp.ml b/helm/software/components/ng_kernel/nCicPp.ml
index 8ae842868..cde028be4 100644
--- a/helm/software/components/ng_kernel/nCicPp.ml
+++ b/helm/software/components/ng_kernel/nCicPp.ml
@@ -11,28 +11,18 @@
 
 (* $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
@@ -50,10 +40,10 @@ let r2s pp_fix_name r =
             else 
               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
@@ -62,7 +52,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 "(";
@@ -131,9 +122,21 @@ let trivial_pp_term ~context ~subst ~metasenv ?(inside_fix=false) t =
        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 (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 []) -> 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)
@@ -160,7 +163,7 @@ let ppobj = function
           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"^
@@ -179,13 +182,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;;
+