let wrap fname f x =
try f x
with
- | MultiPassDisambiguator.DisambiguationError _
+ | GrafiteDisambiguate.Error _
| NCicRefiner.RefineFailure _
| NCicUnification.UnificationFailure _
| NCicTypeChecker.TypeCheckerFailure _
method obj: NCic.obj
end
-class virtual pstatus =
+class virtual pstatus uid =
fun (o: NCic.obj) ->
object (self)
- inherit GrafiteDisambiguate.status
+ inherit GrafiteDisambiguate.status uid
inherit auto_status
inherit eq_status
val obj = o
let status, (_,x) = relocate status context ty in status, Some x
in
let uri,height,metasenv,subst,obj = status#obj in
- let newast, metasenv, subst, status, t =
+ let metasenv, subst, status, t =
GrafiteDisambiguate.disambiguate_nterm status expty context metasenv subst t
in
let new_pstatus = uri,height,metasenv,subst,obj in
method stack: 'stack
end
-class virtual ['stack] status =
+class virtual ['stack] status uid =
fun (o: NCic.obj) (s: 'stack) ->
object (self)
- inherit (pstatus o)
+ inherit (pstatus uid o)
val stack = s
method stack = stack
method set_stack s = {< stack = s >}
let pp_tac_status (status: #tac_status) =
prerr_endline (status#ppobj status#obj);
+ (* let a,p = NCicParamod.size_of_state status#eq_cache in
+ prerr_endline ("number of actives: " ^ string_of_int a ^ "and number of passives: " ^ string_of_int p) *)
prerr_endline ("STACK:\n" ^ Continuationals.Stack.pp status#stack)
;;