-(* type_of_aux' metasenv context term graph *)
-(* refines [term] and returns the refined form of [term], *)
-(* its type, the new metasenv and universe graph. *)
-val type_of_aux':
- ?localization_tbl:Stdpp.location Cic.CicHash.t ->
- Cic.metasenv -> Cic.context -> Cic.term -> CicUniv.universe_graph ->
- Cic.term * Cic.term * Cic.metasenv * CicUniv.universe_graph
-
-(* typecheck metasenv uri obj graph *)
-(* refines [obj] and returns the refined form of [obj], *)
-(* the new metasenv and universe graph. *)
-(* the [uri] is required only for inductive definitions *)
-val typecheck :
- localization_tbl:Stdpp.location Cic.CicHash.t ->
- Cic.metasenv -> UriManager.uri option -> Cic.obj ->
- Cic.obj * Cic.metasenv * CicUniv.universe_graph
-
-val insert_coercions: bool ref (* initially true *)
-
-val pack_coercion_obj: Cic.obj -> Cic.obj
+val typeof :
+ NCicUnifHint.db ->
+ ?localise:(NCic.term -> Stdpp.location) ->
+ look_for_coercion:(
+ NCic.metasenv -> NCic.substitution -> NCic.context ->
+ (* inferred type, expected type *)
+ NCic.term -> NCic.term ->
+ (* enriched metasenv, new term, its type, metavriable to
+ * be unified with the old term *)
+ (NCic.metasenv * NCic.term * NCic.term * NCic.term) list
+ ) ->
+ NCic.metasenv -> NCic.substitution -> NCic.context ->
+ NCic.term -> NCic.term option -> (* term, expected type *)
+ NCic.metasenv * NCic.substitution * NCic.term * NCic.term
+ (* menv, subst,refined term, type *)