X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fcomponents%2Fcic_proof_checking%2FcicPp.ml;h=06bb082b4110b531209d55321e4aa9e4f4763b15;hb=f32bf1be7432cc9ff21a3a84dd95ad2e44877611;hp=954134584b69db831d0d060cc0ed2bd301b4bdb0;hpb=55b82bd235d82ff7f0a40d980effe1efde1f5073;p=helm.git diff --git a/helm/software/components/cic_proof_checking/cicPp.ml b/helm/software/components/cic_proof_checking/cicPp.ml index 954134584..06bb082b4 100644 --- a/helm/software/components/cic_proof_checking/cicPp.ml +++ b/helm/software/components/cic_proof_checking/cicPp.ml @@ -95,14 +95,14 @@ let rec pp t l = | C.Implicit _ -> "?" | C.Prod (b,s,t) -> (match b with - C.Name n -> "(" ^ n ^ ":" ^ pp s l ^ ")" ^ pp t ((Some b)::l) - | C.Anonymous -> "(" ^ pp s l ^ "->" ^ pp t ((Some b)::l) ^ ")" + C.Name n -> "(\forall " ^ n ^ ":" ^ pp s l ^ "." ^ pp t ((Some b)::l) ^ ")" + | C.Anonymous -> "(" ^ pp s l ^ "\\to " ^ pp t ((Some b)::l) ^ ")" ) | C.Cast (v,t) -> "(" ^ pp v l ^ ":" ^ pp t l ^ ")" | C.Lambda (b,s,t) -> "(\\lambda " ^ ppname b ^ ":" ^ pp s l ^ "." ^ pp t ((Some b)::l) ^ ")" | C.LetIn (b,s,t) -> - "[" ^ ppname b ^ ":=" ^ pp s l ^ "]" ^ pp t ((Some b)::l) + " let " ^ ppname b ^ " \def " ^ pp s l ^ " in " ^ pp t ((Some b)::l) | C.Appl li -> "(" ^ (List.fold_right @@ -119,7 +119,8 @@ let rec pp t l = name ^ pp_exp_named_subst exp_named_subst l | _ -> raise CicPpInternalError with - _ -> UriManager.string_of_uri uri ^ "#1/" ^ string_of_int (n + 1) + Sys.Break as exn -> raise exn + | _ -> UriManager.string_of_uri uri ^ "#1/" ^ string_of_int (n + 1) ) | C.MutConstruct (uri,n1,n2,exp_named_subst) -> (try @@ -130,7 +131,8 @@ let rec pp t l = id ^ pp_exp_named_subst exp_named_subst l | _ -> raise CicPpInternalError with - _ -> + Sys.Break as exn -> raise exn + | _ -> UriManager.string_of_uri uri ^ "#1/" ^ string_of_int (n1 + 1) ^ "/" ^ string_of_int n2 ) @@ -311,11 +313,6 @@ let is_prefix prefix string = else None let remove_prefix prefix (last,string) = - if prefix="append" then - begin - prerr_endline last; - prerr_endline string; - end; if string = "" then (last,string) else match is_prefix prefix string with @@ -459,8 +456,6 @@ let rec check_names ctx hyp_names conclusion_name t = hyp_names=[] && check_name ~allow_suffix:true ctx conclusion_name t let check name term = -(* prerr_endline name; - prerr_endline (ppterm term); *) let names = Str.split (Str.regexp_string "_to_") name in let hyp_names,conclusion_name = match List.rev names with