-type cic_term = NCic.conjecture (* attrs, context, term *)
-let ctx_of (_,c,_) = c ;;
+type cic_term = NCic.context * NCic.term
+let ctx_of (c,_) = c ;;
if source == destination then status, orig else
let u, d, metasenv, subst, o = status#obj in
let rec lcp ctx j i = function
if source == destination then status, orig else
let u, d, metasenv, subst, o = status#obj in
let rec lcp ctx j i = function
metasenv subst source 0 lc t
in
let status = status#set_obj (u, d, metasenv, subst, o) in
metasenv subst source 0 lc t
in
let status = status#set_obj (u, d, metasenv, subst, o) in
s, t
;;
let ppterm status t =
let uri,height,metasenv,subst,obj = status#obj in
s, t
;;
let ppterm status t =
let uri,height,metasenv,subst,obj = status#obj in
- let status, (_,_,x) = relocate status context ty in status, Some x
+ let status, (_,x) = relocate status context ty in status, Some x
in
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
in
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
let _,_,metasenv,subst,_ = status#obj in
let ty = NCicTypeChecker.typeof ~subst ~metasenv ctx t in
let _,_,metasenv,subst,_ = status#obj in
let ty = NCicTypeChecker.typeof ~subst ~metasenv ctx t in
let _,_,_,subst,_ = status#obj in
let t = NCicReduction.whd ~subst ?delta ctx t in
let _,_,_,subst,_ = status#obj in
let t = NCicReduction.whd ~subst ?delta ctx t in
let _,_,_,subst,_ = status#obj in
let t = NCicTacReduction.normalize ~subst ?delta ctx t in
let _,_,_,subst,_ = status#obj in
let t = NCicTacReduction.normalize ~subst ?delta ctx t in
- let status, (_,_,a) = relocate status ctx a in
- let status, (_,_,b) = relocate status ctx b in
+ let status, (_,a) = relocate status ctx a in
+ let status, (_,b) = relocate status ctx b in
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 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 status, (nt,_,term) = relocate status ctx term in
- let status, ne, expty =
+ let status, (_,term) = relocate status ctx term in
+ let status, expty =
- let status, (n,_, e) = relocate status ctx e in status, n, Some e
+ let status, (_, e) = relocate status ctx e in status, Some e
in
let name,height,metasenv,subst,obj = status#obj in
let metasenv,subst,t,ty =
NCicRefiner.typeof status metasenv subst ctx term expty
in
in
let name,height,metasenv,subst,obj = status#obj in
let metasenv,subst,t,ty =
NCicRefiner.typeof status metasenv subst ctx term expty
in
- status#set_obj (name,height,metasenv,subst,obj), (nt,ctx,t), (ne,ctx,ty)
+ status#set_obj (name,height,metasenv,subst,obj), (ctx,t), (ctx,ty)
;;
let refine a b c d = wrap (refine a b c) d;;
let get_goalty status g =
let _,_,metasenv,_,_ = status#obj in
;;
let refine a b c d = wrap (refine a b c) d;;
let get_goalty status g =
let _,_,metasenv,_,_ = status#obj in
- let (gname, context, _ as gty) = get_goalty status i in
- let status, (_,_,t), (_,_,ty) =
- refine status (ctx_of gty) t (Some gty)
+ let _,_,metasenv,_,_ = status#obj in
+ let gname, context, gty = List.assoc i metasenv in
+ let status, (_,t), (_,ty) =
+ refine status context t (Some (context,gty))
in
let name,height,metasenv,subst,obj = status#obj in
in
let name,height,metasenv,subst,obj = status#obj in
let n,h,metasenv,subst,o = status#obj in
let metasenv, _, instance, _ =
NCicMetaSubst.mk_meta ~attrs metasenv ctx (`WithType ty)
in
let status = status#set_obj (n,h,metasenv,subst,o) in
let n,h,metasenv,subst,o = status#obj in
let metasenv, _, instance, _ =
NCicMetaSubst.mk_meta ~attrs metasenv ctx (`WithType ty)
in
let status = status#set_obj (n,h,metasenv,subst,o) in
- let status, (_,_,bo_ as bo) = relocate status ctx bo in
- let status, (_,_,ty) = typeof status ctx bo in
+ 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#obj in
let metasenv, metano, instance, _ =
NCicMetaSubst.mk_meta ~attrs metasenv ctx (`WithType ty) in
let metasenv = List.filter (fun j,_ -> j <> metano) metasenv in
let subst = (metano, (attrs, ctx, bo_, ty)) :: subst in
let status = status#set_obj (n,h,metasenv,subst,o) in
let n,h,metasenv,subst,o = status#obj in
let metasenv, metano, instance, _ =
NCicMetaSubst.mk_meta ~attrs metasenv ctx (`WithType ty) in
let metasenv = List.filter (fun j,_ -> j <> metano) metasenv in
let subst = (metano, (attrs, ctx, bo_, ty)) :: subst in
let status = status#set_obj (n,h,metasenv,subst,o) in
- low_status ~found ~postprocess (name,context,term) (wanted,path)
+ low_status ~found ~postprocess (context,term) (wanted,path)
with
| Error (_, Some (NCicUnification.UnificationFailure _))
| Error (_, Some (NCicUnification.Uncertain _)) -> false, status
with
| Error (_, Some (NCicUnification.UnificationFailure _))
| Error (_, Some (NCicUnification.Uncertain _)) -> false, status
let rec aux ctx (status,already_found) t =
let b, status = is_found status ctx t wanted in
if b then
let rec aux ctx (status,already_found) t =
let b, status = is_found status ctx t wanted in
if b then
- let status , (_,_,t) = found status ([], ctx, t) in
+ let status , (_,t) = found status (ctx, t) in
(status,true),t
else
let _,_,_,subst,_ = status#obj in
(status,true),t
else
let _,_,_,subst,_ = status#obj in
let (status',found), t' = match_term status' ctx wanted t in
if found then status',t' else status,t
| None ->
let (status',found), t' = match_term status' ctx wanted t in
if found then status',t' else status,t
| None ->
- let (status,_),t = match_term status ctx ([],ctx,t) t in
+ let (status,_),t = match_term status ctx (ctx,t) t in
NCicPp.ppterm ~metasenv:[] ~subst:[] ~context:[] t))
in
let status, term = select low_status context path term in
NCicPp.ppterm ~metasenv:[] ~subst:[] ~context:[] t))
in
let status, term = select low_status context path term in
- | _,_,NCic.Const ref -> ref, []
- | _,_,NCic.Appl (NCic.Const ref :: args) -> ref, args
- | _,_,_ -> fail (lazy ("not an inductive type")) in
+ | _,NCic.Const ref -> ref, []
+ | _,NCic.Appl (NCic.Const ref :: args) -> ref, args
+ | _,_ -> fail (lazy ("not an inductive type")) in
let _,lno,tl,_,i = NCicEnvironment.get_checked_indtys ref in
let _,_,_,cl = List.nth tl i in
let consno = List.length cl in
let _,lno,tl,_,i = NCicEnvironment.get_checked_indtys ref in
let _,_,_,cl = List.nth tl i in
let consno = List.length cl in
status, (ref, consno, left, right)
;;
status, (ref, consno, left, right)
;;
let _,_,_,subst,_ = status#obj in
let _,_,_,subst,_ = status#obj in
- status, (name, ctx, NCicUntrusted.apply_subst subst ctx t)
+ status, (ctx, NCicUntrusted.apply_subst subst ctx t)