X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_proof_checking%2FcicPp.ml;h=b9a5b72f478dfbad467211e3935163647711c540;hb=ac7687ce66526f905874ed99a845223c853c558a;hp=a8d9eaa0bdd87e4ef67c60611e4c8e314b0f53cd;hpb=296b163c8a2b09a6f87cbab15c2016de92fc8e70;p=helm.git

diff --git a/helm/ocaml/cic_proof_checking/cicPp.ml b/helm/ocaml/cic_proof_checking/cicPp.ml
index a8d9eaa0b..b9a5b72f4 100644
--- a/helm/ocaml/cic_proof_checking/cicPp.ml
+++ b/helm/ocaml/cic_proof_checking/cicPp.ml
@@ -41,7 +41,7 @@ exception NotEnoughElements;;
 
 (* Utility functions *)
 
-let string_of_name =
+let ppname =
  function
     Cic.Name s     -> s
   | Cic.Anonymous  -> "_"
@@ -69,7 +69,7 @@ let rec pp t l =
          (match get_nth l n with
              Some (C.Name s) -> s
            | Some C.Anonymous -> "__" ^ string_of_int n
-           | _ -> raise CicPpInternalError
+           | None -> "_hidden_" ^ string_of_int n
          )
         with
          NotEnoughElements -> string_of_int (List.length l - n)
@@ -79,16 +79,16 @@ let rec pp t l =
     | C.Meta (n,l1) ->
        "?" ^ (string_of_int n) ^ "[" ^ 
         String.concat " ; "
-         (List.map (function None -> "_" | Some t -> pp t l) l1) ^
+         (List.rev_map (function None -> "_" | Some t -> pp t l) l1) ^
         "]"
     | C.Sort s ->
        (match s with
            C.Prop  -> "Prop"
          | C.Set   -> "Set"
-         | C.Type  -> "Type"
+         | C.Type _ -> "Type" (* TASSI: universe is not explicit *)
 	 | C.CProp -> "CProp" 
        )
-    | C.Implicit -> "?"
+    | C.Implicit _ -> "?"
     | C.Prod (b,s,t) ->
        (match b with
           C.Name n -> "(" ^ n ^ ":" ^ pp s l ^ ")" ^ pp t ((Some b)::l)
@@ -96,9 +96,9 @@ let rec pp t l =
        )
     | C.Cast (v,t) -> pp v l
     | C.Lambda (b,s,t) ->
-       "[" ^ string_of_name b ^ ":" ^ pp s l ^ "]" ^ pp t ((Some b)::l)
+       "[" ^ ppname b ^ ":" ^ pp s l ^ "]" ^ pp t ((Some b)::l)
     | C.LetIn (b,s,t) ->
-       "[" ^ string_of_name b ^ ":=" ^ pp s l ^ "]" ^ pp t ((Some b)::l)
+       "[" ^ ppname b ^ ":=" ^ pp s l ^ "]" ^ pp t ((Some b)::l)
     | C.Appl li ->
        "(" ^
        (List.fold_right
@@ -193,6 +193,24 @@ let ppinductiveType (typename, inductive, arity, cons) =
    cons ""
 ;;
 
+let ppcontext ?(sep = "\n") context =
+ let separate s = if s = "" then "" else s ^ sep in
+ fst (List.fold_right 
+   (fun context_entry (i,name_context) ->
+     match context_entry with
+        Some (n,Cic.Decl t) ->
+         Printf.sprintf "%s%s : %s" (separate i) (ppname n)
+          (pp t name_context), (Some n)::name_context
+      | Some (n,Cic.Def (bo,ty)) ->
+         Printf.sprintf "%s%s : %s := %s" (separate i) (ppname n)
+          (match ty with
+              None -> "_"
+            | Some ty -> pp ty name_context)
+          (pp bo name_context), (Some n)::name_context
+       | None ->
+          Printf.sprintf "%s_ :? _" (separate i), None::name_context
+    ) context ("",[]))
+
 (* ppobj obj  returns a string with describing the cic object obj in a syntax *)
 (* similar to the one used by Coq                                             *)
 let ppobj obj =
@@ -226,11 +244,11 @@ let ppobj obj =
 	            (match context_entry with
 	                Some (n,C.Decl at) ->
                    (separate i) ^
-                     string_of_name n ^ ":" ^ pp at name_context ^ " ",
+                     ppname n ^ ":" ^ pp at name_context ^ " ",
                       (Some n)::name_context
 	              | Some (n,C.Def (at,None)) ->
                    (separate i) ^
-                     string_of_name n ^ ":= " ^ pp at name_context ^ " ",
+                     ppname n ^ ":= " ^ pp at name_context ^ " ",
                       (Some n)::name_context
                 | None ->
                    (separate i) ^ "_ :? _ ", None::name_context