X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_refiner%2FnCicRefiner.ml;h=03de06d1c6c3306613b31e77b2f24639be93ec3f;hb=ddd6560f4e70ec3306d223738a441d5f1dd3eac9;hp=7c199f8c07bf0c64ec295392f99083ad81b20db8;hpb=686f7f4f4444125885bc7ef9e8ec3e0b6f567137;p=helm.git diff --git a/helm/software/components/ng_refiner/nCicRefiner.ml b/helm/software/components/ng_refiner/nCicRefiner.ml index 7c199f8c0..03de06d1c 100644 --- a/helm/software/components/ng_refiner/nCicRefiner.ml +++ b/helm/software/components/ng_refiner/nCicRefiner.ml @@ -42,6 +42,7 @@ let exp_implicit ~localise metasenv context expty t = | `Closed -> NCicMetaSubst.mk_meta metasenv [] (foo `Term) | `Type -> NCicMetaSubst.mk_meta metasenv context (foo `Type) | `Term -> NCicMetaSubst.mk_meta metasenv context (foo `Term) + | `Tagged s -> NCicMetaSubst.mk_meta ~name:s metasenv context (foo `Term) | `Vector -> raise (RefineFailure (lazy (localise t, "A vector of implicit terms " ^ "can only be used in argument position"))) @@ -114,10 +115,14 @@ let rec typeof rdb (NCicPp.ppterm ~metasenv ~subst:[] ~context expty))); try let metasenv, subst = + (*D*)inside 'U'; try let rc = NCicUnification.unify rdb metasenv subst context infty expty + (*D*)in outside(); rc with exc -> outside (); raise exc in metasenv, subst, t, expty - with exc -> + 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 @@ -141,11 +146,12 @@ let rec typeof rdb 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 ~localise metasenv context expty t infos @@ -229,8 +235,18 @@ let rec typeof rdb 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 context x [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 @@ -365,15 +381,16 @@ and try_coercions rdb (NCicPp.ppterm ~metasenv ~subst ~context expty))) exc) | (_,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 rdb 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 @@ -490,15 +507,13 @@ and eat_prods rdb ~localise force_ty metasenv subst context expty orig_t orig_he match NCicReduction.whd ~subst context ty_he with | C.Prod (_,s,t) -> let metasenv, subst, arg, _ = - typeof rdb ~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 rdb ~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 @@ -507,13 +522,14 @@ and eat_prods rdb ~localise force_ty metasenv subst context expty orig_t orig_he 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 rdb ~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 rdb metasenv subst context t flex_prod with exc -> raise (wrap_exc (lazy (localise orig_he, Printf.sprintf @@ -730,7 +746,7 @@ let typeof_obj "and those of its inductive type")))) else metasenv,subst,item1::context - ) (metasenv,subst,[]) sx_context_ty_rev sx_context_te_rev + ) (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 @@ -793,6 +809,4 @@ let typeof_obj uri, height, metasenv, subst, C.Inductive (ind, leftno, itl, attr) ;; -NCicUnification.set_refiner_typeof typeof;; - (* vim:set foldmethod=marker: *)