X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FnCicPp.ml;h=83422cd8f238ee1f207afb8931f57bcb2d7b16c4;hb=347a92a83c3fa154c850d94b1a211fbb8334d4f1;hp=cebdaf0b29908916a601c04756058aed1d1c8450;hpb=023b925489d007fc1a39087e2770aac4b2740159;p=helm.git

diff --git a/helm/software/components/ng_kernel/nCicPp.ml b/helm/software/components/ng_kernel/nCicPp.ml
index cebdaf0b2..83422cd8f 100644
--- a/helm/software/components/ng_kernel/nCicPp.ml
+++ b/helm/software/components/ng_kernel/nCicPp.ml
@@ -43,6 +43,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 +110,24 @@ let ppterm ~context ~subst ~metasenv:_ ?(inside_fix=false) t =
        F.fprintf f "@; @[<v>[ ";
        if pl <> [] then
          begin
-           F.fprintf f "@[<hov 2>%s ⇒@;" (r2s inside_fix (R.mk_constructor 1 r));
+           F.fprintf f "@[<hov 2>%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 "@;| @[<hov 2>%s ⇒@;" (r2s inside_fix (R.mk_constructor i r));
+              F.fprintf f "@;| @[<hov 2>%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 "@[<hov 2>";
        if not toplevel then F.fprintf f "(";
@@ -121,7 +135,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)
@@ -152,6 +167,12 @@ let ppterm ~context ~subst ~metasenv:_ ?(inside_fix=false) t =
   Buffer.contents buff
 ;;
 
+let ppterm ~context ~subst ~metasenv ?(margin=80) ?inside_fix t = 
+  Format.set_margin margin;
+  ppterm ~context ~subst ~metasenv ?inside_fix t
+;;
+
+
 let ppobj = function
   | (u,_,metasenv,subst,NCic.Fixpoint (b, fl, _)) -> 
       "{"^NUri.string_of_uri u^"}\n"^
@@ -196,7 +217,7 @@ let rec ppcontext ?(sep="\n") ~subst ~metasenv = function
 let rec ppmetasenv ~subst metasenv = function
   | [] -> ""
   | (i,(name, ctx, ty)) :: tl ->
-      let name = match name with Some n -> "("^n^")" | _ -> "" in
+      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" ^
@@ -219,5 +240,5 @@ let rec ppsubst ~subst ~metasenv = function
 
 let ppsubst ~metasenv subst = ppsubst ~metasenv ~subst subst;;
 
-let _ = NCicSubstitution.set_ppterm ppterm;;
+let _ = NCicSubstitution.set_ppterm (ppterm ~margin:80);;