ppmetasenv & subst added

[helm.git] / helm / software / components / ng_kernel / nCicPp.ml

diff --git a/helm/software/components/ng_kernel/nCicPp.ml b/helm/software/components/ng_kernel/nCicPp.ml
index 5f29d25d87093d71cf26875d045e7af5e99ec614..cde028be4417b58b8985607368e1f18a4875912b 100644 (file)
--- a/helm/software/components/ng_kernel/nCicPp.ml
+++ b/helm/software/components/ng_kernel/nCicPp.ml
@@ -11,17 +11,6 @@
 
 (* $Id$ *)
 
-let ppterm = 
-  ref (fun ~context:_ ~subst:_ ~metasenv:_ ?inside_fix _ -> 
-         ignore (inside_fix) ; "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
 
@@ -54,7 +43,7 @@ let r2s pp_fix_name 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
@@ -63,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 "(";
@@ -132,11 +122,19 @@ 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,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;
-        List.iter (fun x -> aux ctx x; F.fprintf f ",") l;
+        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.Type []) -> F.fprintf f "IllFormedUniverse"
@@ -184,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;;
+