X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fcomponents%2Fng_refiner%2FnCicRefiner.ml;h=0926db84081896b0717d086e5d2814857c4a4fb9;hb=95a6821ff8ad21cd3d11d6472a882d146676979f;hp=d279b840b18d0fcc8602bff628677e7d32967dc3;hpb=c22f39a5d5afc0ef55beb221e00e2e6703b13d90;p=helm.git diff --git a/helm/software/components/ng_refiner/nCicRefiner.ml b/helm/software/components/ng_refiner/nCicRefiner.ml index d279b840b..0926db840 100644 --- a/helm/software/components/ng_refiner/nCicRefiner.ml +++ b/helm/software/components/ng_refiner/nCicRefiner.ml @@ -36,16 +36,18 @@ let wrap_exc msg = function | e -> raise e ;; -let exp_implicit metasenv context expty = +let exp_implicit ~localise metasenv context expty t = let foo x = match expty with Some t -> `WithType t | None -> x in function | `Closed -> NCicMetaSubst.mk_meta metasenv [] (foo `Term) | `Type -> NCicMetaSubst.mk_meta metasenv context (foo `Type) | `Term -> NCicMetaSubst.mk_meta metasenv context (foo `Term) + | `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 rdb localise r orig = let mkapp he arg = match he with @@ -98,13 +100,14 @@ let rec typeof rdb ?(localise=fun _ -> Stdpp.dummy_loc) 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 ( (NCicPp.ppterm ~metasenv ~subst ~context infty) ^ " === " ^ @@ -145,8 +148,10 @@ let rec typeof rdb NCicPp.ppterm ~subst ~metasenv ~context t))) | C.Sort _ -> metasenv,subst,t,(C.Sort (C.Type NCicEnvironment.type0)) | C.Implicit infos -> - let metasenv,_,t,ty = exp_implicit metasenv context expty infos in - metasenv, subst, t, ty + let metasenv,_,t,ty = + exp_implicit ~localise metasenv context expty t infos + in + metasenv, subst, t, ty | C.Meta (n,l) as t -> let ty = try @@ -209,7 +214,7 @@ let rec typeof rdb 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) @@ -228,15 +233,12 @@ let rec typeof rdb 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 - in + let upto = match orig_he with C.Meta _ -> List.length args | _ -> 0 in let metasenv, subst, he, ty_he = typeof_aux metasenv subst context None he in let metasenv, subst, t, ty = - eat_prods rdb ~localise - metasenv subst context orig_he he ty_he args - in + eat_prods rdb ~localise force_ty metasenv subst context expty t + orig_he he ty_he args in let t = if upto > 0 then NCicReduction.head_beta_reduce ~upto t else t in metasenv, subst, t, ty | C.Appl _ -> raise (AssertFailure (lazy "Appl of length < 2")) @@ -329,7 +331,7 @@ let rec typeof rdb in pp (lazy (NCicPp.ppterm ~metasenv ~subst ~context t ^ " :: "^ NCicPp.ppterm ~metasenv ~subst ~context infty )); - force_ty true metasenv subst context orig t infty expty + force_ty true true metasenv subst context orig t infty expty (*D*)in outside(); rc with exc -> outside (); raise exc in typeof_aux metasenv subst context expty term @@ -436,12 +438,29 @@ and guess_name subst ctx ty = with NCicUtils.Subst_not_found _ -> aux 'M') | _ -> aux 'H' -and eat_prods rdb - ~localise metasenv subst context orig_he he ty_he args -= +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 too_many_args = ref false in 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 res = NCicUntrusted.mk_appl he (List.rev args_so_far) in + (match NCicReduction.whd ~subst context ty_he with + NCic.Meta _ | NCic.Appl (NCic.Meta _::_) -> + too_many_args := true; + | _ -> ()); + force_ty true false metasenv subst context orig_t res ty_he expty + | NCic.Implicit `Vector::tl -> + (try + too_many_args := false; + aux metasenv subst args_so_far he ty_he tl + with + Uncertain _ + | RefineFailure _ as exc when !too_many_args <> true -> + try + aux metasenv subst args_so_far he ty_he + (NCic.Implicit `Vector :: NCic.Implicit `Term :: tl) + with + Uncertain msg | RefineFailure msg -> raise (wrap_exc msg exc)) | arg::tl -> match NCicReduction.whd ~subst context ty_he with | C.Prod (_,s,t) -> @@ -470,7 +489,8 @@ and eat_prods rdb ^ "\nOF: " ^ NCicPp.ppterm ~metasenv ~subst ~context t ^ " === " ^ NCicPp.ppterm ~metasenv ~subst ~context flex_prod ^ "\n")); - let metasenv, subst = + let metasenv, subst = + too_many_args := true; 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" ^^ @@ -486,12 +506,15 @@ and eat_prods rdb | C.Match (_,_,C.Meta _,_) | C.Match (_,_,C.Appl (C.Meta _ :: _),_) | C.Appl (C.Const (NReference.Ref (_, NReference.Fix _)) :: _) -> + too_many_args := true; raise (Uncertain (lazy (localise orig_he, Printf.sprintf ("The term %s is here applied to %d arguments but expects " ^^ "only %d arguments") (NCicPp.ppterm ~metasenv ~subst ~context he) - (List.length args) (List.length args_so_far)))) + (List.length args + List.length args_so_far) + (List.length args_so_far)))) | ty -> let metasenv, subst, newhead, newheadty = + too_many_args := true; 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)) @@ -501,7 +524,8 @@ and eat_prods rdb "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) + too_many_args := false; + aux metasenv subst [] newhead newheadty (arg :: tl) in (* We need to reverse the order of the new created metas since they are pushed on top of the metasenv in the wrong order *) @@ -714,7 +738,8 @@ let typeof_obj 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 = @@ -744,4 +769,6 @@ let typeof_obj uri, height, metasenv, subst, C.Inductive (ind, leftno, itl, attr) ;; +NCicUnification.set_refiner_typeof typeof;; + (* vim:set foldmethod=marker: *)