| NCicMetaSubst.MetaSubstFailure _ as exn -> fail ~exn (lazy fname)
;;
+class type g_pstatus =
+ object
+ inherit NEstatus.g_status
+ method obj: NCic.obj
+ end
+
class pstatus =
fun (o: NCic.obj) ->
- object
+ object (self)
inherit NEstatus.status
val obj = o
method obj = obj
method set_obj o = {< obj = o >}
+ method set_pstatus : 'status. #g_pstatus as 'status -> 'self
+ = fun o -> (self#set_estatus o)#set_obj o#obj
end
type tactic_term = CicNotationPt.term Disambiguate.disambiguator_input
type tactic_pattern = GrafiteAst.npattern Disambiguate.disambiguator_input
-let pp_status status =
- pp (lazy (NCicPp.ppobj status#obj))
+let pp_tac_status status =
+ prerr_endline (NCicPp.ppobj status#obj);
+ prerr_endline ("STACK:\n" ^ Continuationals.Stack.pp status#stack)
;;
type cic_term = NCic.context * NCic.term
let ctx_of (c,_) = c ;;
+let mk_cic_term c t = c,t ;;
let ppterm status t =
let uri,height,metasenv,subst,obj = status#obj in
s, t
;;
-let disambiguate status t ty context =
+let disambiguate status context t ty =
let status, expty =
match ty with
| None -> status, None
;;
let typeof a b c = wrap "typeof" (typeof a b) c;;
-let saturate status (ctx,t) =
+let saturate status ?delta (ctx,t) =
let n,h,metasenv,subst,k = status#obj in
- let t, metasenv, args = NCicMetaSubst.saturate metasenv subst ctx t 0 in
+ let t,metasenv,args = NCicMetaSubst.saturate ?delta metasenv subst ctx t 0 in
let status = status#set_obj (n,h,metasenv,subst,k) in
status, (ctx,t), List.map (fun x -> ctx,x) args
;;
-let saturate a b = wrap "saturate" (saturate a) b;;
+let saturate a ?delta b = wrap "saturate" (saturate a ?delta) b;;
let whd status ?delta ctx t =
let status, (_,t) = relocate status ctx t in
;;
let unify a b c d = wrap "unify" (unify a b c) d;;
-let fix_sorts (ctx,t) =
+let fix_sorts status (ctx,t) =
let f () =
- let t = NCicUnification.fix_sorts t in
- ctx,t
+ let name,height,metasenv,subst,obj = status#obj in
+ let metasenv, t =
+ NCicUnification.fix_sorts metasenv subst t in
+ let status = status#set_obj (name,height,metasenv,subst,obj) in
+ status, (ctx,t)
in
wrap "fix_sorts" f ()
;;
with NCicUtils.Meta_not_found _ as exn -> fail ~exn (lazy "get_goalty")
;;
-let instantiate status i t =
- 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 get_subst status =
+ let _,_,_,subst,_ = status#obj in subst
+;;
+let to_subst status i entry =
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
+ let subst = (i, entry) :: subst in
status#set_obj (name,height,metasenv,subst,obj)
;;
-let mk_meta status ?(attrs=[]) ctx bo_or_ty =
+let instantiate status ?refine:(dorefine=true) i t =
+ let _,_,metasenv,_,_ = status#obj in
+ let gname, context, gty = List.assoc i metasenv in
+ if dorefine then
+ let status, (_,t), (_,ty) = refine status context t (Some (context,gty)) in
+ to_subst status i (gname,context,t,ty)
+ else
+ let status,(_,ty) = typeof status context t in
+ to_subst status i (gname,context,snd t,ty)
+;;
+
+let instantiate_with_ast status i t =
+ let _,_,metasenv,_,_ = status#obj in
+ let gname, context, gty = List.assoc i metasenv in
+ let ggty = mk_cic_term context gty in
+ let status, (_,t) = disambiguate status context t (Some ggty) in
+ to_subst status i (gname,context,t,gty)
+;;
+
+let mk_meta status ?(attrs=[]) ctx bo_or_ty kind =
match bo_or_ty with
| `Decl ty ->
let status, (_,ty) = relocate status ctx ty in
let n,h,metasenv,subst,o = status#obj in
let metasenv, _, instance, _ =
- NCicMetaSubst.mk_meta ~attrs metasenv ctx (`WithType ty)
+ NCicMetaSubst.mk_meta ~attrs metasenv ctx ~with_type:ty kind
in
let status = status#set_obj (n,h,metasenv,subst,o) in
status, (ctx,instance)
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
+ NCicMetaSubst.mk_meta ~attrs metasenv ctx ~with_type:ty kind in
+ let attrs,_,_ = NCicUtils.lookup_meta metano metasenv 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 mk_in_scope status t =
- mk_meta status ~attrs:[`InScope] (ctx_of t) (`Def t)
+ mk_meta status ~attrs:[`InScope] (ctx_of t) (`Def t) `IsTerm
;;
let mk_out_scope n status t =
- mk_meta status ~attrs:[`OutScope n] (ctx_of t) (`Def t)
+ mk_meta status ~attrs:[`OutScope n] (ctx_of t) (`Def t) `IsTerm
;;
(* the following unification problem will be driven by
| NCic.Implicit `Hole, t ->
(match wanted with
| Some wanted ->
- let status', wanted = disambiguate status wanted None ctx in
+ let status', wanted = disambiguate status ctx wanted None in
pp(lazy("wanted: "^ppterm status' wanted));
let (status',found), t' = match_term status' ctx wanted t in
if found then status',t' else status,t
| _,NCic.Const ref -> ref, []
| _,NCic.Appl (NCic.Const (NRef.Ref (_,(NRef.Ind _)) as ref) :: args) ->
ref, args
- | _,_ -> fail (lazy ("not an inductive type")) in
+ | _,_ -> fail (lazy ("not an inductive type: " ^ ppterm status ty)) 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)
;;
-let mk_cic_term c t = c,t ;;
-
let apply_subst status ctx t =
let status, (_,t) = relocate status ctx t in
let _,_,_,subst,_ = status#obj in
status, (ctx, NCicUntrusted.apply_subst subst ctx t)
;;
+let apply_subst_context status ~fix_projections ctx =
+ let _,_,_,subst,_ = status#obj in
+ NCicUntrusted.apply_subst_context ~fix_projections subst ctx
+;;
+
+let metas_of_term status (context,t) =
+ let _,_,_,subst,_ = status#obj in
+ NCicUntrusted.metas_of_term subst context t
+;;
+
(* ============= move this elsewhere ====================*)
+class type ['stack] g_status =
+ object
+ inherit g_pstatus
+ method stack: 'stack
+ end
+
class ['stack] status =
fun (o: NCic.obj) (s: 'stack) ->
- object
+ object (self)
inherit (pstatus o)
val stack = s
method stack = stack
method set_stack s = {< stack = s >}
+ method set_status : 'status. 'stack #g_status as 'status -> 'self
+ = fun o -> (self#set_pstatus o)#set_stack o#stack
end
class type lowtac_status = [unit] status
| Dead -> "Dead"
;;
+let string_of_path l = String.concat "." (List.map ppelem l) ;;
+
let path_string_of (ctx,t) =
let len_ctx = List.length ctx in
let rec aux arity = function
| NCic.Const (NReference.Ref (u,_)) -> [Constant (u, arity)]
| NCic.Match _ -> [Dead]
in
- aux 0 t
+ let path = aux 0 t in
+(* prerr_endline (string_of_path path); *)
+ path
;;
let compare e1 e2 =
| e1,e2 -> Pervasives.compare e1 e2
;;
-let string_of_path l = String.concat "." (List.map ppelem l) ;;
end
projects / helm.git / blobdiff