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
)
| 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
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 _ _ _ _ _ -> []) [] [] [] 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