X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_refiner%2Fcheck.ml;h=f544d8daeed54aad2216322cc09f344e6bfacfa8;hb=7f9e313fe5ae4200f080f481a6b8b795a0618093;hp=7fbb781df0eff98e37a683788db4da372b5965c7;hpb=e81c7a0e24d24ab71685fbc46f7e7e2c2f02c495;p=helm.git diff --git a/helm/software/components/ng_refiner/check.ml b/helm/software/components/ng_refiner/check.ml index 7fbb781df..f544d8dae 100644 --- a/helm/software/components/ng_refiner/check.ml +++ b/helm/software/components/ng_refiner/check.ml @@ -187,13 +187,13 @@ let _ = let o = NCicLibrary.get_obj uu in if print_object then prerr_endline (NCicPp.ppobj o); try - NCicTypeChecker.typecheck_obj o + NCicEnvironment.check_and_add_obj o with | NCicTypeChecker.AssertFailure s | NCicTypeChecker.TypeCheckerFailure s | NCicEnvironment.ObjectNotFound s | NCicEnvironment.BadConstraint s - | NCicEnvironment.BadDependency s as e -> + | NCicEnvironment.BadDependency (s,_) as e -> prerr_endline ("######### " ^ Lazy.force s); if not ignore_exc then raise e ) @@ -220,7 +220,8 @@ let _ = | NCic.Appl (NCic.Const (NReference.Ref (u,_))::ty::_) when NUri.string_of_uri u = "cic:/matita/tests/hole.con" -> let metasenv, ty = perforate ctx metasenv ty in - let a,b,_ = NCicMetaSubst.mk_meta metasenv ctx (`WithType ty) in a,b + let a,_,b,_ = + NCicMetaSubst.mk_meta metasenv ctx (`WithType ty) in a,b | t -> NCicUntrusted.map_term_fold_a (fun e ctx -> e::ctx) ctx perforate metasenv t @@ -270,14 +271,13 @@ let _ = prerr_endline ("start: " ^ NUri.string_of_uri u); let bo = curryfy [] bo in (try + let rdb = new NRstatus.status in let metasenv, subst, bo, infty = - NCicRefiner.typeof - ~look_for_coercion:(fun _ _ _ _ _ -> []) - NCicUnifHint.empty_db [] [] [] bo None + NCicRefiner.typeof rdb [] [] [] bo None in let metasenv, subst = try - NCicUnification.unify NCicUnifHint.empty_db metasenv subst [] infty ty + NCicUnification.unify rdb metasenv subst [] infty ty with | NCicUnification.Uncertain msg | NCicUnification.UnificationFailure msg