X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_proof_checking%2FcicTypeChecker.ml;h=36bfb28b19cd22c77c7471ec5343dab140f20861;hb=c5d5bf37b1e4c4b9b499ed2cbfe27cf2ec181944;hp=7521f0f90b0456ca0ec8c0bf4c4e9a2d18922c25;hpb=296b163c8a2b09a6f87cbab15c2016de92fc8e70;p=helm.git diff --git a/helm/ocaml/cic_proof_checking/cicTypeChecker.ml b/helm/ocaml/cic_proof_checking/cicTypeChecker.ml index 7521f0f90..36bfb28b1 100644 --- a/helm/ocaml/cic_proof_checking/cicTypeChecker.ml +++ b/helm/ocaml/cic_proof_checking/cicTypeChecker.ml @@ -23,21 +23,13 @@ * http://cs.unibo.it/helm/. *) -type type_checker_exn = - Impossible of int - | NotWellTyped of string - | WrongUriToConstant of string - | WrongUriToVariable of string - | WrongUriToMutualInductiveDefinitions of string - | ListTooShort - | NotPositiveOccurrences of string - | NotWellFormedTypeOfInductiveConstructor of string - | WrongRequiredArgument of string - | RelToHiddenHypothesis - | MetasenvInconsistency;; +(* TODO factorize functions to frequent errors (e.g. "Unknwon mutual inductive + * ...") *) -(* This is the only exception that will be raised *) -exception TypeCheckerFailure of type_checker_exn;; +open Printf + +exception AssertFailure of string;; +exception TypeCheckerFailure of string;; let fdebug = ref 0;; let debug t context = @@ -47,17 +39,17 @@ let debug t context = CicPp.ppobj (C.Variable ("DEBUG", None, t, [])) ^ "\n" ^ i in if !fdebug = 0 then - raise - (TypeCheckerFailure - (NotWellTyped ("\n" ^ List.fold_right debug_aux (t::context) ""))) - (*print_endline ("\n" ^ List.fold_right debug_aux (t::context) "") ; flush stdout*) + raise (TypeCheckerFailure (List.fold_right debug_aux (t::context) "")) ;; +let debug_print = prerr_endline ;; + let rec split l n = match (l,n) with (l,0) -> ([], l) | (he::tl, n) -> let (l1,l2) = split tl (n-1) in (he::l1,l2) - | (_,_) -> raise (TypeCheckerFailure ListTooShort) + | (_,_) -> + raise (TypeCheckerFailure "Parameters number < left parameters number") ;; let debrujin_constructor uri number_of_types = @@ -66,7 +58,7 @@ let debrujin_constructor uri number_of_types = function C.Rel n as t when n <= k -> t | C.Rel _ -> - raise (TypeCheckerFailure (NotWellTyped ("Debrujin: open term found"))) + raise (TypeCheckerFailure "unbound variable found in constructor type") | C.Var (uri,exp_named_subst) -> let exp_named_subst' = List.map (function (uri,t) -> (uri,aux k t)) exp_named_subst @@ -74,7 +66,7 @@ let debrujin_constructor uri number_of_types = C.Var (uri,exp_named_subst') | C.Meta _ -> assert false | C.Sort _ - | C.Implicit as t -> t + | C.Implicit _ as t -> t | C.Cast (te,ty) -> C.Cast (aux k te, aux k ty) | C.Prod (n,s,t) -> C.Prod (n, aux k s, aux (k+1) t) | C.Lambda (n,s,t) -> C.Lambda (n, aux k s, aux (k+1) t) @@ -87,11 +79,9 @@ let debrujin_constructor uri number_of_types = C.Const (uri,exp_named_subst') | C.MutInd (uri',tyno,exp_named_subst) when UriManager.eq uri uri' -> if exp_named_subst != [] then - raise - (TypeCheckerFailure - (NotWellTyped - ("Debrujin: a non-empty explicit named substitution is applied to "^ - "a mutual inductive type which is being defined"))) ; + raise (TypeCheckerFailure + ("non-empty explicit named substitution is applied to "^ + "a mutual inductive type which is being defined")) ; C.Rel (k + number_of_types - tyno) ; | C.MutInd (uri',tyno,exp_named_subst) -> let exp_named_subst' = @@ -136,15 +126,17 @@ let rec type_of_constant uri = match CicEnvironment.is_type_checked ~trust:true uri with CicEnvironment.CheckedObj cobj -> cobj | CicEnvironment.UncheckedObj uobj -> - Logger.log (`Start_type_checking uri) ; + CicLogger.log (`Start_type_checking uri) ; (* let's typecheck the uncooked obj *) (match uobj with C.Constant (_,Some te,ty,_) -> let _ = type_of ty in - if not (R.are_convertible [] (type_of te) ty) then - raise - (TypeCheckerFailure - (NotWellTyped ("Constant " ^ (U.string_of_uri uri)))) + let type_of_te = type_of te in + if not (R.are_convertible [] type_of_te ty) then + raise (TypeCheckerFailure (sprintf + "the constant %s is not well typed because the type %s of the body is not convertible to the declared type %s" + (U.string_of_uri uri) (CicPp.ppterm type_of_te) + (CicPp.ppterm ty))) | C.Constant (_,None,ty,_) -> (* only to check that ty is well-typed *) let _ = type_of ty in () @@ -157,16 +149,18 @@ let rec type_of_constant uri = ) [] conjs in let _ = type_of_aux' conjs [] ty in - if not (R.are_convertible [] (type_of_aux' conjs [] te) ty) - then - raise - (TypeCheckerFailure - (NotWellTyped ("CurrentProof" ^ (U.string_of_uri uri)))) + let type_of_te = type_of_aux' conjs [] te in + if not (R.are_convertible [] type_of_te ty) then + raise (TypeCheckerFailure (sprintf + "the current proof %s is not well typed because the type %s of the body is not convertible to the declared type %s" + (U.string_of_uri uri) (CicPp.ppterm type_of_te) + (CicPp.ppterm ty))) | _ -> - raise (TypeCheckerFailure (WrongUriToConstant (U.string_of_uri uri))) - ) ; + raise (TypeCheckerFailure + ("Unknown constant:" ^ U.string_of_uri uri)) + ); CicEnvironment.set_type_checking_info uri ; - Logger.log (`Type_checking_completed uri) ; + CicLogger.log (`Type_checking_completed uri) ; match CicEnvironment.is_type_checked ~trust:false uri with CicEnvironment.CheckedObj cobj -> cobj | CicEnvironment.UncheckedObj _ -> raise CicEnvironmentError @@ -174,7 +168,8 @@ let rec type_of_constant uri = match cobj with C.Constant (_,_,ty,_) -> ty | C.CurrentProof (_,_,_,ty,_) -> ty - | _ -> raise (TypeCheckerFailure (WrongUriToConstant (U.string_of_uri uri))) + | _ -> + raise (TypeCheckerFailure ("Unknown constant:" ^ U.string_of_uri uri)) and type_of_variable uri = let module C = Cic in @@ -184,23 +179,21 @@ and type_of_variable uri = match CicEnvironment.is_type_checked ~trust:true uri with CicEnvironment.CheckedObj (C.Variable (_,_,ty,_)) -> ty | CicEnvironment.UncheckedObj (C.Variable (_,bo,ty,_)) -> - Logger.log (`Start_type_checking uri) ; + CicLogger.log (`Start_type_checking uri) ; (* only to check that ty is well-typed *) let _ = type_of ty in (match bo with None -> () | Some bo -> if not (R.are_convertible [] (type_of bo) ty) then - raise - (TypeCheckerFailure - (NotWellTyped ("Variable " ^ (U.string_of_uri uri)))) + raise (TypeCheckerFailure + ("Unknown variable:" ^ U.string_of_uri uri)) ) ; CicEnvironment.set_type_checking_info uri ; - Logger.log (`Type_checking_completed uri) ; + CicLogger.log (`Type_checking_completed uri) ; ty | _ -> - raise - (TypeCheckerFailure (WrongUriToVariable (UriManager.string_of_uri uri))) + raise (TypeCheckerFailure ("Unknown variable:" ^ U.string_of_uri uri)) and does_not_occur context n nn te = let module C = Cic in @@ -210,9 +203,9 @@ and does_not_occur context n nn te = match CicReduction.whd context te with C.Rel m when m > n && m <= nn -> false | C.Rel _ - | C.Meta _ + | C.Meta _ (* CSC: Are we sure? No recursion?*) | C.Sort _ - | C.Implicit -> true + | C.Implicit _ -> true | C.Cast (te,ty) -> does_not_occur context n nn te && does_not_occur context n nn ty | C.Prod (name,so,dest) -> @@ -272,7 +265,7 @@ and weakly_positive context n nn uri te = let module C = Cic in (*CSC: Che schifo! Bisogna capire meglio e trovare una soluzione ragionevole!*) let dummy_mutind = - C.MutInd (UriManager.uri_of_string "cic:/Coq/Init/Datatypes/nat.ind",0,[]) + C.MutInd (HelmLibraryObjects.Datatypes.nat_URI,0,[]) in (*CSC mettere in cicSubstitution *) let rec subst_inductive_type_with_dummy_mutind = @@ -347,10 +340,7 @@ and weakly_positive context n nn uri te = weakly_positive ((Some (name,(C.Decl source)))::context) (n + 1) (nn + 1) uri dest | _ -> - raise - (TypeCheckerFailure - (NotWellFormedTypeOfInductiveConstructor - ("Guess where the error is ;-)"))) + raise (TypeCheckerFailure "Malformed inductive constructor type") (* instantiate_parameters ps (x1:T1)...(xn:Tn)C *) (* returns ((x_|ps|:T_|ps|)...(xn:Tn)C){ps_1 / x1 ; ... ; ps_|ps| / x_|ps|} *) @@ -362,7 +352,7 @@ and instantiate_parameters params c = instantiate_parameters tl (CicSubstitution.subst he ta) | (C.Cast (te,_), _) -> instantiate_parameters params te - | (t,l) -> raise (TypeCheckerFailure (Impossible 1)) + | (t,l) -> raise (AssertFailure "1") and strictly_positive context n nn te = let module C = Cic in @@ -384,9 +374,8 @@ and strictly_positive context n nn te = let (name,_,ity,cl) = List.nth tl i in (List.length tl = 1, paramsno, ity, cl, name) | _ -> - raise - (TypeCheckerFailure - (WrongUriToMutualInductiveDefinitions(U.string_of_uri uri))) + raise (TypeCheckerFailure + ("Unknown inductive type:" ^ U.string_of_uri uri)) in let (params,arguments) = split tl paramsno in let lifted_params = List.map (CicSubstitution.lift 1) params in @@ -427,24 +416,24 @@ and are_all_occurrences_positive context uri indparamsno i n nn te = match CicReduction.whd context x with C.Rel m when m = n - (indparamsno - k) -> k - 1 | _ -> - raise - (TypeCheckerFailure - (WrongRequiredArgument (UriManager.string_of_uri uri))) + raise (TypeCheckerFailure + ("Non-positive occurence in mutual inductive definition(s) " ^ + UriManager.string_of_uri uri)) ) indparamsno tl in if last = 0 then List.fold_right (fun x i -> i && does_not_occur context n nn x) tl true else - raise - (TypeCheckerFailure - (WrongRequiredArgument (UriManager.string_of_uri uri))) + raise (TypeCheckerFailure + ("Non-positive occurence in mutual inductive definition(s) " ^ + UriManager.string_of_uri uri)) | C.Rel m when m = i -> if indparamsno = 0 then true else - raise - (TypeCheckerFailure - (WrongRequiredArgument (UriManager.string_of_uri uri))) + raise (TypeCheckerFailure + ("Non-positive occurence in mutual inductive definition(s) " ^ + UriManager.string_of_uri uri)) | C.Prod (C.Anonymous,source,dest) -> strictly_positive context n nn source && are_all_occurrences_positive @@ -463,8 +452,8 @@ and are_all_occurrences_positive context uri indparamsno i n nn te = uri indparamsno (i+1) (n + 1) (nn + 1) dest | _ -> raise - (TypeCheckerFailure - (NotWellFormedTypeOfInductiveConstructor (UriManager.string_of_uri uri))) + (TypeCheckerFailure ("Malformed inductive constructor type " ^ + (UriManager.string_of_uri uri))) (* Main function to checks the correctness of a mutual *) (* inductive block definition. This is the function *) @@ -502,8 +491,8 @@ and typecheck_mutual_inductive_defs uri (itl,_,indparamsno) = debrujinedte) then raise - (TypeCheckerFailure - (NotPositiveOccurrences (U.string_of_uri uri))) + (TypeCheckerFailure ("Non positive occurence in " ^ + U.string_of_uri uri)) ) cl ; (i + 1) ) itl 1 @@ -517,9 +506,8 @@ and check_mutual_inductive_defs uri = Cic.InductiveDefinition (itl, params, indparamsno) -> typecheck_mutual_inductive_defs uri (itl,params,indparamsno) | _ -> - raise - (TypeCheckerFailure - (WrongUriToMutualInductiveDefinitions (UriManager.string_of_uri uri))) + raise (TypeCheckerFailure ("Unknown mutual inductive definition:" ^ + UriManager.string_of_uri uri)) and type_of_mutual_inductive_defs uri i = let module C = Cic in @@ -529,10 +517,10 @@ and type_of_mutual_inductive_defs uri i = match CicEnvironment.is_type_checked ~trust:true uri with CicEnvironment.CheckedObj cobj -> cobj | CicEnvironment.UncheckedObj uobj -> - Logger.log (`Start_type_checking uri) ; + CicLogger.log (`Start_type_checking uri) ; check_mutual_inductive_defs uri uobj ; CicEnvironment.set_type_checking_info uri ; - Logger.log (`Type_checking_completed uri) ; + CicLogger.log (`Type_checking_completed uri) ; (match CicEnvironment.is_type_checked ~trust:false uri with CicEnvironment.CheckedObj cobj -> cobj | CicEnvironment.UncheckedObj _ -> raise CicEnvironmentError @@ -543,9 +531,8 @@ and type_of_mutual_inductive_defs uri i = let (_,_,arity,_) = List.nth dl i in arity | _ -> - raise - (TypeCheckerFailure - (WrongUriToMutualInductiveDefinitions (U.string_of_uri uri))) + raise (TypeCheckerFailure ("Unknown mutual inductive definition:" ^ + U.string_of_uri uri)) and type_of_mutual_inductive_constr uri i j = let module C = Cic in @@ -555,10 +542,10 @@ and type_of_mutual_inductive_constr uri i j = match CicEnvironment.is_type_checked ~trust:true uri with CicEnvironment.CheckedObj cobj -> cobj | CicEnvironment.UncheckedObj uobj -> - Logger.log (`Start_type_checking uri) ; + CicLogger.log (`Start_type_checking uri) ; check_mutual_inductive_defs uri uobj ; CicEnvironment.set_type_checking_info uri ; - Logger.log (`Type_checking_completed uri) ; + CicLogger.log (`Type_checking_completed uri) ; (match CicEnvironment.is_type_checked ~trust:false uri with CicEnvironment.CheckedObj cobj -> cobj | CicEnvironment.UncheckedObj _ -> raise CicEnvironmentError @@ -570,9 +557,8 @@ and type_of_mutual_inductive_constr uri i j = let (_,ty) = List.nth cl (j-1) in ty | _ -> - raise - (TypeCheckerFailure - (WrongUriToMutualInductiveDefinitions (U.string_of_uri uri))) + raise (TypeCheckerFailure ("Unknown mutual inductive definition:" ^ + UriManager.string_of_uri uri)) and recursive_args context n nn te = let module C = Cic in @@ -581,23 +567,22 @@ and recursive_args context n nn te = | C.Var _ | C.Meta _ | C.Sort _ - | C.Implicit + | C.Implicit _ | C.Cast _ (*CSC ??? *) -> - raise (TypeCheckerFailure (Impossible 3)) (* due to type-checking *) + raise (AssertFailure "3") (* due to type-checking *) | C.Prod (name,so,de) -> (not (does_not_occur context n nn so)) :: (recursive_args ((Some (name,(C.Decl so)))::context) (n+1) (nn + 1) de) | C.Lambda _ | C.LetIn _ -> - raise (TypeCheckerFailure (Impossible 4)) (* due to type-checking *) + raise (AssertFailure "4") (* due to type-checking *) | C.Appl _ -> [] - | C.Const _ -> raise (TypeCheckerFailure (Impossible 5)) + | C.Const _ -> raise (AssertFailure "5") | C.MutInd _ | C.MutConstruct _ | C.MutCase _ | C.Fix _ - | C.CoFix _ -> - raise (TypeCheckerFailure (Impossible 6)) (* due to type-checking *) + | C.CoFix _ -> raise (AssertFailure "6") (* due to type-checking *) and get_new_safes context p c rl safes n nn x = let module C = Cic in @@ -619,13 +604,16 @@ and get_new_safes context p c rl safes n nn x = | (C.Prod _, (C.Rel _ as e), _) | (C.MutInd _, e, []) | (C.Appl _, e, []) -> (e,safes,n,nn,x,context) - | (_,_,_) -> + | (c,p,l) -> (* CSC: If the next exception is raised, it just means that *) (* CSC: the proof-assistant allows to use very strange things *) (* CSC: as a branch of a case whose type is a Prod. In *) (* CSC: particular, this means that a new (C.Prod, x,_) case *) (* CSC: must be considered in this match. (e.g. x = MutCase) *) - raise (TypeCheckerFailure (Impossible 7)) + raise + (AssertFailure + (Printf.sprintf "Get New Safes: c=%s ; p=%s" + (CicPp.ppterm c) (CicPp.ppterm p))) and split_prods context n te = let module C = Cic in @@ -634,7 +622,7 @@ and split_prods context n te = (0, _) -> context,te | (n, C.Prod (name,so,ta)) when n > 0 -> split_prods ((Some (name,(C.Decl so)))::context) (n - 1) ta - | (_, _) -> raise (TypeCheckerFailure (Impossible 8)) + | (_, _) -> raise (AssertFailure "8") and eat_lambdas context n te = let module C = Cic in @@ -646,7 +634,8 @@ and eat_lambdas context n te = eat_lambdas ((Some (name,(C.Decl so)))::context) (n - 1) ta in (te, k + 1, context') - | (_, _) -> raise (TypeCheckerFailure (Impossible 9)) + | (n, te) -> + raise (AssertFailure (sprintf "9 (%d, %s)" n (CicPp.ppterm te))) (*CSC: Tutto quello che segue e' l'intuzione di luca ;-) *) and check_is_really_smaller_arg context n nn kl x safes te = @@ -660,7 +649,7 @@ and check_is_really_smaller_arg context n nn kl x safes te = | C.Var _ | C.Meta _ | C.Sort _ - | C.Implicit + | C.Implicit _ | C.Cast _ (* | C.Cast (te,ty) -> check_is_really_smaller_arg n nn kl x safes te && @@ -669,7 +658,7 @@ and check_is_really_smaller_arg context n nn kl x safes te = check_is_really_smaller_arg n nn kl x safes so && check_is_really_smaller_arg (n+1) (nn+1) kl (x+1) (List.map (fun x -> x + 1) safes) ta*) - | C.Prod _ -> raise (TypeCheckerFailure (Impossible 10)) + | C.Prod _ -> raise (AssertFailure "10") | C.Lambda (name,so,ta) -> check_is_really_smaller_arg context n nn kl x safes so && check_is_really_smaller_arg ((Some (name,(C.Decl so)))::context) @@ -682,9 +671,9 @@ and check_is_really_smaller_arg context n nn kl x safes te = (*CSC: sulla coda ci vogliono dei controlli? secondo noi no, ma *) (*CSC: solo perche' non abbiamo trovato controesempi *) check_is_really_smaller_arg context n nn kl x safes he - | C.Appl [] -> raise (TypeCheckerFailure (Impossible 11)) + | C.Appl [] -> raise (AssertFailure "11") | C.Const _ - | C.MutInd _ -> raise (TypeCheckerFailure (Impossible 12)) + | C.MutInd _ -> raise (AssertFailure "12") | C.MutConstruct _ -> false | C.MutCase (uri,i,outtype,term,pl) -> (match term with @@ -704,9 +693,9 @@ and check_is_really_smaller_arg context n nn kl x safes te = in (tys,List.length tl,isinductive,paramsno,cl') | _ -> - raise - (TypeCheckerFailure - (WrongUriToMutualInductiveDefinitions(U.string_of_uri uri))) + raise (TypeCheckerFailure + ("Unknown mutual inductive definition:" ^ + UriManager.string_of_uri uri)) in if not isinductive then List.fold_right @@ -742,9 +731,9 @@ and check_is_really_smaller_arg context n nn kl x safes te = in (tys,List.length tl,isinductive,paramsno,cl') | _ -> - raise - (TypeCheckerFailure - (WrongUriToMutualInductiveDefinitions(U.string_of_uri uri))) + raise (TypeCheckerFailure + ("Unknown mutual inductive definition:" ^ + UriManager.string_of_uri uri)) in if not isinductive then List.fold_right @@ -804,16 +793,17 @@ and guarded_by_destructors context n nn kl x safes = let module U = UriManager in function C.Rel m when m > n && m <= nn -> false - | C.Rel n -> + | C.Rel m -> (match List.nth context (n-1) with Some (_,C.Decl _) -> true | Some (_,C.Def (bo,_)) -> - guarded_by_destructors context n nn kl x safes bo - | None -> raise (TypeCheckerFailure RelToHiddenHypothesis) + guarded_by_destructors context m nn kl x safes + (CicSubstitution.lift m bo) + | None -> raise (TypeCheckerFailure "Reference to deleted hypothesis") ) | C.Meta _ | C.Sort _ - | C.Implicit -> true + | C.Implicit _ -> true | C.Cast (te,ty) -> guarded_by_destructors context n nn kl x safes te && guarded_by_destructors context n nn kl x safes ty @@ -855,21 +845,25 @@ and guarded_by_destructors context n nn kl x safes = let (tys,len,isinductive,paramsno,cl) = match CicEnvironment.get_obj uri with C.InductiveDefinition (tl,_,paramsno) -> - let (_,isinductive,_,cl) = List.nth tl i in - let tys = - List.map (fun (n,_,ty,_) -> - Some(Cic.Name n,(Cic.Decl ty))) tl - in - let cl' = - List.map - (fun (id,ty) -> - (id, snd (split_prods tys paramsno ty))) cl + let len = List.length tl in + let (_,isinductive,_,cl) = List.nth tl i in + let tys = + List.map (fun (n,_,ty,_) -> + Some(Cic.Name n,(Cic.Decl ty))) tl in - (tys,List.length tl,isinductive,paramsno,cl') + let cl' = + List.map + (fun (id,ty) -> + let debrujinedty = debrujin_constructor uri len ty in + (id, snd (split_prods tys paramsno ty), + snd (split_prods tys paramsno debrujinedty) + )) cl + in + (tys,len,isinductive,paramsno,cl') | _ -> - raise - (TypeCheckerFailure - (WrongUriToMutualInductiveDefinitions(U.string_of_uri uri))) + raise (TypeCheckerFailure + ("Unknown mutual inductive definition:" ^ + UriManager.string_of_uri uri)) in if not isinductive then guarded_by_destructors context n nn kl x safes outtype && @@ -883,11 +877,8 @@ and guarded_by_destructors context n nn kl x safes = guarded_by_destructors context n nn kl x safes outtype && (*CSC: manca ??? il controllo sul tipo di term? *) List.fold_right - (fun (p,(_,c)) i -> - let rl' = - let debrujinedte = debrujin_constructor uri len c in - recursive_args tys 0 len debrujinedte - in + (fun (p,(_,c,brujinedc)) i -> + let rl' = recursive_args tys 0 len brujinedc in let (e,safes',n',nn',x',context') = get_new_safes context p c rl' safes n nn x in @@ -910,9 +901,9 @@ and guarded_by_destructors context n nn kl x safes = in (tys,List.length tl,isinductive,paramsno,cl') | _ -> - raise - (TypeCheckerFailure - (WrongUriToMutualInductiveDefinitions(U.string_of_uri uri))) + raise (TypeCheckerFailure + ("Unknown mutual inductive definition:" ^ + UriManager.string_of_uri uri)) in if not isinductive then guarded_by_destructors context n nn kl x safes outtype && @@ -991,12 +982,12 @@ and guarded_by_constructors context n nn h te args coInductiveTypeURI = | C.Rel _ -> true | C.Meta _ | C.Sort _ - | C.Implicit + | C.Implicit _ | C.Cast _ | C.Prod _ | C.LetIn _ -> (* the term has just been type-checked *) - raise (TypeCheckerFailure (Impossible 17)) + raise (AssertFailure "17") | C.Lambda (name,so,de) -> does_not_occur context n nn so && guarded_by_constructors ((Some (name,(C.Decl so)))::context) @@ -1012,26 +1003,24 @@ and guarded_by_constructors context n nn h te args coInductiveTypeURI = let (_,cons) = List.nth cl (j - 1) in CicSubstitution.subst_vars exp_named_subst cons | _ -> - raise - (TypeCheckerFailure - (WrongUriToMutualInductiveDefinitions - (UriManager.string_of_uri uri))) + raise (TypeCheckerFailure ("Unknown mutual inductive definition:" ^ + UriManager.string_of_uri uri)) in let rec analyse_branch context ty te = match CicReduction.whd context ty with - C.Meta _ -> raise (TypeCheckerFailure (Impossible 34)) + C.Meta _ -> raise (AssertFailure "34") | C.Rel _ | C.Var _ | C.Sort _ -> does_not_occur context n nn te - | C.Implicit + | C.Implicit _ | C.Cast _ -> - raise (TypeCheckerFailure (Impossible 24))(* due to type-checking *) + raise (AssertFailure "24")(* due to type-checking *) | C.Prod (name,so,de) -> analyse_branch ((Some (name,(C.Decl so)))::context) de te | C.Lambda _ | C.LetIn _ -> - raise (TypeCheckerFailure (Impossible 25))(* due to type-checking *) + raise (AssertFailure "25")(* due to type-checking *) | C.Appl ((C.MutInd (uri,_,_))::_) as ty when uri == coInductiveTypeURI -> guarded_by_constructors context n nn true te [] coInductiveTypeURI @@ -1039,18 +1028,18 @@ and guarded_by_constructors context n nn h te args coInductiveTypeURI = guarded_by_constructors context n nn true te tl coInductiveTypeURI | C.Appl _ -> does_not_occur context n nn te - | C.Const _ -> raise (TypeCheckerFailure (Impossible 26)) + | C.Const _ -> raise (AssertFailure "26") | C.MutInd (uri,_,_) when uri == coInductiveTypeURI -> guarded_by_constructors context n nn true te [] coInductiveTypeURI | C.MutInd _ -> does_not_occur context n nn te - | C.MutConstruct _ -> raise (TypeCheckerFailure (Impossible 27)) + | C.MutConstruct _ -> raise (AssertFailure "27") (*CSC: we do not consider backbones with a MutCase, Fix, Cofix *) (*CSC: in head position. *) | C.MutCase _ | C.Fix _ | C.CoFix _ -> - raise (TypeCheckerFailure (Impossible 28))(* due to type-checking *) + raise (AssertFailure "28")(* due to type-checking *) in let rec analyse_instantiated_type context ty l = match CicReduction.whd context ty with @@ -1058,9 +1047,8 @@ and guarded_by_constructors context n nn h te args coInductiveTypeURI = | C.Var _ | C.Meta _ | C.Sort _ - | C.Implicit - | C.Cast _ -> - raise (TypeCheckerFailure (Impossible 29))(* due to type-checking *) + | C.Implicit _ + | C.Cast _ -> raise (AssertFailure "29")(* due to type-checking *) | C.Prod (name,so,de) -> begin match l with @@ -1072,21 +1060,21 @@ and guarded_by_constructors context n nn h te args coInductiveTypeURI = end | C.Lambda _ | C.LetIn _ -> - raise (TypeCheckerFailure (Impossible 30))(* due to type-checking *) + raise (AssertFailure "30")(* due to type-checking *) | C.Appl _ -> List.fold_left (fun i x -> i && does_not_occur context n nn x) true l - | C.Const _ -> raise (TypeCheckerFailure (Impossible 31)) + | C.Const _ -> raise (AssertFailure "31") | C.MutInd _ -> List.fold_left (fun i x -> i && does_not_occur context n nn x) true l - | C.MutConstruct _ -> raise (TypeCheckerFailure (Impossible 32)) + | C.MutConstruct _ -> raise (AssertFailure "32") (*CSC: we do not consider backbones with a MutCase, Fix, Cofix *) (*CSC: in head position. *) | C.MutCase _ | C.Fix _ | C.CoFix _ -> - raise (TypeCheckerFailure (Impossible 33))(* due to type-checking *) + raise (AssertFailure "33")(* due to type-checking *) in let rec instantiate_type args consty = function @@ -1105,7 +1093,7 @@ and guarded_by_constructors context n nn h te args coInductiveTypeURI = | _ -> (*CSC:We do not consider backbones with a MutCase, a *) (*CSC:FixPoint, a CoFixPoint and so on in head position.*) - raise (TypeCheckerFailure (Impossible 23)) + raise (AssertFailure "23") end | [] -> analyse_instantiated_type context consty' l (* These are all the other cases *) @@ -1186,7 +1174,8 @@ and check_allowed_sort_elimination context uri i need_dummy ind arity1 arity2 = | (C.Sort C.Prop, C.Sort C.Prop) when need_dummy -> true | (C.Sort C.Prop, C.Sort C.Set) | (C.Sort C.Prop, C.Sort C.CProp) - | (C.Sort C.Prop, C.Sort C.Type) when need_dummy -> + | (C.Sort C.Prop, C.Sort (C.Type _) ) when need_dummy -> + (* TASSI: da verificare *) (*CSC: WRONG. MISSING CONDITIONS ON THE ARGUMENTS OF THE CONSTRUTOR *) (match CicEnvironment.get_obj uri with C.InductiveDefinition (itl,_,_) -> @@ -1194,9 +1183,8 @@ and check_allowed_sort_elimination context uri i need_dummy ind arity1 arity2 = (* is a singleton definition or the empty proposition? *) List.length cl = 1 || List.length cl = 0 | _ -> - raise - (TypeCheckerFailure - (WrongUriToMutualInductiveDefinitions (U.string_of_uri uri))) + raise (TypeCheckerFailure ("Unknown mutual inductive definition:" ^ + UriManager.string_of_uri uri)) ) | (C.Sort C.Set, C.Sort C.Prop) when need_dummy -> true | (C.Sort C.CProp, C.Sort C.Prop) when need_dummy -> true @@ -1204,7 +1192,8 @@ and check_allowed_sort_elimination context uri i need_dummy ind arity1 arity2 = | (C.Sort C.Set, C.Sort C.CProp) when need_dummy -> true | (C.Sort C.CProp, C.Sort C.Set) when need_dummy -> true | (C.Sort C.CProp, C.Sort C.CProp) when need_dummy -> true - | ((C.Sort C.Set, C.Sort C.Type) | (C.Sort C.CProp, C.Sort C.Type)) + | ((C.Sort C.Set, C.Sort (C.Type _)) | (C.Sort C.CProp, C.Sort (C.Type _))) + (* TASSI: da verificare *) when need_dummy -> (match CicEnvironment.get_obj uri with C.InductiveDefinition (itl,_,paramsno) -> @@ -1215,11 +1204,11 @@ and check_allowed_sort_elimination context uri i need_dummy ind arity1 arity2 = List.fold_right (fun (_,x) i -> i && is_small tys paramsno x) cl true | _ -> - raise - (TypeCheckerFailure - (WrongUriToMutualInductiveDefinitions (U.string_of_uri uri))) + raise (TypeCheckerFailure ("Unknown mutual inductive definition:" ^ + UriManager.string_of_uri uri)) ) - | (C.Sort C.Type, C.Sort _) when need_dummy -> true + | (C.Sort (C.Type _), C.Sort _) when need_dummy -> true + (* TASSI: da verificare *) | (C.Sort C.Prop, C.Prod (name,so,ta)) when not need_dummy -> let res = CicReduction.are_convertible context so ind in @@ -1233,9 +1222,9 @@ and check_allowed_sort_elimination context uri i need_dummy ind arity1 arity2 = (* is a singleton definition? *) List.length cl = 1 | _ -> - raise - (TypeCheckerFailure - (WrongUriToMutualInductiveDefinitions(U.string_of_uri uri))) + raise (TypeCheckerFailure + ("Unknown mutual inductive definition:" ^ + UriManager.string_of_uri uri)) ) | _ -> false ) @@ -1248,7 +1237,8 @@ and check_allowed_sort_elimination context uri i need_dummy ind arity1 arity2 = C.Sort C.Prop | C.Sort C.Set -> true | C.Sort C.CProp -> true - | C.Sort C.Type -> + | C.Sort (C.Type _) -> + (* TASSI: da verificare *) (match CicEnvironment.get_obj uri with C.InductiveDefinition (itl,_,paramsno) -> let (_,_,_,cl) = List.nth itl i in @@ -1259,13 +1249,14 @@ and check_allowed_sort_elimination context uri i need_dummy ind arity1 arity2 = List.fold_right (fun (_,x) i -> i && is_small tys paramsno x) cl true | _ -> - raise - (TypeCheckerFailure - (WrongUriToMutualInductiveDefinitions(U.string_of_uri uri))) + raise (TypeCheckerFailure + ("Unknown mutual inductive definition:" ^ + UriManager.string_of_uri uri)) ) - | _ -> raise (TypeCheckerFailure (Impossible 19)) + | _ -> raise (AssertFailure "19") ) - | (C.Sort C.Type, C.Prod (_,so,_)) when not need_dummy -> + | (C.Sort (C.Type _), C.Prod (_,so,_)) when not need_dummy -> + (* TASSI: da verificare *) CicReduction.are_convertible context so ind | (_,_) -> false @@ -1294,7 +1285,7 @@ and type_of_branch context argsno need_dummy outtype term constype = C.Prod (C.Anonymous,so,type_of_branch ((Some (name,(C.Decl so)))::context) argsno need_dummy (CicSubstitution.lift 1 outtype) term' de) - | _ -> raise (TypeCheckerFailure (Impossible 20)) + | _ -> raise (AssertFailure "20") (* check_metasenv_consistency checks that the "canonical" context of a metavariable is consitent - up to relocation via the relocation list l - @@ -1313,22 +1304,29 @@ and check_metasenv_consistency metasenv context canonical_context l = | (Some (n,C.Def (t,None)))::tl -> (Some (n,C.Def ((S.lift_meta l (S.lift i t)),None)))::(aux (i+1) tl) | None::tl -> None::(aux (i+1) tl) - | (Some (n,C.Def (_,Some _)))::_ -> assert false + | (Some (n,C.Def (t,Some ty)))::tl -> + (Some (n,C.Def ((S.lift_meta l (S.lift i t)),Some (S.lift_meta l (S.lift i ty)))))::(aux (i+1) tl) in aux 1 canonical_context in List.iter2 (fun t ct -> - let res = match (t,ct) with - _,None -> true + | _,None -> () | Some t,Some (_,C.Def (ct,_)) -> - R.are_convertible context t ct + if not (R.are_convertible context t ct) then + raise (TypeCheckerFailure (sprintf + "Not well typed metavariable local context: expected a term convertible with %s, found %s" + (CicPp.ppterm ct) (CicPp.ppterm t))) | Some t,Some (_,C.Decl ct) -> - R.are_convertible context (type_of_aux' metasenv context t) ct - | _, _ -> false - in - if not res then raise (TypeCheckerFailure MetasenvInconsistency) + let type_t = type_of_aux' metasenv context t in + if not (R.are_convertible context type_t ct) then + raise (TypeCheckerFailure (sprintf + "Not well typed metavariable local context: expected a term of type %s, found %s of type %s" + (CicPp.ppterm ct) (CicPp.ppterm t) (CicPp.ppterm type_t))) + | None, _ -> + raise (TypeCheckerFailure + "Not well typed metavariable local context: an hypothesis, that is not hidden, is not instantiated") ) l lifted_canonical_context (* type_of_aux' is just another name (with a different scope) for type_of_aux *) @@ -1345,11 +1343,12 @@ and type_of_aux' metasenv context t = Some (_,C.Decl t) -> S.lift n t | Some (_,C.Def (_,Some ty)) -> S.lift n ty | Some (_,C.Def (bo,None)) -> - prerr_endline "##### CASO DA INVESTIGARE E CAPIRE" ; + debug_print "##### CASO DA INVESTIGARE E CAPIRE" ; type_of_aux context (S.lift n bo) - | None -> raise (TypeCheckerFailure RelToHiddenHypothesis) + | None -> raise (TypeCheckerFailure "Reference to deleted hypothesis") with - _ -> raise (TypeCheckerFailure (NotWellTyped "Not a close term")) + _ -> + raise (TypeCheckerFailure "unbound variable") ) | C.Var (uri,exp_named_subst) -> incr fdebug ; @@ -1360,28 +1359,44 @@ and type_of_aux' metasenv context t = decr fdebug ; ty | C.Meta (n,l) -> - let (_,canonical_context,ty) = - List.find (function (m,_,_) -> n = m) metasenv - in + let (_,canonical_context,ty) = CicUtil.lookup_meta n metasenv in check_metasenv_consistency metasenv context canonical_context l; CicSubstitution.lift_meta l ty - | C.Sort s -> C.Sort C.Type (*CSC manca la gestione degli universi!!! *) - | C.Implicit -> raise (TypeCheckerFailure (Impossible 21)) - | C.Cast (te,ty) -> + (* TASSI: CONSTRAINTS *) + | C.Sort (C.Type t) -> + let t' = CicUniv.fresh() in + if not (CicUniv.add_gt t' t ) then + assert false (* t' is fresh! an error in CicUniv *) + else + C.Sort (C.Type t') + (* TASSI: CONSTRAINTS *) + | C.Sort s -> C.Sort (C.Type (CicUniv.fresh ())) + | C.Implicit _ -> raise (AssertFailure "21") + | C.Cast (te,ty) as t -> let _ = type_of_aux context ty in - if R.are_convertible context (type_of_aux context te) ty then ty - else raise (TypeCheckerFailure (NotWellTyped "Cast")) + if R.are_convertible context (type_of_aux context te) ty then + ty + else + raise (TypeCheckerFailure + (sprintf "Invalid cast %s" (CicPp.ppterm t))) | C.Prod (name,s,t) -> let sort1 = type_of_aux context s and sort2 = type_of_aux ((Some (name,(C.Decl s)))::context) t in sort_of_prod context (name,s) (sort1,sort2) | C.Lambda (n,s,t) -> - let sort1 = type_of_aux context s - and type2 = type_of_aux ((Some (n,(C.Decl s)))::context) t in - let sort2 = type_of_aux ((Some (n,(C.Decl s)))::context) type2 in - (* only to check if the product is well-typed *) - let _ = sort_of_prod context (n,s) (sort1,sort2) in - C.Prod (n,s,type2) + let sort1 = type_of_aux context s in + (match R.whd context sort1 with + C.Meta _ + | C.Sort _ -> () + | _ -> + raise + (TypeCheckerFailure (sprintf + "Not well-typed lambda-abstraction: the source %s should be a + type; instead it is a term of type %s" (CicPp.ppterm s) + (CicPp.ppterm sort1))) + ) ; + let type2 = type_of_aux ((Some (n,(C.Decl s)))::context) t in + C.Prod (n,s,type2) | C.LetIn (n,s,t) -> (* only to check if s is well-typed *) let ty = type_of_aux context s in @@ -1403,7 +1418,7 @@ and type_of_aux' metasenv context t = let hetype = type_of_aux context he and tlbody_and_type = List.map (fun x -> (x, type_of_aux context x)) tl in eat_prods context hetype tlbody_and_type - | C.Appl _ -> raise (TypeCheckerFailure (NotWellTyped "Appl: no arguments")) + | C.Appl _ -> raise (AssertFailure "Appl: no arguments") | C.Const (uri,exp_named_subst) -> incr fdebug ; check_exp_named_subst context exp_named_subst ; @@ -1432,7 +1447,8 @@ and type_of_aux' metasenv context t = let outsort = type_of_aux context outtype in let (need_dummy, k) = let rec guess_args context t = - match CicReduction.whd context t with + let outtype = CicReduction.whd context t in + match outtype with C.Sort _ -> (true, 0) | C.Prod (name, s, t) -> let (b, n) = guess_args ((Some (name,(C.Decl s)))::context) t in @@ -1449,8 +1465,8 @@ and type_of_aux' metasenv context t = else (b, n + 1) | _ -> - raise - (TypeCheckerFailure (NotWellTyped "MutCase: outtype ill-formed")) + raise (TypeCheckerFailure (sprintf + "Malformed case analasys' output type %s" (CicPp.ppterm outtype))) in (*CSC whd non serve dopo type_of_aux ? *) let (b, k) = guess_args context outsort in @@ -1464,23 +1480,21 @@ and type_of_aux' metasenv context t = (*CSC: Hint: nella DTD servono per gli stylesheet. *) C.MutInd (uri',i',exp_named_subst) as typ -> if U.eq uri uri' && i = i' then ([],[],exp_named_subst) - else raise (TypeCheckerFailure - (NotWellTyped ("MutCase: the term is of type " ^ - CicPp.ppterm typ ^ - " instead of type " ^ (U.string_of_uri uri) ^ "#1/" ^ - string_of_int i ^ "{_}"))) - | C.Appl ((C.MutInd (uri',i',exp_named_subst) as typ):: tl) -> + else raise (TypeCheckerFailure (sprintf + "Case analysys: analysed term type is %s, but is expected to be (an application of) %s#1/%d{_}" + (CicPp.ppterm typ) (U.string_of_uri uri) i)) + | C.Appl ((C.MutInd (uri',i',exp_named_subst) as typ):: tl) as typ' -> if U.eq uri uri' && i = i' then let params,args = split tl (List.length tl - k) in params,args,exp_named_subst - else raise (TypeCheckerFailure (NotWellTyped - ("MutCase: the term is of type " ^ - CicPp.ppterm typ ^ - " instead of type " ^ (U.string_of_uri uri) ^ "#1/" ^ - string_of_int i ^ "{_}"))) - | _ -> raise (TypeCheckerFailure - (NotWellTyped "MutCase: the term is not an inductive one")) + else raise (TypeCheckerFailure (sprintf + "Case analysys: analysed term type is %s, but is expected to be (an application of) %s#1/%d{_}" + (CicPp.ppterm typ') (U.string_of_uri uri) i)) + | _ -> + raise (TypeCheckerFailure (sprintf + "Case analysis: analysed term %s is not an inductive one" + (CicPp.ppterm term))) in (* let's control if the sort elimination is allowed: [(I q1 ... qr)|B] *) let sort_of_ind_type = @@ -1493,17 +1507,15 @@ and type_of_aux' metasenv context t = sort_of_ind_type (type_of_aux context sort_of_ind_type) outsort) then raise - (TypeCheckerFailure - (NotWellTyped "MutCase: not allowed sort elimination")) ; - + (TypeCheckerFailure ("Case analasys: sort elimination not allowed")); (* let's check if the type of branches are right *) let parsno = match CicEnvironment.get_cooked_obj ~trust:false uri with C.InductiveDefinition (_,_,parsno) -> parsno | _ -> - raise - (TypeCheckerFailure - (WrongUriToMutualInductiveDefinitions (U.string_of_uri uri))) + raise (TypeCheckerFailure + ("Unknown mutual inductive definition:" ^ + UriManager.string_of_uri uri)) in let (_,branches_ok) = List.fold_left @@ -1522,15 +1534,13 @@ let res = b && R.are_convertible context (type_of_aux context p) (type_of_branch context parsno need_dummy outtype cons (type_of_aux context cons)) -in if not res then prerr_endline ("#### " ^ CicPp.ppterm (type_of_aux context p) ^ " <==> " ^ CicPp.ppterm (type_of_branch context parsno need_dummy outtype cons (type_of_aux context cons))) ; res +in if not res then debug_print ("#### " ^ CicPp.ppterm (type_of_aux context p) ^ " <==> " ^ CicPp.ppterm (type_of_branch context parsno need_dummy outtype cons (type_of_aux context cons))) ; res ) ) (1,true) pl in if not branches_ok then raise - (TypeCheckerFailure - (NotWellTyped "MutCase: wrong type of a branch")) ; - + (TypeCheckerFailure "Case analysys: wrong branch type"); if not need_dummy then C.Appl ((outtype::arguments)@[term]) else if arguments = [] then @@ -1563,11 +1573,10 @@ in if not res then prerr_endline ("#### " ^ CicPp.ppterm (type_of_aux context p) (guarded_by_destructors context' eaten (len + eaten) kl 1 [] m) then raise - (TypeCheckerFailure - (NotWellTyped "Fix: not guarded by destructors")) + (TypeCheckerFailure ("Fix: not guarded by destructors")) end else - raise (TypeCheckerFailure (NotWellTyped "Fix: ill-typed bodies")) + raise (TypeCheckerFailure ("Fix: ill-typed bodies")) ) fl ; (*CSC: controlli mancanti solo su D{f,k,x,M} *) @@ -1593,7 +1602,7 @@ in if not res then prerr_endline ("#### " ^ CicPp.ppterm (type_of_aux context p) None -> raise (TypeCheckerFailure - (NotWellTyped "CoFix: does not return a coinductive type")) + ("CoFix: does not return a coinductive type")) | Some uri -> (*let's control the guarded by constructors conditions C{f,M}*) if @@ -1602,13 +1611,11 @@ in if not res then prerr_endline ("#### " ^ CicPp.ppterm (type_of_aux context p) [] uri) then raise - (TypeCheckerFailure - (NotWellTyped "CoFix: not guarded by constructors")) + (TypeCheckerFailure ("CoFix: not guarded by constructors")) end else raise - (TypeCheckerFailure - (NotWellTyped "CoFix: ill-typed bodies")) + (TypeCheckerFailure ("CoFix: ill-typed bodies")) ) fl ; let (_,ty,_) = List.nth fl i in @@ -1625,13 +1632,12 @@ in if not res then prerr_endline ("#### " ^ CicPp.ppterm (type_of_aux context p) Cic.Variable (_,Some bo,_,_) -> raise (TypeCheckerFailure - (NotWellTyped - "A variable with a body can not be explicit substituted")) + ("A variable with a body can not be explicit substituted")) | Cic.Variable (_,None,_,_) -> () | _ -> - raise - (TypeCheckerFailure - (WrongUriToVariable (UriManager.string_of_uri uri))) + raise (TypeCheckerFailure + ("Unknown variable definition:" ^ + UriManager.string_of_uri uri)) ) ; let typeoft = type_of_aux context t in if CicReduction.are_convertible context typeoft typeofvar then @@ -1642,9 +1648,7 @@ in if not res then prerr_endline ("#### " ^ CicPp.ppterm (type_of_aux context p) ignore (CicReduction.are_convertible context typeoft typeofvar) ; fdebug := 0 ; debug typeoft [typeofvar] ; - raise - (TypeCheckerFailure - (NotWellTyped "Wrong Explicit Named Substitution")) + raise (TypeCheckerFailure "Wrong Explicit Named Substitution") end in check_exp_named_subst_aux [] @@ -1655,14 +1659,25 @@ in if not res then prerr_endline ("#### " ^ CicPp.ppterm (type_of_aux context p) let t2' = CicReduction.whd ((Some (name,C.Decl s))::context) t2 in match (t1', t2') with (C.Sort s1, C.Sort s2) - when (s2 = C.Prop or s2 = C.Set or s2 = C.CProp) -> (* different from Coq manual!!! *) + when (s2 = C.Prop or s2 = C.Set or s2 = C.CProp) -> + (* different from Coq manual!!! *) C.Sort s2 - | (C.Sort s1, C.Sort s2) -> C.Sort C.Type (*CSC manca la gestione degli universi!!! *) - | (_,_) -> - raise - (TypeCheckerFailure - (NotWellTyped - ("Prod: sort1= " ^ CicPp.ppterm t1' ^ " ; sort2= "^ CicPp.ppterm t2'))) + | (C.Sort (C.Type t1), C.Sort (C.Type t2)) -> + (* TASSI: CONSRTAINTS: the same in doubletypeinference, cicrefine *) + let t' = CicUniv.fresh() in + if not (CicUniv.add_ge t' t1) || not (CicUniv.add_ge t' t2) then + assert false ; (* not possible, error in CicUniv *) + C.Sort (C.Type t') + | (C.Sort _,C.Sort (C.Type t1)) -> + (* TASSI: CONSRTAINTS: the same in doubletypeinference, cicrefine *) + C.Sort (C.Type t1) (* c'e' bisogno di un fresh? *) + | (C.Meta _, C.Sort _) -> t2' + | (C.Meta _, (C.Meta (_,_) as t)) + | (C.Sort _, (C.Meta (_,_) as t)) when CicUtil.is_closed t -> + t2' + | (_,_) -> raise (TypeCheckerFailure (sprintf + "Prod: expected two sorts, found = %s, %s" (CicPp.ppterm t1') + (CicPp.ppterm t2'))) and eat_prods context hetype = (*CSC: siamo sicuri che le are_convertible non lavorino con termini non *) @@ -1672,7 +1687,7 @@ in if not res then prerr_endline ("#### " ^ CicPp.ppterm (type_of_aux context p) | (hete, hety)::tl -> (match (CicReduction.whd context hetype) with Cic.Prod (n,s,t) -> - if CicReduction.are_convertible context s hety then + if CicReduction.are_convertible context hety s then (CicReduction.fdebug := -1 ; eat_prods context (CicSubstitution.subst hete t) tl ) @@ -1682,10 +1697,13 @@ in if not res then prerr_endline ("#### " ^ CicPp.ppterm (type_of_aux context p) ignore (CicReduction.are_convertible context s hety) ; fdebug := 0 ; debug s [hety] ; - raise - (TypeCheckerFailure (NotWellTyped "Appl: wrong parameter-type")) + raise (TypeCheckerFailure (sprintf + "Appl: wrong parameter-type, expected %s, found %s" + (CicPp.ppterm hetype) (CicPp.ppterm s))) end - | _ -> raise (TypeCheckerFailure (NotWellTyped "Appl: wrong Prod-type")) + | _ -> + raise (TypeCheckerFailure + "Appl: this is not a function, it cannot be applied") ) and returns_a_coinductive context ty = @@ -1698,9 +1716,9 @@ in if not res then prerr_endline ("#### " ^ CicPp.ppterm (type_of_aux context p) let (_,is_inductive,_,_) = List.nth itl i in if is_inductive then None else (Some uri) | _ -> - raise - (TypeCheckerFailure (WrongUriToMutualInductiveDefinitions - (UriManager.string_of_uri uri))) + raise (TypeCheckerFailure + ("Unknown mutual inductive definition:" ^ + UriManager.string_of_uri uri)) ) | C.Appl ((C.MutInd (uri,i,_))::_) -> (match CicEnvironment.get_obj uri with @@ -1708,10 +1726,9 @@ in if not res then prerr_endline ("#### " ^ CicPp.ppterm (type_of_aux context p) let (_,is_inductive,_,_) = List.nth itl i in if is_inductive then None else (Some uri) | _ -> - raise - (TypeCheckerFailure - (WrongUriToMutualInductiveDefinitions - (UriManager.string_of_uri uri))) + raise (TypeCheckerFailure + ("Unknown mutual inductive definition:" ^ + UriManager.string_of_uri uri)) ) | C.Prod (n,so,de) -> returns_a_coinductive ((Some (n,C.Decl so))::context) de @@ -1719,12 +1736,12 @@ in if not res then prerr_endline ("#### " ^ CicPp.ppterm (type_of_aux context p) in (*CSC -prerr_endline ("INIZIO TYPE_OF_AUX " ^ CicPp.ppterm t) ; flush stderr ; +debug_print ("INIZIO TYPE_OF_AUX " ^ CicPp.ppterm t) ; flush stderr ; let res = *) type_of_aux context t (* -in prerr_endline "FINE TYPE_OF_AUX" ; flush stderr ; res +in debug_print "FINE TYPE_OF_AUX" ; flush stderr ; res *) (* is a small constructor? *) @@ -1745,12 +1762,12 @@ and is_small context paramsno c = and type_of t = (*CSC -prerr_endline ("INIZIO TYPE_OF_AUX' " ^ CicPp.ppterm t) ; flush stderr ; +debug_print ("INIZIO TYPE_OF_AUX' " ^ CicPp.ppterm t) ; flush stderr ; let res = *) type_of_aux' [] [] t (*CSC -in prerr_endline "FINE TYPE_OF_AUX'" ; flush stderr ; res +in debug_print "FINE TYPE_OF_AUX'" ; flush stderr ; res *) ;; @@ -1762,14 +1779,13 @@ let typecheck uri = CicEnvironment.CheckedObj _ -> () | CicEnvironment.UncheckedObj uobj -> (* let's typecheck the uncooked object *) - Logger.log (`Start_type_checking uri) ; + CicLogger.log (`Start_type_checking uri) ; (match uobj with C.Constant (_,Some te,ty,_) -> let _ = type_of ty in if not (R.are_convertible [] (type_of te ) ty) then - raise - (TypeCheckerFailure - (NotWellTyped ("Constant " ^ (U.string_of_uri uri)))) + raise (TypeCheckerFailure + ("Unknown constant:" ^ U.string_of_uri uri)) | C.Constant (_,None,ty,_) -> (* only to check that ty is well-typed *) let _ = type_of ty in () @@ -1782,11 +1798,13 @@ let typecheck uri = ) [] conjs in let _ = type_of_aux' conjs [] ty in - if not (R.are_convertible [] (type_of_aux' conjs [] te) ty) + let type_of_te = type_of_aux' conjs [] te in + if not (R.are_convertible [] type_of_te ty) then - raise - (TypeCheckerFailure - (NotWellTyped ("CurrentProof" ^ (U.string_of_uri uri)))) + raise (TypeCheckerFailure (sprintf + "the current proof %s is not well typed because the type %s of the body is not convertible to the declared type %s" + (U.string_of_uri uri) (CicPp.ppterm type_of_te) + (CicPp.ppterm ty))) | C.Variable (_,bo,ty,_) -> (* only to check that ty is well-typed *) let _ = type_of ty in @@ -1794,13 +1812,12 @@ let typecheck uri = None -> () | Some bo -> if not (R.are_convertible [] (type_of bo) ty) then - raise - (TypeCheckerFailure - (NotWellTyped ("Variable" ^ (U.string_of_uri uri)))) + raise (TypeCheckerFailure + ("Unknown variable:" ^ U.string_of_uri uri)) ) | C.InductiveDefinition _ -> check_mutual_inductive_defs uri uobj ) ; CicEnvironment.set_type_checking_info uri ; - Logger.log (`Type_checking_completed uri) + CicLogger.log (`Type_checking_completed uri) ;;