else exact_tac ("",0,Ast.Appl (Ast.Implicit :: args))
;;
-let select0_tac ~where:(wanted,_,where) ~job =
+let select0_tac ~where:(wanted,hyps,where) ~job =
let found, postprocess =
match job with
| `Substexpand argsno -> mk_in_scope, mk_out_scope argsno
| `Collect l -> (fun s t -> l := t::!l; mk_in_scope s t), mk_out_scope 1
+ | `ChangeWith f -> f,(fun s t -> s, t)
in
distribute_tac (fun status goal ->
let goalty = get_goalty status goal in
let status, newgoalty =
select_term status ~found ~postprocess goalty (wanted,path)
in
+ let status, newgoalctx =
+ List.fold_right
+ (fun (name,d as entry) (status,ctx) ->
+ try
+ let path = List.assoc name hyps in
+ match d with
+ NCic.Decl ty ->
+ let status,ty =
+ select_term status ~found ~postprocess (mk_cic_term ctx ty)
+ (wanted,path) in
+ let status,ty = term_of_cic_term status ty ctx in
+ status,(name,NCic.Decl ty)::ctx
+ | NCic.Def (bo,ty) ->
+ let status,bo =
+ select_term status ~found ~postprocess (mk_cic_term ctx bo)
+ (wanted,path) in
+ let status,bo = term_of_cic_term status bo ctx in
+ status,(name,NCic.Def (bo,ty))::ctx
+ with
+ Not_found -> status, entry::ctx
+ ) (ctx_of goalty) (status,[])
+ in
let status, instance =
- mk_meta status (ctx_of newgoalty) (`Decl newgoalty)
+ mk_meta status newgoalctx (`Decl newgoalty)
in
instantiate status goal instance)
;;
) s) ]
;;
-
-let reopen status =
- let n,h,metasenv,subst,o = status.pstatus in
- let subst, newm =
- List.partition
- (function (_,(Some tag,_,_,_)) ->
- tag <> NCicMetaSubst.in_scope_tag &&
- not (NCicMetaSubst.is_out_scope_tag tag)
- | _ -> true)
- subst
- in
- let in_m, out_m =
- List.partition
- (function (_,(Some tag,_,_,_)) ->
- tag = NCicMetaSubst.in_scope_tag | _ -> assert false)
- newm
- in
- let metasenv = List.map (fun (i,(_,c,_,t)) -> i,(None,c,t)) in_m @ metasenv in
- let in_m = List.map fst in_m in
- let out_m = match out_m with [i] -> i | _ -> assert false in
- { status with pstatus = n,h,metasenv,subst,o }, in_m, out_m
+let eval_tac ~reduction ~where =
+ let change status t =
+ match reduction with
+ | `Whd perform_delta ->
+ whd status
+ ?delta:(if perform_delta then None else Some max_int) (ctx_of t) t
+ in
+ let where = GrafiteDisambiguate.disambiguate_npattern where in
+ select0_tac ~where ~job:(`ChangeWith change)
;;
-let change ~where ~with_what status goal =
-assert false; (*
- let goalty = get_goalty status goal in
- let (wanted,_,where) = GrafiteDisambiguate.disambiguate_npattern where in
- let path =
- match where with None -> NCic.Implicit `Term | Some where -> where
- in
- let status, newgoalty = assert false (*
- select_term status 1 goalty (wanted,path)*) in
- let status, in_scope, out_scope = reopen status in
- let status = List.fold_left (exact with_what) status in_scope in
-
- let j,(n,cctx,bo,_) = out_scope in
- let _ = typeof status (ctx_of goalty) (Obj.magic (n,cctx,bo)) in
-
- let n,h,metasenv,subst,o = status.pstatus in
- let subst = out_scope :: subst in
- let status = { status with pstatus = n,h,metasenv,subst,o } in
+let change_tac ~where ~with_what =
+ let change status t =
+ let status, ww = disambiguate status with_what None (ctx_of t) in
+ let status = unify status (ctx_of t) t ww in
+ status, ww
+ in
+ let where = GrafiteDisambiguate.disambiguate_npattern where in
+ select0_tac ~where ~job:(`ChangeWith change)
+;;
- let status, instance =
- mk_meta status (ctx_of newgoalty) (`Decl newgoalty)
- in
- instantiate status goal instance
-*)
+let letin_tac ~where:(_,_,(m,hyp,gp)) ~what:(_,_,w) name =
+ assert(m = None);
+ let where = Some w, [],
+ match gp with
+ | None -> Some Ast.Implicit
+ | Some where ->
+ Some
+ (List.fold_left
+ (fun t _ ->
+ Ast.Binder(`Pi,(Ast.Ident("_",None),Some Ast.UserInput),t))
+ where hyp)
+ in
+ block_tac [
+ generalize0_tac (List.map (fun (name,_) -> Ast.Ident (name,None)) hyp);
+ exact_tac ("",0,Ast.LetIn((Ast.Ident (name,None),None),w,Ast.Implicit));
+ change_tac ~where:("",0,where) ~with_what:("",0,Ast.Ident (name,None))
+ ]
;;
-let change_tac ~where ~with_what = distribute_tac (change ~where ~with_what) ;;
let apply_tac = exact_tac;;
~what:("",0,Ast.Ident (name,None));
if name = "_clearme" then clear_tac ["_clearme"] else id_tac ]
;;
+
+let assert_tac (hyps,concl) = distribute_tac (fun status goal ->
+ let gty = get_goalty status goal in
+ let status,concl = disambiguate status concl None (ctx_of gty) in
+ let status,concl = term_of_cic_term status concl (ctx_of gty) in
+ let status,gty' = term_of_cic_term status gty (ctx_of gty) in
+ assert (concl=gty');
+ let status,_ =
+ List.fold_right2
+ (fun (id1,e1) ((id2,e2) as item) (status,ctx) ->
+ assert (id1=id2);
+ match e1,e2 with
+ `Decl t1, NCic.Decl t2 ->
+ let status,t1 = disambiguate status t1 None ctx in
+ let status,t1 = apply_subst status ctx t1 in
+ let status,t1 = term_of_cic_term status t1 ctx in
+ let t2 = mk_cic_term ctx t2 in
+ let status,t2 = apply_subst status ctx t2 in
+ let status,t2 = term_of_cic_term status t2 ctx in
+ assert (t1=t2);
+ status,item::ctx
+ | `Def (b1,t1), NCic.Def (b2,t2) ->
+ let status,t1 = disambiguate status t1 None ctx in
+ let status,t1 = apply_subst status ctx t1 in
+ let status,t1 = term_of_cic_term status t1 ctx in
+ let status,b1 = disambiguate status b1 None ctx in
+ let status,b1 = apply_subst status ctx b1 in
+ let status,b1 = term_of_cic_term status b1 ctx in
+ let t2 = mk_cic_term ctx t2 in
+ let status,t2 = apply_subst status ctx t2 in
+ let status,t2 = term_of_cic_term status t2 ctx in
+ let b2 = mk_cic_term ctx b2 in
+ let status,b2 = apply_subst status ctx b2 in
+ let status,b2 = term_of_cic_term status b2 ctx in
+ assert (t1=t2 && b1=b2);
+ status,item::ctx
+ | _ -> assert false
+ ) hyps (ctx_of gty) (status,[])
+ in
+ exec id_tac status goal)
+;;
projects / helm.git / blobdiff