(* $Id: nCic.ml 9058 2008-10-13 17:42:30Z tassi $ *)
-exception Error of string lazy_t
-let fail msg = raise (Error msg)
+exception Error of string lazy_t * exn option
+let fail ?exn msg = raise (Error (msg,exn))
-type lowtac_status = {
- pstatus : NCic.obj;
- estatus : NEstatus.extra_status;
-}
-
-type lowtactic = lowtac_status -> int -> lowtac_status
-
-type tac_status = {
- gstatus : Continuationals.Stack.t;
- istatus : lowtac_status;
-}
+let wrap f x =
+ try f x
+ with
+ | MultiPassDisambiguator.DisambiguationError _
+ | NCicRefiner.RefineFailure _
+ | NCicUnification.UnificationFailure _
+ | NCicTypeChecker.TypeCheckerFailure _
+ | NCicMetaSubst.MetaSubstFailure _ as exn -> fail ~exn (lazy "")
+;;
-type tactic = tac_status -> tac_status
+class pstatus =
+ fun (o: NCic.obj) ->
+ object
+ inherit NEstatus.status
+ val obj = o
+ method obj = obj
+ method set_obj o = {< obj = o >}
+ end
type tactic_term = CicNotationPt.term Disambiguate.disambiguator_input
type tactic_pattern = GrafiteAst.npattern Disambiguate.disambiguator_input
-let pp_tac_status status =
- prerr_endline (NCicPp.ppobj status.istatus.pstatus)
-;;
-
-let pp_lowtac_status status =
- prerr_endline "--------------------------------------------";
- prerr_endline (NCicPp.ppobj status.pstatus)
+let pp_status status =
+ prerr_endline (NCicPp.ppobj status#obj)
;;
type cic_term = NCic.conjecture (* name, context, term *)
let relocate status destination (name,source,t as orig) =
if source == destination then status, orig else
- let u, d, metasenv, subst, o = status.pstatus in
+ let u, d, metasenv, subst, o = status#obj in
let rec lcp ctx j i = function
| (n1, NCic.Decl t1 as e)::cl1, (n2, NCic.Decl t2)::cl2 ->
if n1 = n2 &&
let (metasenv, subst), t =
NCicMetaSubst.delift
~unify:(fun m s c t1 t2 ->
- try Some (NCicUnification.unify
- status.estatus.NEstatus.rstatus m s c t1 t2)
+ try Some (NCicUnification.unify status m s c t1 t2)
with
| NCicUnification.UnificationFailure _
| NCicUnification.Uncertain _ -> None)
metasenv subst source 0 lc t
in
- let status = { status with pstatus = u, d, metasenv, subst, o } in
+ let status = status#set_obj (u, d, metasenv, subst, o) in
status, (name, destination, t)
;;
+let relocate a b c = wrap (relocate a b) c;;
let term_of_cic_term s t c =
let s, (_,_,t) = relocate s c t in
;;
let ppterm status t =
- let uri,height,metasenv,subst,obj = status.pstatus in
+ let uri,height,metasenv,subst,obj = status#obj in
let _,context,t = t in
NCicPp.ppterm ~metasenv ~subst ~context t
;;
| Some ty ->
let status, (_,_,x) = relocate status context ty in status, Some x
in
- let uri,height,metasenv,subst,obj = status.pstatus in
- let metasenv, subst, estatus, t =
- GrafiteDisambiguate.disambiguate_nterm expty
- status.estatus context metasenv subst t
+ let uri,height,metasenv,subst,obj = status#obj in
+ let metasenv, subst, status, t =
+ GrafiteDisambiguate.disambiguate_nterm expty status context metasenv subst t
in
let new_pstatus = uri,height,metasenv,subst,obj in
- { estatus = estatus; pstatus = new_pstatus }, (None, context, t)
+ status#set_obj new_pstatus, (None, context, t)
;;
+let disambiguate a b c d = wrap (disambiguate a b c) d;;
let typeof status ctx t =
let status, (_,_,t) = relocate status ctx t in
- let _,_,metasenv,subst,_ = status.pstatus in
+ let _,_,metasenv,subst,_ = status#obj in
let ty = NCicTypeChecker.typeof ~subst ~metasenv ctx t in
status, (None, ctx, ty)
;;
+let typeof a b c = wrap (typeof a b) c;;
let whd status ?delta ctx t =
let status, (name,_,t) = relocate status ctx t in
- let _,_,_,subst,_ = status.pstatus in
+ let _,_,_,subst,_ = status#obj in
let t = NCicReduction.whd ~subst ?delta ctx t in
status, (name, ctx, t)
;;
let normalize status ?delta ctx t =
let status, (name,_,t) = relocate status ctx t in
- let _,_,_,subst,_ = status.pstatus in
+ let _,_,_,subst,_ = status#obj in
let t = NCicTacReduction.normalize ~subst ?delta ctx t in
status, (name, ctx, t)
;;
let unify status ctx a b =
let status, (_,_,a) = relocate status ctx a in
let status, (_,_,b) = relocate status ctx b in
- let n,h,metasenv,subst,o = status.pstatus in
- let metasenv, subst =
- NCicUnification.unify status.estatus.NEstatus.rstatus metasenv subst ctx a b
- in
- { status with pstatus = n,h,metasenv,subst,o }
+ let n,h,metasenv,subst,o = status#obj in
+ let metasenv, subst = NCicUnification.unify status metasenv subst ctx a b in
+ status#set_obj (n,h,metasenv,subst,o)
;;
+let unify a b c d = wrap (unify a b c) d;;
let refine status ctx term expty =
let status, (nt,_,term) = relocate status ctx term in
| Some e ->
let status, (n,_, e) = relocate status ctx e in status, n, Some e
in
- let name,height,metasenv,subst,obj = status.pstatus in
- let rdb = status.estatus.NEstatus.rstatus in
- let metasenv, subst, t, ty =
- NCicRefiner.typeof rdb metasenv subst ctx term expty
+ let name,height,metasenv,subst,obj = status#obj in
+ let metasenv,subst,t,ty =
+ NCicRefiner.typeof status metasenv subst ctx term expty
in
- { status with pstatus = name,height,metasenv,subst,obj },
- (nt,ctx,t), (ne,ctx,ty)
+ status#set_obj (name,height,metasenv,subst,obj), (nt,ctx,t), (ne,ctx,ty)
;;
+let refine a b c d = wrap (refine a b c) d;;
-let get_goalty (status : lowtac_status) (g : int) =
- let _,_,metasenv,_,_ = status.pstatus in
+let get_goalty status g =
+ let _,_,metasenv,_,_ = status#obj in
List.assoc g metasenv
;;
refine status (ctx_of gty) t (Some gty)
in
- let name,height,metasenv,subst,obj = status.pstatus in
+ let name,height,metasenv,subst,obj = status#obj in
let metasenv = List.filter (fun j,_ -> j <> i) metasenv in
let subst = (i, (gname, context, t, ty)) :: subst in
- { status with pstatus = (name,height,metasenv,subst,obj) }
+ status#set_obj (name,height,metasenv,subst,obj)
;;
let mk_meta status ?name ctx bo_or_ty =
match bo_or_ty with
| `Decl ty ->
let status, (_,_,ty) = relocate status ctx ty in
- let n,h,metasenv,subst,o = status.pstatus in
+ let n,h,metasenv,subst,o = status#obj in
let metasenv, _, instance, _ =
NCicMetaSubst.mk_meta ?name metasenv ctx (`WithType ty)
in
- let status = { status with pstatus = n,h,metasenv,subst,o } in
+ let status = status#set_obj (n,h,metasenv,subst,o) in
status, (None,ctx,instance)
| `Def bo ->
let status, (_,_,bo_ as bo) = relocate status ctx bo in
let status, (_,_,ty) = typeof status ctx bo in
- let n,h,metasenv,subst,o = status.pstatus in
+ let n,h,metasenv,subst,o = status#obj in
let metasenv, metano, instance, _ =
NCicMetaSubst.mk_meta ?name metasenv ctx (`WithType ty) in
let metasenv = List.filter (fun j,_ -> j <> metano) metasenv in
let subst = (metano, (name, ctx, bo_, ty)) :: subst in
- let status = { status with pstatus = n,h,metasenv,subst,o } in
+ let status = status#set_obj (n,h,metasenv,subst,o) in
status, (None,ctx,instance)
;;
let status , (_,_,t) = found status (None, ctx, t) in
(status,true),t
else
- let _,_,_,subst,_ = status.pstatus in
+ let _,_,_,subst,_ = status#obj in
match t with
| NCic.Meta (i,lc) when List.mem_assoc i subst ->
let _,_,t,_ = NCicUtils.lookup_subst i subst in
in
aux ctx (status,false) t
in
- let _,_,_,subst,_ = low_status.pstatus in
+ let _,_,_,subst,_ = low_status#obj in
let rec select status ctx pat cic =
match pat, cic with
| _, NCic.Meta (i,lc) when List.mem_assoc i subst ->
let apply_subst status ctx t =
let status, (name,_,t) = relocate status ctx t in
- let _,_,_,subst,_ = status.pstatus in
+ let _,_,_,subst,_ = status#obj in
status, (name, ctx, NCicUntrusted.apply_subst subst ctx t)
;;
+
+(* ============= move this elsewhere ====================*)
+
+class ['stack] status =
+ fun (o: NCic.obj) (s: 'stack) ->
+ object
+ inherit (pstatus o)
+ val stack = s
+ method stack = stack
+ method set_stack s = {< stack = s >}
+ end
+
+class type lowtac_status = [unit] status
+
+type 'status lowtactic = #lowtac_status as 'status -> int -> 'status
+
+class type tac_status = [Continuationals.Stack.t] status
+
+type 'status tactic = #tac_status as 'status -> 'status
+