let mk_type n =
if n = 0 then
- [false, NUri.uri_of_string ("cic:/matita/pts/Type.univ")]
+ [`Type, NUri.uri_of_string ("cic:/matita/pts/Type.univ")]
else
- [false, NUri.uri_of_string ("cic:/matita/pts/Type"^string_of_int n^".univ")]
+ [`Type, NUri.uri_of_string ("cic:/matita/pts/Type"^string_of_int n^".univ")]
;;
let mk_cprop n =
if n = 0 then
- [false, NUri.uri_of_string ("cic:/matita/pts/CProp.univ")]
+ [`CProp, NUri.uri_of_string ("cic:/matita/pts/Type.univ")]
else
- [false, NUri.uri_of_string ("cic:/matita/pts/CProp"^string_of_int n^".univ")]
+ [`CProp, NUri.uri_of_string ("cic:/matita/pts/Type"^string_of_int n^".univ")]
;;
try
let rec aux = function
| a::(b::_ as tl) ->
- NCicEnvironment.add_constraint true (mk_type a) (mk_type b);
- NCicEnvironment.add_constraint true (mk_cprop a) (mk_cprop b);
- NCicEnvironment.add_constraint true (mk_cprop a) (mk_type b);
- NCicEnvironment.add_constraint true (mk_type a) (mk_cprop b);
- NCicEnvironment.add_constraint false (mk_cprop a) (mk_type a);
- NCicEnvironment.add_constraint false (mk_type a) (mk_cprop a);
+ NCicEnvironment.add_lt_constraint (mk_type a) (mk_type b);
+ NCicEnvironment.add_lt_constraint (mk_cprop a) (mk_cprop b);
aux tl
- | [a] ->
- NCicEnvironment.add_constraint false (mk_type a) (mk_cprop a);
- NCicEnvironment.add_constraint false (mk_cprop a) (mk_type a);
| _ -> ()
in
aux lll
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
prerr_endline ("start: " ^ NUri.string_of_uri u);
let bo = curryfy [] bo in
(try
- let rdb = {
- NRstatus.uhint_db = NCicUnifHint.empty_db;
- NRstatus.coerc_db = NCicCoercion.empty_db
- } in
+ let rdb = new NRstatus.status in
let metasenv, subst, bo, infty =
NCicRefiner.typeof rdb [] [] [] bo None
in