X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_refiner%2FnCicRefiner.ml;h=8c92d3328b8556e9ecb91912e140a6f09dee3736;hb=f8d45b2e4fa7817d7ef8312b3bb8a7439bd7fb8c;hp=d5270c192c1191e4b1926b8ce2484a2758530237;hpb=75514fe2207992ebc549822a7cbd5d37688690ac;p=helm.git diff --git a/helm/software/components/ng_refiner/nCicRefiner.ml b/helm/software/components/ng_refiner/nCicRefiner.ml index d5270c192..8c92d3328 100644 --- a/helm/software/components/ng_refiner/nCicRefiner.ml +++ b/helm/software/components/ng_refiner/nCicRefiner.ml @@ -18,16 +18,37 @@ exception AssertFailure of string Lazy.t;; module C = NCic module Ref = NReference +let debug = ref false;; let indent = ref "";; -let inside c = indent := !indent ^ String.make 1 c;; -let outside () = indent := String.sub !indent 0 (String.length !indent -1);; - - -let pp s = +let times = ref [];; +let pp s = + if !debug then prerr_endline (Printf.sprintf "%-20s" !indent ^ " " ^ Lazy.force s) -;; +;; +let inside c = + if !debug then + begin + let time1 = Unix.gettimeofday () in + indent := !indent ^ String.make 1 c; + times := time1 :: !times; + prerr_endline ("{{{" ^ !indent ^ " ") + end +;; +let outside ok = + if !debug then + begin + let time2 = Unix.gettimeofday () in + let time1 = + match !times with time1::tl -> times := tl; time1 | [] -> assert false in + prerr_endline ("}}} " ^ string_of_float (time2 -. time1)); + if not ok then prerr_endline "exception raised!"; + try + indent := String.sub !indent 0 (String.length !indent -1) + with + Invalid_argument _ -> indent := "??"; () + end +;; -let pp _ = ();; let wrap_exc msg = function | NCicUnification.Uncertain _ -> Uncertain msg @@ -36,17 +57,41 @@ let wrap_exc msg = function | e -> raise e ;; -let exp_implicit metasenv context expty = - let foo x = match expty with Some t -> `WithType t | None -> x in +let exp_implicit rdb ~localise metasenv subst context with_type t = function - | `Closed -> NCicMetaSubst.mk_meta metasenv [] (foo `Term) - | `Type -> NCicMetaSubst.mk_meta metasenv context (foo `Type) - | `Term -> NCicMetaSubst.mk_meta metasenv context (foo `Term) + | `Closed -> + let metasenv,subst,expty = + match with_type with + None -> metasenv,subst,None + | Some typ -> + let (metasenv,subst),typ = + try + NCicMetaSubst.delift + ~unify:(fun m s c t1 t2 -> + try Some (NCicUnification.unify rdb m s c t1 t2) + with NCicUnification.UnificationFailure _ | NCicUnification.Uncertain _ -> None) + metasenv subst context 0 (0,NCic.Irl 0) typ + with + NCicMetaSubst.MetaSubstFailure _ + | NCicMetaSubst.Uncertain _ -> + raise (RefineFailure (lazy (localise t,"Trying to create a closed meta with a non closed type"))) + + in + metasenv,subst,Some typ + in + NCicMetaSubst.mk_meta metasenv [] ?with_type:expty `IsTerm,subst + | `Type -> NCicMetaSubst.mk_meta metasenv context ?with_type `IsType,subst + | `Term -> NCicMetaSubst.mk_meta metasenv context ?with_type `IsTerm,subst + | `Tagged s -> + NCicMetaSubst.mk_meta + ~attrs:[`Name s] metasenv context ?with_type `IsTerm,subst + | `Vector -> + raise (RefineFailure (lazy (localise t, "A vector of implicit terms " ^ + "can only be used in argument position"))) | _ -> assert false ;; - -let check_allowed_sort_elimination hdb localise r orig = +let check_allowed_sort_elimination rdb localise r orig = let mkapp he arg = match he with | C.Appl l -> C.Appl (l @ [arg]) @@ -61,10 +106,10 @@ let check_allowed_sort_elimination hdb localise r orig = match arity1 with | C.Prod (name,so1,de1) (* , t ==?== C.Prod _ *) -> let metasenv, _, meta, _ = - NCicMetaSubst.mk_meta metasenv ((name,C.Decl so1)::context) `Type + NCicMetaSubst.mk_meta metasenv ((name,C.Decl so1)::context) `IsType in let metasenv, subst = - try NCicUnification.unify hdb metasenv subst context + try NCicUnification.unify rdb metasenv subst context arity2 (C.Prod (name, so1, meta)) with exc -> raise (wrap_exc (lazy (localise orig, Printf.sprintf "expected %s, found %s" (* XXX localizzare meglio *) @@ -74,9 +119,9 @@ let check_allowed_sort_elimination hdb localise r orig = aux metasenv subst ((name, C.Decl so1)::context) (mkapp (NCicSubstitution.lift 1 ind) (C.Rel 1)) de1 meta | C.Sort _ (* , t ==?== C.Prod _ *) -> - let metasenv, _, meta, _ = NCicMetaSubst.mk_meta metasenv [] `Type in + let metasenv, _, meta, _ = NCicMetaSubst.mk_meta metasenv [] `IsSort in let metasenv, subst = - try NCicUnification.unify hdb metasenv subst context + try NCicUnification.unify rdb metasenv subst context arity2 (C.Prod ("_", ind, meta)) with exc -> raise (wrap_exc (lazy (localise orig, Printf.sprintf "expected %s, found %s" (* XXX localizzare meglio *) @@ -89,44 +134,48 @@ let check_allowed_sort_elimination hdb localise r orig = with exc -> raise (wrap_exc (lazy (localise orig, "Sort elimination not allowed ")) exc)) | _ -> assert false - (*D*)in outside(); rc with exc -> outside (); raise exc + (*D*)in outside true; rc with exc -> outside false; raise exc in aux ;; -let rec typeof hdb +let rec typeof rdb ?(localise=fun _ -> Stdpp.dummy_loc) - ~look_for_coercion metasenv subst context term expty + metasenv subst context term expty = - let force_ty skip_lambda metasenv subst context orig t infty expty = + let force_ty skip_lambda skip_appl metasenv subst context orig t infty expty = (*D*)inside 'F'; try let rc = match expty with | Some expty -> (match t with | C.Implicit _ -> assert false | C.Lambda _ when skip_lambda -> metasenv, subst, t, expty + | C.Appl _ when skip_appl -> metasenv, subst, t, expty | _ -> - pp (lazy ( + pp (lazy ("forcing infty=expty: "^ (NCicPp.ppterm ~metasenv ~subst ~context infty) ^ " === " ^ (NCicPp.ppterm ~metasenv ~subst:[] ~context expty))); try let metasenv, subst = - NCicUnification.unify hdb metasenv subst context infty expty + (*D*)inside 'U'; try let rc = + NCicUnification.unify rdb metasenv subst context infty expty + (*D*)in outside true; rc with exc -> outside false; raise exc in metasenv, subst, t, expty - with exc -> - try_coercions hdb ~look_for_coercion ~localise + with + | NCicUnification.Uncertain _ + | NCicUnification.UnificationFailure _ as exc -> + try_coercions rdb ~localise metasenv subst context t orig infty expty true exc) | None -> metasenv, subst, t, infty - (*D*)in outside(); rc with exc -> outside (); raise exc + (*D*)in outside true; rc with exc -> outside false; raise exc in let rec typeof_aux metasenv subst context expty = fun t as orig -> (*D*)inside 'R'; try let rc = - pp (lazy (NCicPp.ppterm ~metasenv ~subst ~context t)); - pp (lazy (if expty = None then "NONE" else "SOME")); - if (List.exists (fun (i,_) -> i=29) subst) then - pp (lazy (NCicPp.ppsubst ~metasenv subst)); + pp (lazy (NCicPp.ppterm ~metasenv ~subst ~context t ^ " ::exp:: " ^ + match expty with None -> "None" | Some e -> + NCicPp.ppterm ~metasenv ~subst ~context e)); let metasenv, subst, t, infty = match t with | C.Rel n -> @@ -139,28 +188,26 @@ let rec typeof hdb raise (RefineFailure (lazy (localise t,"unbound variable")))) in metasenv, subst, t, infty - | C.Sort (C.Type [false,u]) -> metasenv,subst,t,(C.Sort (C.Type [true, u])) - | C.Sort (C.Type _) -> - raise (AssertFailure (lazy ("Cannot type an inferred type: "^ - NCicPp.ppterm ~subst ~metasenv ~context t))) - | C.Sort _ -> metasenv,subst,t,(C.Sort (C.Type NCicEnvironment.type0)) + | C.Sort s -> + (try metasenv, subst, t, C.Sort (NCicEnvironment.typeof_sort s) + with + | NCicEnvironment.UntypableSort msg -> + raise (RefineFailure (lazy (localise t, Lazy.force msg))) + | NCicEnvironment.AssertFailure msg -> raise (AssertFailure msg)) | C.Implicit infos -> - let metasenv,_,t,ty = exp_implicit metasenv context expty infos in - metasenv, subst, t, ty + let (metasenv,_,t,ty),subst = + exp_implicit rdb ~localise metasenv subst context expty t infos + in + if expty = None then + typeof_aux metasenv subst context None t + else + metasenv, subst, t, ty | C.Meta (n,l) as t -> - let ty = + let metasenv, ty = try - let _,_,_,ty = NCicUtils.lookup_subst n subst in ty - with NCicUtils.Subst_not_found _ -> try - let _,_,ty = NCicUtils.lookup_meta n metasenv in - match ty with C.Implicit _ -> - prerr_endline (string_of_int n); - prerr_endline (NCicPp.ppmetasenv ~subst metasenv); - prerr_endline (NCicPp.ppsubst ~metasenv subst); - assert false | _ -> ty - with NCicUtils.Meta_not_found _ -> - raise (AssertFailure (lazy (Printf.sprintf - "%s not found" (NCicPp.ppterm ~subst ~metasenv ~context t)))) + let _,_,_,ty = NCicUtils.lookup_subst n subst in metasenv, ty + with NCicUtils.Subst_not_found _ -> + NCicMetaSubst.extend_meta metasenv n in metasenv, subst, t, NCicSubstitution.subst_meta l ty | C.Const _ -> @@ -168,12 +215,12 @@ let rec typeof hdb | C.Prod (name,(s as orig_s),(t as orig_t)) -> let metasenv, subst, s, s1 = typeof_aux metasenv subst context None s in let metasenv, subst, s, s1 = - force_to_sort hdb ~look_for_coercion + force_to_sort rdb metasenv subst context s orig_s localise s1 in let context1 = (name,(C.Decl s))::context in let metasenv, subst, t, s2 = typeof_aux metasenv subst context1 None t in let metasenv, subst, t, s2 = - force_to_sort hdb ~look_for_coercion + force_to_sort rdb metasenv subst context1 t orig_t localise s2 in let metasenv, subst, s, t, ty = sort_of_prod localise metasenv subst @@ -192,12 +239,15 @@ let rec typeof hdb let metasenv, subst, s, ty_s = typeof_aux metasenv subst context None s in let metasenv, subst, s, _ = - force_to_sort hdb ~look_for_coercion + force_to_sort rdb metasenv subst context s orig_s localise ty_s in let (metasenv,subst), exp_ty_t = match exp_s with | Some exp_s -> - (try NCicUnification.unify hdb metasenv subst context s exp_s,exp_ty_t + (try + pp(lazy("Force source to: "^NCicPp.ppterm ~metasenv ~subst + ~context exp_s)); + NCicUnification.unify ~test_eq_only:true rdb metasenv subst context s exp_s,exp_ty_t with exc -> raise (wrap_exc (lazy (localise orig_s, Printf.sprintf "Source type %s was expected to be %s" (NCicPp.ppterm ~metasenv ~subst ~context s) (NCicPp.ppterm ~metasenv ~subst ~context @@ -209,7 +259,7 @@ let rec typeof hdb typeof_aux metasenv subst context_for_t exp_ty_t t in if force_after then - force_ty false metasenv subst context orig + force_ty false true metasenv subst context orig (C.Lambda(n,s,t)) (C.Prod (n,s,ty_t)) expty else metasenv, subst, C.Lambda(n,s,t), C.Prod (n,s,ty_t) @@ -217,28 +267,49 @@ let rec typeof hdb let metasenv, subst, ty, ty_ty = typeof_aux metasenv subst context None ty in let metasenv, subst, ty, _ = - force_to_sort hdb ~look_for_coercion + force_to_sort rdb metasenv subst context ty orig_ty localise ty_ty in let metasenv, subst, t, _ = typeof_aux metasenv subst context (Some ty) t in let context1 = (n, C.Def (t,ty)) :: context in + let metasenv, subst, expty1 = + match expty with + | None -> metasenv, subst, None + | Some x -> + let m, s, x = + NCicUnification.delift_type_wrt_terms + rdb metasenv subst context1 (NCicSubstitution.lift 1 x) + [NCicSubstitution.lift 1 t] + in + m, s, Some x + in let metasenv, subst, bo, bo_ty = - typeof_aux metasenv subst context1 None bo + typeof_aux metasenv subst context1 expty1 bo in let bo_ty = NCicSubstitution.subst ~avoid_beta_redexes:true t bo_ty in metasenv, subst, C.LetIn (n, ty, t, bo), bo_ty | C.Appl ((he as orig_he)::(_::_ as args)) -> - let upto = - match orig_he with C.Meta _ -> List.length args | _ -> 0 + let upto = match orig_he with C.Meta _ -> List.length args | _ -> 0 in + let hbr t = + if upto > 0 then NCicReduction.head_beta_reduce ~upto t else t in - let metasenv, subst, he, ty_he = - typeof_aux metasenv subst context None he in - let metasenv, subst, t, ty = - eat_prods hdb ~localise ~look_for_coercion - metasenv subst context orig_he he ty_he args + let refine_appl () = + let metasenv, subst, he, ty_he = + typeof_aux metasenv subst context None he in + let metasenv, subst, t, ty = + eat_prods rdb ~localise force_ty metasenv subst context expty t + orig_he he ty_he args in + metasenv, subst, hbr t, ty in - let t = if upto > 0 then NCicReduction.head_beta_reduce ~upto t else t in - metasenv, subst, t, ty + if args = [C.Implicit `Vector] && expty <> None then + (* we try here to expand the vector a 0 implicits, but we use + * the expected type *) + try + let metasenv, subst, he, ty_he = + typeof_aux metasenv subst context expty he in + metasenv, subst, hbr he, ty_he + with Uncertain _ | RefineFailure _ -> refine_appl () + else refine_appl () | C.Appl _ -> raise (AssertFailure (lazy "Appl of length < 2")) | C.Match (Ref.Ref (_,Ref.Ind (_,tyno,_)) as r, outtype,(term as orig_term),pl) as orig -> @@ -267,16 +338,11 @@ let rec typeof hdb (* next lines are to do a subst-expansion of the outtype, so that when it becomes a beta-abstraction, the beta-redex is fired during substitution *) - (*CSC: this is instantiate! should we move it from tactics to the - refiner? I think so! *) - let metasenv,metanoouttype,newouttype,metaoutsort = - NCicMetaSubst.mk_meta metasenv context `Term in - let metasenv,subst = - NCicUnification.unify hdb metasenv subst context outsort metaoutsort in - let metasenv = - List.filter (function (j,_) -> j <> metanoouttype) metasenv in + let _,fresh_metanoouttype,newouttype,_ = + NCicMetaSubst.mk_meta metasenv context `IsTerm in let subst = - (metanoouttype,(Some "outtype",context,outtype,metaoutsort))::subst in + (fresh_metanoouttype,([`Name "outtype"],context,outtype,outsort)) + ::subst in let outtype = newouttype in (* let's control if the sort elimination is allowed: [(I q1 ... qr)|B] *) @@ -286,7 +352,7 @@ let rec typeof hdb let metasenv, subst, ind, ind_ty = typeof_aux metasenv subst context None ind in let metasenv, subst = - check_allowed_sort_elimination hdb localise r orig_term metasenv subst + check_allowed_sort_elimination rdb localise r orig_term metasenv subst context ind ind_ty outsort in (* let's check if the type of branches are right *) @@ -298,12 +364,12 @@ let rec typeof hdb match expty with | None -> metasenv, subst | Some expty -> - NCicUnification.unify hdb metasenv subst context resty expty + NCicUnification.unify rdb metasenv subst context resty expty in *) - let _, metasenv, subst, pl_rev = - List.fold_left - (fun (j, metasenv, subst, branches) p -> + let _, metasenv, subst, pl = + List.fold_right + (fun p (j, metasenv, subst, branches) -> let cons = let cons = Ref.mk_constructor j r in if parameters = [] then C.Const cons @@ -315,48 +381,49 @@ let rec typeof hdb NCicTypeChecker.type_of_branch ~subst context leftno outtype cons ty_cons in pp (lazy ("TYPEOFBRANCH: " ^ - NCicPp.ppterm ~metasenv ~subst ~context p ^ " ::: " ^ + NCicPp.ppterm ~metasenv ~subst ~context p ^ " ::inf:: " ^ NCicPp.ppterm ~metasenv ~subst ~context ty_branch )); let metasenv, subst, p, _ = typeof_aux metasenv subst context (Some ty_branch) p in - j+1, metasenv, subst, p :: branches) - (1, metasenv, subst, []) pl + j-1, metasenv, subst, p :: branches) + pl (List.length pl, metasenv, subst, []) in let resty = C.Appl (outtype::arguments@[term]) in let resty = NCicReduction.head_beta_reduce ~subst resty in - metasenv, subst, C.Match (r, outtype, term, List.rev pl_rev),resty + metasenv, subst, C.Match (r, outtype, term, pl),resty | C.Match _ -> assert false in - pp (lazy (NCicPp.ppterm ~metasenv ~subst ~context t ^ " :: "^ + pp (lazy (NCicPp.ppterm ~metasenv ~subst ~context t ^ " ::inf:: "^ NCicPp.ppterm ~metasenv ~subst ~context infty )); - force_ty true metasenv subst context orig t infty expty - (*D*)in outside(); rc with exc -> outside (); raise exc + force_ty true true metasenv subst context orig t infty expty + (*D*)in outside true; rc with exc -> outside false; raise exc in typeof_aux metasenv subst context expty term -and try_coercions hdb - ~localise ~look_for_coercion +and try_coercions rdb + ~localise metasenv subst context t orig_t infty expty perform_unification exc = (* we try with a coercion *) let rec first exc = function | [] -> raise (wrap_exc (lazy (localise orig_t, Printf.sprintf - "The term %s has type %s but is here used with type %s" + "The term\n%s\nhas type\n%s\nbut is here used with type\n%s" (NCicPp.ppterm ~metasenv ~subst ~context t) (NCicPp.ppterm ~metasenv ~subst ~context infty) (NCicPp.ppterm ~metasenv ~subst ~context expty))) exc) - | (metasenv, newterm, newtype, meta)::tl -> + | (_,metasenv, newterm, newtype, meta)::tl -> try + pp (lazy("K=" ^ NCicPp.ppterm ~metasenv ~subst ~context newterm)); pp (lazy ( "UNIFICATION in CTX:\n"^ NCicPp.ppcontext ~metasenv ~subst context ^ "\nMENV: " ^ NCicPp.ppmetasenv metasenv ~subst ^ "\nOF: " ^ - NCicPp.ppterm ~metasenv ~subst ~context meta ^ " === " ^ - NCicPp.ppterm ~metasenv ~subst ~context t ^ "\n")); + NCicPp.ppterm ~metasenv ~subst ~context t ^ " === " ^ + NCicPp.ppterm ~metasenv ~subst ~context meta ^ "\n")); let metasenv, subst = - NCicUnification.unify hdb metasenv subst context meta t + NCicUnification.unify rdb metasenv subst context t meta in pp (lazy ( "UNIFICATION in CTX:\n"^ NCicPp.ppcontext ~metasenv ~subst context @@ -367,7 +434,7 @@ and try_coercions hdb NCicPp.ppterm ~metasenv ~subst ~context expty ^ "\n")); let metasenv, subst = if perform_unification then - NCicUnification.unify hdb metasenv subst context newtype expty + NCicUnification.unify rdb metasenv subst context newtype expty else metasenv, subst in metasenv, subst, newterm, newtype @@ -375,17 +442,19 @@ and try_coercions hdb | NCicUnification.UnificationFailure _ -> first exc tl | NCicUnification.Uncertain _ as exc -> first exc tl in + pp(lazy("try_coercion " ^ + NCicPp.ppterm ~metasenv ~subst ~context infty ^ " |---> " ^ + NCicPp.ppterm ~metasenv ~subst ~context expty)); first exc - (look_for_coercion metasenv subst context infty expty) + (NCicCoercion.look_for_coercion + rdb metasenv subst context infty expty) -and force_to_sort hdb - ~look_for_coercion metasenv subst context t orig_t localise ty -= +and force_to_sort rdb metasenv subst context t orig_t localise ty = match NCicReduction.whd ~subst context ty with | C.Meta (_,(0,(C.Irl 0 | C.Ctx []))) as ty -> metasenv, subst, t, ty - | C.Meta (i,(_,(C.Irl 0 | C.Ctx []))) -> - metasenv, subst, t, C.Meta(i,(0,C.Irl 0)) + | C.Meta (_i,(_,(C.Irl 0 | C.Ctx []))) -> assert false (*CSC: ??? + metasenv, subst, t, C.Meta(i,(0,C.Irl 0)) *) | C.Meta (i,(_,lc)) -> let len = match lc with C.Irl len->len | C.Ctx l->List.length l in let metasenv, subst, newmeta = @@ -396,8 +465,11 @@ and force_to_sort hdb metasenv, subst, t, C.Meta (newmeta,(0,C.Irl 0)) | C.Sort _ as ty -> metasenv, subst, t, ty | ty -> - try_coercions hdb ~localise ~look_for_coercion metasenv subst context - t orig_t ty (NCic.Sort (NCic.Type NCicEnvironment.type0)) false + try_coercions rdb ~localise metasenv subst context + t orig_t ty (NCic.Sort (NCic.Type + (match NCicEnvironment.get_universes () with + | x::_ -> x + | _ -> assert false))) false (Uncertain (lazy (localise orig_t, "The type of " ^ NCicPp.ppterm ~metasenv ~subst ~context t ^ " is not a sort: " ^ NCicPp.ppterm ~metasenv ~subst ~context ty))) @@ -424,48 +496,94 @@ and sort_of_prod (NCicPp.ppterm ~subst ~metasenv ~context y) (NCicPp.ppterm ~subst ~metasenv ~context x)))) -and eat_prods hdb - ~localise ~look_for_coercion metasenv subst context orig_he he ty_he args -= +and guess_name subst ctx ty = + let aux initial = "#" ^ String.make 1 initial in + match ty with + | C.Const (NReference.Ref (u,_)) + | C.Appl (C.Const (NReference.Ref (u,_)) :: _) -> + aux (String.sub (NUri.name_of_uri u) 0 1).[0] + | C.Prod _ -> aux 'f' + | C.Meta (n,lc) -> + (try + let _,_,t,_ = NCicUtils.lookup_subst n subst in + guess_name subst ctx (NCicSubstitution.subst_meta lc t) + with NCicUtils.Subst_not_found _ -> aux 'M') + | _ -> aux 'H' + +and eat_prods rdb ~localise force_ty metasenv subst context expty orig_t orig_he he ty_he args = (*D*)inside 'E'; try let rc = - let rec aux metasenv subst args_so_far he ty_he = function - | []->metasenv, subst, NCicUntrusted.mk_appl he (List.rev args_so_far), ty_he + let rec aux metasenv subst args_so_far he ty_he xxx = + (*D*)inside 'V'; try let rc = + match xxx with + | [] -> + let res = NCicUntrusted.mk_appl he (List.rev args_so_far) in + pp(lazy("FORCE FINAL APPL: " ^ + NCicPp.ppterm ~metasenv ~subst ~context res ^ + " of type " ^ NCicPp.ppterm ~metasenv ~subst ~context ty_he + ^ " to type " ^ match expty with None -> "None" | Some x -> + NCicPp.ppterm ~metasenv ~subst ~context x)); + (* whatever the term is, we force the type. in case of ((Lambda..) ?...) + * the application may also be a lambda! *) + force_ty false false metasenv subst context orig_t res ty_he expty + | NCic.Implicit `Vector::tl -> + let has_some_more_pis x = + match NCicReduction.whd ~subst context x with + | NCic.Meta _ | NCic.Appl (NCic.Meta _::_) -> false + | _ -> true + in + (try + aux metasenv subst args_so_far he ty_he tl + with + | Uncertain _ + | RefineFailure _ as exc when has_some_more_pis ty_he -> + (try + aux metasenv subst args_so_far he ty_he + (NCic.Implicit `Term :: NCic.Implicit `Vector :: tl) + with + Uncertain msg | RefineFailure msg -> raise (wrap_exc msg exc)) + | RefineFailure msg when not (has_some_more_pis ty_he) -> + (* instantiating the head could change the has_some_more_pis flag *) + raise (Uncertain msg)) | arg::tl -> match NCicReduction.whd ~subst context ty_he with | C.Prod (_,s,t) -> let metasenv, subst, arg, _ = - typeof hdb ~look_for_coercion ~localise - metasenv subst context arg (Some s) in + typeof rdb ~localise metasenv subst context arg (Some s) in let t = NCicSubstitution.subst ~avoid_beta_redexes:true arg t in aux metasenv subst (arg :: args_so_far) he t tl | C.Meta _ | C.Appl (C.Meta _ :: _) as t -> let metasenv, subst, arg, ty_arg = - typeof hdb ~look_for_coercion ~localise - metasenv subst context arg None in + typeof rdb ~localise metasenv subst context arg None in + let name = guess_name subst context ty_arg in let metasenv, _, meta, _ = NCicMetaSubst.mk_meta metasenv - (("_",C.Decl ty_arg) :: context) `Type + ((name,C.Decl ty_arg) :: context) `IsType in - let flex_prod = C.Prod ("_", ty_arg, meta) in + let flex_prod = C.Prod (name, ty_arg, meta) in (* next line grants that ty_args is a type *) let metasenv,subst, flex_prod, _ = - typeof hdb ~look_for_coercion ~localise metasenv subst - context flex_prod None in + typeof rdb ~localise metasenv subst context flex_prod None in +(* pp (lazy ( "UNIFICATION in CTX:\n"^ NCicPp.ppcontext ~metasenv ~subst context ^ "\nOF: " ^ NCicPp.ppterm ~metasenv ~subst ~context t ^ " === " ^ NCicPp.ppterm ~metasenv ~subst ~context flex_prod ^ "\n")); - let metasenv, subst = - try NCicUnification.unify hdb metasenv subst context t flex_prod +*) + let metasenv, subst = + try NCicUnification.unify rdb metasenv subst context t flex_prod with exc -> raise (wrap_exc (lazy (localise orig_he, Printf.sprintf ("The term %s has an inferred type %s, but is applied to the" ^^ " argument %s of type %s") (NCicPp.ppterm ~metasenv ~subst ~context he) (NCicPp.ppterm ~metasenv ~subst ~context t) (NCicPp.ppterm ~metasenv ~subst ~context arg) - (NCicPp.ppterm ~metasenv ~subst ~context ty_arg))) exc) + (NCicPp.ppterm ~metasenv ~subst ~context ty_arg))) + (match exc with + | NCicUnification.UnificationFailure m -> + NCicUnification.Uncertain m + | x -> x)) (* XXX coerce to funclass *) in let meta = NCicSubstitution.subst ~avoid_beta_redexes:true arg meta in @@ -479,7 +597,7 @@ and eat_prods hdb (List.length args) (List.length args_so_far)))) | ty -> let metasenv, subst, newhead, newheadty = - try_coercions hdb ~localise ~look_for_coercion metasenv subst context + try_coercions rdb ~localise metasenv subst context (NCicUntrusted.mk_appl he (List.rev args_so_far)) orig_he ty (NCic.Prod ("_",NCic.Implicit `Term,NCic.Implicit `Term)) false @@ -488,10 +606,19 @@ and eat_prods hdb "only %d arguments") (NCicPp.ppterm ~metasenv ~subst ~context he) (List.length args) (List.length args_so_far)))) in - aux metasenv subst [] newhead newheadty (arg :: tl) + aux metasenv subst [] newhead newheadty (arg :: tl) + (*D*)in outside true; rc with exc -> outside false; raise exc in - aux metasenv subst [] he ty_he args - (*D*)in outside(); rc with exc -> outside (); raise exc + (* We need to reverse the order of the new created metas since they + are pushed on top of the metasenv in the wrong order *) + let highest_meta = NCicMetaSubst.maxmeta () in + let metasenv, subst, newhead, newheadty = + aux metasenv subst [] he ty_he args in + let metasenv_old,metasenv_new = + List.partition (fun (i,_) -> i <= highest_meta) metasenv + in + (List.rev metasenv_new) @ metasenv_old, subst, newhead, newheadty + (*D*)in outside true; rc with exc -> outside false; raise exc ;; let rec first f l1 l2 = @@ -524,27 +651,25 @@ let relocalise old_localise dt t add = let undebruijnate inductive ref t rev_fl = NCicSubstitution.psubst (fun x -> x) - (HExtlib.list_mapi + (List.rev (HExtlib.list_mapi (fun (_,_,rno,_,_,_) i -> NCic.Const (if inductive then NReference.mk_fix i rno ref else NReference.mk_cofix i ref)) - rev_fl) + rev_fl)) t ;; -let typeof_obj hdb - ?(localise=fun _ -> Stdpp.dummy_loc) - ~look_for_coercion (uri,height,metasenv,subst,obj) +let typeof_obj + rdb ?(localise=fun _ -> Stdpp.dummy_loc) (uri,height,metasenv,subst,obj) = let check_type metasenv subst context (ty as orig_ty) = (* XXX fattorizza *) let metasenv, subst, ty, sort = - typeof hdb ~localise ~look_for_coercion metasenv subst context ty None + typeof rdb ~localise metasenv subst context ty None in let metasenv, subst, ty, sort = - force_to_sort hdb ~look_for_coercion - metasenv subst context ty orig_ty localise sort + force_to_sort rdb metasenv subst context ty orig_ty localise sort in metasenv, subst, ty, sort in @@ -555,9 +680,7 @@ let typeof_obj hdb match bo with | Some bo -> let metasenv, subst, bo, ty = - typeof hdb ~localise ~look_for_coercion - metasenv subst [] bo (Some ty) - in + typeof rdb ~localise metasenv subst [] bo (Some ty) in let height = (* XXX recalculate *) height in metasenv, subst, Some bo, ty, height | None -> metasenv, subst, None, ty, 0 @@ -570,7 +693,7 @@ let typeof_obj hdb List.fold_left (fun (types, metasenv, subst, fl) (relevance,name,k,ty,bo) -> let metasenv, subst, ty, _ = check_type metasenv subst [] ty in - let dbo = NCicTypeChecker.debruijn uri len [] bo in + let dbo = NCicTypeChecker.debruijn uri len [] ~subst bo in let localise = relocalise localise dbo bo in (name,C.Decl ty)::types, metasenv, subst, (relevance,name,k,ty,dbo,localise)::fl @@ -580,8 +703,7 @@ let typeof_obj hdb List.fold_left (fun (metasenv,subst,fl) (relevance,name,k,ty,dbo,localise) -> let metasenv, subst, dbo, ty = - typeof hdb ~localise ~look_for_coercion - metasenv subst types dbo (Some ty) + typeof rdb ~localise metasenv subst types dbo (Some ty) in metasenv, subst, (relevance,name,k,ty,dbo)::fl) (metasenv, subst, []) rev_fl @@ -620,7 +742,8 @@ let typeof_obj hdb let k_relev = try snd (HExtlib.split_nth leftno k_relev) with Failure _ -> k_relev in - let te = NCicTypeChecker.debruijn uri len [] te in + let te = NCicTypeChecker.debruijn uri len [] ~subst te in + let metasenv, subst, te, _ = check_type metasenv subst tys te in let context,te = NCicReduction.split_prods ~subst tys leftno te in let _,chopped_context_rev = HExtlib.split_nth (List.length tys) (List.rev context) in @@ -635,17 +758,17 @@ let typeof_obj hdb match item1,item2 with (n1,C.Decl ty1),(n2,C.Decl ty2) -> if n1 = n2 then - NCicUnification.unify hdb ~test_eq_only:true metasenv + NCicUnification.unify rdb ~test_eq_only:true metasenv subst context ty1 ty2,true else (metasenv,subst),false | (n1,C.Def (bo1,ty1)),(n2,C.Def (bo2,ty2)) -> if n1 = n2 then let metasenv,subst = - NCicUnification.unify hdb ~test_eq_only:true metasenv + NCicUnification.unify rdb ~test_eq_only:true metasenv subst context ty1 ty2 in - NCicUnification.unify hdb ~test_eq_only:true metasenv + NCicUnification.unify rdb ~test_eq_only:true metasenv subst context bo1 bo2,true else (metasenv,subst),false @@ -665,12 +788,9 @@ let typeof_obj hdb "and those of its inductive type")))) else metasenv,subst,item1::context - ) (metasenv,subst,[]) sx_context_ty_rev sx_context_te_rev - with Invalid_argument "List.fold_left2" -> assert false - in - let metasenv, subst, te, con_sort = - check_type metasenv subst context te - in + ) (metasenv,subst,tys) sx_context_ty_rev sx_context_te_rev + with Invalid_argument "List.fold_left2" -> assert false in + let con_sort= NCicTypeChecker.typeof ~subst ~metasenv context te in (match NCicReduction.whd ~subst context con_sort, NCicReduction.whd ~subst [] ty_sort @@ -700,16 +820,29 @@ let typeof_obj hdb raise (RefineFailure (lazy (localise te, - "Non positive occurence in " ^ NUri.string_of_uri uri))) + "Non positive occurence in " ^ + NCicPp.ppterm ~metasenv ~subst ~context te))) else + let relsno = List.length itl + leftno in let te = NCicSubstitution.psubst - (fun i -> NCic.Const (NReference.reference_of_spec uri - (NReference.Ind (ind,i,leftno)))) - (List.rev (HExtlib.list_seq 0 (List.length itl))) - te - in - metasenv,subst,(k_relev,n,te)::res + (fun i -> + if i <= leftno then + NCic.Rel i + else + NCic.Const (NReference.reference_of_spec uri + (NReference.Ind (ind,relsno - i,leftno)))) + (HExtlib.list_seq 1 (relsno+1)) + te in + let te = + List.fold_right + (fun (name,decl) te -> + match decl with + NCic.Decl ty -> NCic.Prod (name,ty,te) + | NCic.Def (bo,ty) -> NCic.LetIn (name,ty,bo,te) + ) sx_context_te_rev te + in + metasenv,subst,(k_relev,n,te)::res ) cl (metasenv,subst,[]) in metasenv,subst,(it_relev,n,ty,cl)::res,i+1