X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_proof_checking%2FcicTypeChecker.ml;h=1577b2f3f64b8b85ed7c2378635c2a5d6ab50f74;hb=6c3a5a7adc3f37ddfb99a69b050fbf324e95e583;hp=d8d4f25f73c7cad056cce7a9003acb2277c674e5;hpb=6070c7830a1980abdf87ed5cac607dce170f86f3;p=helm.git diff --git a/helm/ocaml/cic_proof_checking/cicTypeChecker.ml b/helm/ocaml/cic_proof_checking/cicTypeChecker.ml index d8d4f25f7..1577b2f3f 100644 --- a/helm/ocaml/cic_proof_checking/cicTypeChecker.ml +++ b/helm/ocaml/cic_proof_checking/cicTypeChecker.ml @@ -127,6 +127,7 @@ let rec type_of_constant uri = CicEnvironment.CheckedObj cobj -> cobj | CicEnvironment.UncheckedObj uobj -> CicLogger.log (`Start_type_checking uri) ; + CicUniv.directly_to_env_begin (); (* let's typecheck the uncooked obj *) (match uobj with C.Constant (_,Some te,ty,_) -> @@ -160,6 +161,7 @@ let rec type_of_constant uri = ("Unknown constant:" ^ U.string_of_uri uri)) ); CicEnvironment.set_type_checking_info uri ; + CicUniv.directly_to_env_end (); CicLogger.log (`Type_checking_completed uri) ; match CicEnvironment.is_type_checked ~trust:false uri with CicEnvironment.CheckedObj cobj -> cobj @@ -180,6 +182,7 @@ and type_of_variable uri = CicEnvironment.CheckedObj (C.Variable (_,_,ty,_)) -> ty | CicEnvironment.UncheckedObj (C.Variable (_,bo,ty,_)) -> CicLogger.log (`Start_type_checking uri) ; + CicUniv.directly_to_env_begin (); (* only to check that ty is well-typed *) let _ = type_of ty in (match bo with @@ -190,6 +193,7 @@ and type_of_variable uri = ("Unknown variable:" ^ U.string_of_uri uri)) ) ; CicEnvironment.set_type_checking_info uri ; + CicUniv.directly_to_env_end (); CicLogger.log (`Type_checking_completed uri) ; ty | _ -> @@ -518,8 +522,10 @@ and type_of_mutual_inductive_defs uri i = CicEnvironment.CheckedObj cobj -> cobj | CicEnvironment.UncheckedObj uobj -> CicLogger.log (`Start_type_checking uri) ; + CicUniv.directly_to_env_begin (); check_mutual_inductive_defs uri uobj ; CicEnvironment.set_type_checking_info uri ; + CicUniv.directly_to_env_end (); CicLogger.log (`Type_checking_completed uri) ; (match CicEnvironment.is_type_checked ~trust:false uri with CicEnvironment.CheckedObj cobj -> cobj @@ -543,8 +549,10 @@ and type_of_mutual_inductive_constr uri i j = CicEnvironment.CheckedObj cobj -> cobj | CicEnvironment.UncheckedObj uobj -> CicLogger.log (`Start_type_checking uri) ; + (*CicUniv.directly_to_env_begin ();*) check_mutual_inductive_defs uri uobj ; CicEnvironment.set_type_checking_info uri ; + (*CicUniv.directly_to_env_end ();*) CicLogger.log (`Type_checking_completed uri) ; (match CicEnvironment.is_type_checked ~trust:false uri with CicEnvironment.CheckedObj cobj -> cobj @@ -799,7 +807,7 @@ and guarded_by_destructors context n nn kl x safes = | Some (_,C.Def (bo,_)) -> guarded_by_destructors context m nn kl x safes (CicSubstitution.lift m bo) - | None -> raise (TypeCheckerFailure "Reference to deleted hypothesis") + | None -> raise (TypeCheckerFailure "Reference to deleted hypothesis") ) | C.Meta _ | C.Sort _ @@ -1174,7 +1182,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,_,_) -> @@ -1191,7 +1200,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) -> @@ -1205,7 +1215,8 @@ and check_allowed_sort_elimination context uri i need_dummy ind arity1 arity2 = 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,8 +1244,9 @@ and check_allowed_sort_elimination context uri i need_dummy ind arity1 arity2 = (match CicReduction.whd ((Some (name,(C.Decl so)))::context) ta with C.Sort C.Prop | C.Sort C.Set -> true - | C.Sort C.CProp -> true - | C.Sort C.Type -> + | C.Sort C.CProp -> true + | C.Sort (C.Type _) -> + (* TASSI: da verificare *) (match CicEnvironment.get_obj uri with C.InductiveDefinition (itl,_,paramsno) -> let (_,_,_,cl) = List.nth itl i in @@ -1251,7 +1263,8 @@ and check_allowed_sort_elimination context uri i need_dummy ind arity1 arity2 = ) | _ -> 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 @@ -1340,7 +1353,7 @@ and type_of_aux' metasenv context t = | Some (_,C.Def (bo,None)) -> debug_print "##### CASO DA INVESTIGARE E CAPIRE" ; type_of_aux context (S.lift n bo) - | None -> raise (TypeCheckerFailure "Reference to deleted hypothesis") + | None -> raise (TypeCheckerFailure "Reference to deleted hypothesis") with _ -> raise (TypeCheckerFailure "unbound variable") @@ -1357,7 +1370,15 @@ and type_of_aux' metasenv context t = 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!!! *) + (* 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 @@ -1369,7 +1390,8 @@ and type_of_aux' metasenv context 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) + let res = sort_of_prod context (name,s) (sort1,sort2) in + res | C.Lambda (n,s,t) -> let sort1 = type_of_aux context s in (match R.whd context sort1 with @@ -1402,8 +1424,8 @@ and type_of_aux' metasenv context t = (CicSubstitution.subst s (type_of_aux ((Some (n,(C.Def (s,Some ty))))::context) t)) | C.Appl (he::tl) when List.length tl > 0 -> - let hetype = type_of_aux context he - and tlbody_and_type = List.map (fun x -> (x, type_of_aux context x)) tl in + let hetype = type_of_aux context he in + let 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 (AssertFailure "Appl: no arguments") | C.Const (uri,exp_named_subst) -> @@ -1574,7 +1596,7 @@ in if not res then debug_print ("#### " ^ CicPp.ppterm (type_of_aux context p) ^ List.rev (List.map (fun (n,ty,_) -> - let _ = type_of_aux context ty in Some (C.Name n,(C.Decl ty))) fl) + let _ = type_of_aux context ty in Some (C.Name n,(C.Decl ty))) fl) in let len = List.length types in List.iter @@ -1615,6 +1637,7 @@ in if not res then debug_print ("#### " ^ CicPp.ppterm (type_of_aux context p) ^ | ((uri,t) as subst)::tl -> let typeofvar = CicSubstitution.subst_vars substs (type_of_variable uri) in +(* CSC: this test should not exist (match CicEnvironment.get_cooked_obj ~trust:false uri with Cic.Variable (_,Some bo,_,_) -> raise @@ -1623,9 +1646,10 @@ in if not res then debug_print ("#### " ^ CicPp.ppterm (type_of_aux context p) ^ | Cic.Variable (_,None,_,_) -> () | _ -> raise (TypeCheckerFailure - ("Unknown mutual inductive definition:" ^ + ("Unknown variable definition:" ^ UriManager.string_of_uri uri)) ) ; +*) let typeoft = type_of_aux context t in if CicReduction.are_convertible context typeoft typeofvar then check_exp_named_subst_aux (substs@[subst]) tl @@ -1646,9 +1670,18 @@ in if not res then debug_print ("#### " ^ 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!!! *) + | (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 -> @@ -1665,7 +1698,7 @@ in if not res then debug_print ("#### " ^ 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 ) @@ -1749,15 +1782,18 @@ in debug_print "FINE TYPE_OF_AUX'" ; flush stderr ; res *) ;; +(* tassi FIXME: not sure where is this called... no history here... *) let typecheck uri = let module C = Cic in let module R = CicReduction in let module U = UriManager in - match CicEnvironment.is_type_checked ~trust:false uri with - CicEnvironment.CheckedObj _ -> () + (*match CicEnvironment.is_type_checked ~trust:false uri with*) + match CicEnvironment.is_type_checked ~trust:true uri with + CicEnvironment.CheckedObj cobj -> cobj | CicEnvironment.UncheckedObj uobj -> (* let's typecheck the uncooked object *) CicLogger.log (`Start_type_checking uri) ; + CicUniv.directly_to_env_begin (); (match uobj with C.Constant (_,Some te,ty,_) -> let _ = type_of ty in @@ -1797,5 +1833,7 @@ let typecheck uri = check_mutual_inductive_defs uri uobj ) ; CicEnvironment.set_type_checking_info uri ; - CicLogger.log (`Type_checking_completed uri) + CicUniv.directly_to_env_end (); + CicLogger.log (`Type_checking_completed uri); + uobj ;;