X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_refiner%2Fcheck.ml;h=2ab8185ab0e2e4725efb8f5eee309bf74852ab7c;hb=f4c17198d8afe7c8cd62dbab527d08902d891491;hp=7d13b9a35df112e7a76d5441203d2dae77dbf129;hpb=53be448c4f8ca0b60be92e24f355662a0ea7567f;p=helm.git diff --git a/helm/software/components/ng_refiner/check.ml b/helm/software/components/ng_refiner/check.ml index 7d13b9a35..2ab8185ab 100644 --- a/helm/software/components/ng_refiner/check.ml +++ b/helm/software/components/ng_refiner/check.ml @@ -193,7 +193,7 @@ let _ = | 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,12 +220,15 @@ 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 in let rec curryfy ctx = function + | NCic.Lambda (name, (NCic.Sort _ as s), tgt) -> + NCic.Lambda (name, s, curryfy ((name,NCic.Decl s) :: ctx) tgt) | NCic.Lambda (name, s, tgt) -> let tgt = curryfy ((name,NCic.Decl s) :: ctx) tgt in NCic.Lambda (name, NCic.Implicit `Type, tgt) @@ -268,12 +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 [] [] [] bo None + NCicRefiner.typeof rdb [] [] [] bo None in let metasenv, subst = try - NCicUnification.unify metasenv subst [] infty ty + NCicUnification.unify rdb metasenv subst [] infty ty with | NCicUnification.Uncertain msg | NCicUnification.UnificationFailure msg