X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FnCicTypeChecker.ml;h=b9a585f97e0eeaa10d776e166d97c4392afc4ff2;hb=35e102fec6bad146fee425f299a93520e657e7c2;hp=df6255e5f045a272f41eadbf3dc123d7bb762f5a;hpb=9dac09ff867a3ec6298c85df95579b199da54d27;p=helm.git diff --git a/helm/software/components/ng_kernel/nCicTypeChecker.ml b/helm/software/components/ng_kernel/nCicTypeChecker.ml index df6255e5f..b9a585f97 100644 --- a/helm/software/components/ng_kernel/nCicTypeChecker.ml +++ b/helm/software/components/ng_kernel/nCicTypeChecker.ml @@ -239,70 +239,6 @@ and are_all_occurrences_positive context uri indparamsno i n nn te = (TypeCheckerFailure (lazy ("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 *) -(* exported to the proof-engine. *) -and typecheck_mutual_inductive_defs ~logger uri (itl,_,indparamsno) ugraph = - let module U = UriManager in - (* let's check if the arity of the inductive types are well *) - (* formed *) - let ugrap1 = List.fold_left - (fun ugraph (_,_,x,_) -> let _,ugraph' = - type_of ~logger x ugraph in ugraph') - ugraph itl in - - (* let's check if the types of the inductive constructors *) - (* are well formed. *) - (* In order not to use type_of_aux we put the types of the *) - (* mutual inductive types at the head of the types of the *) - (* constructors using Prods *) - let len = List.length itl in - let tys = - List.map (fun (n,_,ty,_) -> Some (Cic.Name n,(Cic.Decl ty))) itl in - let _,ugraph2 = - List.fold_right - (fun (_,_,_,cl) (i,ugraph) -> - let ugraph'' = - List.fold_left - (fun ugraph (name,te) -> - let debruijnedte = debruijn uri len te in - let augmented_term = - List.fold_right - (fun (name,_,ty,_) i -> Cic.Prod (Cic.Name name, ty, i)) - itl debruijnedte - in - let _,ugraph' = type_of ~logger augmented_term ugraph in - (* let's check also the positivity conditions *) - if - not - (are_all_occurrences_positive tys uri indparamsno i 0 len - debruijnedte) - then - begin - prerr_endline (UriManager.string_of_uri uri); - prerr_endline (string_of_int (List.length tys)); - raise - (TypeCheckerFailure - (lazy ("Non positive occurence in " ^ U.string_of_uri uri))) end - else - ugraph' - ) ugraph cl in - (i + 1),ugraph'' - ) itl (1,ugrap1) - in - ugraph2 - -(* Main function to checks the correctness of a mutual *) -(* inductive block definition. *) -and check_mutual_inductive_defs uri obj ugraph = - match obj with - Cic.InductiveDefinition (itl, params, indparamsno, _) -> - typecheck_mutual_inductive_defs uri (itl,params,indparamsno) ugraph - | _ -> - raise (TypeCheckerFailure ( - lazy ("Unknown mutual inductive definition:" ^ - UriManager.string_of_uri uri))) - (* the boolean h means already protected *) (* args is the list of arguments the type of the constructor that may be *) (* found in head position must be applied to. *) @@ -610,9 +546,10 @@ let eat_prods ~subst ~metasenv context ty_he args_with_ty = (match R.whd ~subst context ty_he with | C.Prod (n,s,t) -> (* - prerr_endline (NCicPp.ppterm ~context s ^ " - Vs - " ^ NCicPp.ppterm + prerr_endline (NCicPp.ppterm ~subst ~metasenv ~context s ^ " - Vs - " + ^ NCicPp.ppterm ~subst ~metasenv ~context ty_arg); - prerr_endline (NCicPp.ppterm ~context (S.subst ~avoid_beta_redexes:true arg t)); + prerr_endline (NCicPp.ppterm ~subst ~metasenv ~context (S.subst ~avoid_beta_redexes:true arg t)); *) if R.are_convertible ~subst ~metasenv context ty_arg s then aux (S.subst ~avoid_beta_redexes:true arg t) tl @@ -621,8 +558,8 @@ let eat_prods ~subst ~metasenv context ty_he args_with_ty = (TypeCheckerFailure (lazy (Printf.sprintf ("Appl: wrong parameter-type, expected %s, found %s") - (NCicPp.ppterm ~subst ~metasenv ~context ty_arg) - (NCicPp.ppterm ~subst ~metasenv ~context s)))) + (NCicPp.ppterm ~subst ~metasenv ~context s) + (NCicPp.ppterm ~subst ~metasenv ~context ty_arg)))) | _ -> raise (TypeCheckerFailure @@ -718,6 +655,7 @@ let rec typeof ~subst ~metasenv context term = C.Prod (n,s,ty) | C.LetIn (n,ty,t,bo) -> let ty_t = typeof_aux context t in + let _ = typeof_aux context ty in if not (R.are_convertible ~subst ~metasenv context ty ty_t) then raise (TypeCheckerFailure @@ -986,7 +924,31 @@ let rec typeof ~subst ~metasenv context term = in typeof_aux context term -and check_mutual_inductive_defs _ = () +and check_mutual_inductive_defs uri ~metasenv ~subst is_ind leftno tyl = + (* let's check if the arity of the inductive types are well formed *) + List.iter (fun (_,_,x,_) -> ignore (typeof ~subst ~metasenv [] x)) tyl; + (* let's check if the types of the inductive constructors are well formed. *) + let len = List.length tyl in + let tys = List.map (fun (_,n,ty,_) -> (n,(C.Decl ty))) tyl in + ignore + (List.fold_right + (fun (_,_,_,cl) i -> + List.iter + (fun (_,name,te) -> + let debruijnedte = debruijn uri len te in + ignore (typeof ~subst ~metasenv tys debruijnedte); + (* let's check also the positivity conditions *) + if false (* + not + (are_all_occurrences_positive tys uri indparamsno i 0 len + debruijnedte) *) + then + raise + (TypeCheckerFailure + (lazy ("Non positive occurence in "^NUri.string_of_uri uri)))) + cl; + i + 1) + tyl 1) and eat_lambdas ~subst ~metasenv context n te = match (n, R.whd ~subst context te) with @@ -1205,18 +1167,21 @@ and check_obj_well_typed (uri,height,metasenv,subst,kind) = assert (metasenv = [] && subst = []); match kind with | C.Constant (_,_,Some te,ty,_) -> +(* prerr_endline ("TY: " ^ NCicPp.ppterm ~subst ~metasenv ~context:[] ty); prerr_endline ("BO: " ^ NCicPp.ppterm ~subst ~metasenv ~context:[] te); +*) let _ = typeof ~subst ~metasenv [] ty in let ty_te = typeof ~subst ~metasenv [] te in - prerr_endline "XXXX"; +(* prerr_endline "XXXX"; *) if not (R.are_convertible ~subst ~metasenv [] ty_te ty) then raise (TypeCheckerFailure (lazy (Printf.sprintf "the type of the body is not the one expected:\n%s\nvs\n%s" (NCicPp.ppterm ~subst ~metasenv ~context:[] ty_te) (NCicPp.ppterm ~subst ~metasenv ~context:[] ty)))) | C.Constant (_,_,None,ty,_) -> ignore (typeof ~subst ~metasenv [] ty) - | C.Inductive _ as obj -> check_mutual_inductive_defs obj + | C.Inductive (is_ind, leftno, tyl, _) -> + check_mutual_inductive_defs uri ~metasenv ~subst is_ind leftno tyl | C.Fixpoint (inductive,fl,_) -> let types,kl,len = List.fold_left