X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_proof_checking%2FcicPp.ml;h=5c5bd71fff473b8522256c633a0fa7c5e9546c74;hb=970ba0021a992efe25ec374875dc127ff236cc74;hp=11ed4418c67f8f4eae0f0244397306f45c62354e;hpb=265cf771fbfe217b5f274b999fc3ad887683a09a;p=helm.git diff --git a/helm/ocaml/cic_proof_checking/cicPp.ml b/helm/ocaml/cic_proof_checking/cicPp.ml index 11ed4418c..5c5bd71ff 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 -> "_" @@ -79,13 +79,14 @@ 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.Prop -> "Prop" + | C.Set -> "Set" + | C.Type -> "Type" + | C.CProp -> "CProp" ) | C.Implicit -> "?" | C.Prod (b,s,t) -> @@ -95,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 @@ -225,11 +226,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