open Printf
-let debug = true
+let debug = false
let debug_print s = if debug then prerr_endline (Lazy.force s) else ()
open Continuationals.Stack
let id_tac status = status ;;
let print_tac print_status message status =
- if print_status then pp_tac_status status;
+ if print_status then pp_status status;
prerr_endline message;
status
;;
let dot_tac status =
- let new_gstatus =
- match status.gstatus with
+ let gstatus =
+ match status#stack with
| [] -> assert false
| ([], _, [], _) :: _ as stack ->
(* backward compatibility: do-nothing-dot *)
(([ loc ], t, k, tag) :: s)
| _ -> fail (lazy "can't use \".\" here")
in
- { status with gstatus = new_gstatus }
+ status#set_stack gstatus
;;
let branch_tac status =
- let new_gstatus =
- match status.gstatus with
+ let gstatus =
+ match status#stack with
| [] -> assert false
| (g, t, k, tag) :: s ->
match init_pos g with (* TODO *)
| loc :: loc_tl ->
([ loc ], [], [], `BranchTag) :: (loc_tl, t, k, tag) :: s
in
- { status with gstatus = new_gstatus }
+ status#set_stack gstatus
;;
let shift_tac status =
- let new_gstatus =
- match status.gstatus with
+ let gstatus =
+ match status#stack with
| (g, t, k, `BranchTag) :: (g', t', k', tag) :: s ->
(match g' with
| [] -> fail (lazy "no more goals to shift")
:: (loc_tl, t', k', tag) :: s))
| _ -> fail (lazy "can't shift goals here")
in
- { status with gstatus = new_gstatus }
+ status#set_stack gstatus
;;
let pos_tac i_s status =
- let new_gstatus =
- match status.gstatus with
+ let gstatus =
+ match status#stack with
| [] -> assert false
| ([ loc ], t, [],`BranchTag) :: (g', t', k', tag) :: s
when is_fresh loc ->
:: (([ loc ] @+ g') @- l_js, t', k', tag) :: s)
| _ -> fail (lazy "can't use relative positioning here")
in
- { status with gstatus = new_gstatus }
+ status#set_stack gstatus
;;
let wildcard_tac status =
- let new_gstatus =
- match status.gstatus with
+ let gstatus =
+ match status#stack with
| [] -> assert false
| ([ loc ] , t, [], `BranchTag) :: (g', t', k', tag) :: s
when is_fresh loc ->
(([loc] @+ g', t, [], `BranchTag) :: ([], t', k', tag) :: s)
| _ -> fail (lazy "can't use wildcard here")
in
- { status with gstatus = new_gstatus }
+ status#set_stack gstatus
;;
let merge_tac status =
- let new_gstatus =
- match status.gstatus with
+ let gstatus =
+ match status#stack with
| [] -> assert false
| (g, t, k,`BranchTag) :: (g', t', k', tag) :: s ->
((t @+ filter_open g @+ g' @+ k, t', k', tag) :: s)
| _ -> fail (lazy "can't merge goals here")
in
- { status with gstatus = new_gstatus }
+ status#set_stack gstatus
;;
let focus_tac gs status =
- let new_gstatus =
- match status.gstatus with
+ let gstatus =
+ match status#stack with
| [] -> assert false
| s -> assert(gs <> []);
let stack_locs =
gs;
(zero_pos gs, [], [], `FocusTag) :: deep_close gs s
in
- { status with gstatus = new_gstatus }
+ status#set_stack gstatus
;;
let unfocus_tac status =
- let new_gstatus =
- match status.gstatus with
+ let gstatus =
+ match status#stack with
| [] -> assert false
| ([], [], [], `FocusTag) :: s -> s
| _ -> fail (lazy "can't unfocus, some goals are still open")
in
- { status with gstatus = new_gstatus }
+ status#set_stack gstatus
;;
let skip_tac status =
- let new_gstatus =
- match status.gstatus with
+ let gstatus =
+ match status#stack with
| [] -> assert false
| (gl, t, k, tag) :: s ->
let gl = List.map switch_of_loc gl in
else
([],t,k,tag) :: s
in
- { status with gstatus = new_gstatus }
+ status#set_stack gstatus
;;
let block_tac l status =
List.fold_left (fun status tac -> tac status) status l
;;
+
let compare_statuses ~past ~present =
- let _,_,past,_,_ = past.pstatus in
- let _,_,present,_,_ = present.pstatus in
+ let _,_,past,_,_ = past#obj in
+ let _,_,present,_,_ = present#obj in
List.map fst (List.filter (fun (i,_) -> not(List.mem_assoc i past)) present),
List.map fst (List.filter (fun (i,_) -> not (List.mem_assoc i present)) past)
;;
(e.g. the tactic could perform a global analysis of the set of goals)
*)
-let exec tac low_status g =
+let exec tac (low_status : #lowtac_status) g =
let stack = [ [0,Open g], [], [], `NoTag ] in
- let status = tac { gstatus = stack ; istatus = low_status } in
- status.istatus
+ let status =
+ (new NTacStatus.status low_status#obj stack)#set_estatus low_status
+ in
+ let status = tac status in
+ (low_status#set_estatus status)#set_obj status#obj
;;
-let distribute_tac tac status =
- match status.gstatus with
+let distribute_tac tac (status : #tac_status) =
+ match status#stack with
| [] -> assert false
| (g, t, k, tag) :: s ->
debug_print (lazy ("context length " ^string_of_int (List.length g)));
in
aux s go gc loc_tl
in
- let s0, go0, gc0 = status.istatus, [], [] in
+ let s0 =
+ (new NTacStatus.status status#obj ())#set_estatus
+ (status :> NEstatus.status) in
+ let s0, go0, gc0 = s0, [], [] in
let sn, gon, gcn = aux s0 go0 gc0 g in
debug_print (lazy ("opened: "
^ String.concat " " (List.map string_of_int gon)));
let stack =
(zero_pos gon, t @~- gcn, k @~- gcn, tag) :: deep_close gcn s
in
- { gstatus = stack; istatus = sn }
+ ((status#set_stack stack)#set_obj(sn:>lowtac_status)#obj)#set_estatus sn
+;;
+
+let atomic_tac htac : #tac_status as 'a -> 'a = distribute_tac (exec htac) ;;
+
+let repeat_tac t s =
+ let rec repeat t (status : #tac_status as 'a) : 'a =
+ try repeat t (t status)
+ with NTacStatus.Error _ -> status
+ in
+ atomic_tac (repeat t) s
+;;
+
+
+let try_tac tac status =
+ try
+ tac status
+ with NTacStatus.Error _ ->
+ status
;;
-let atomic_tac htac = distribute_tac (exec htac) ;;
+let first_tac tacl status =
+ let res =
+ HExtlib.list_findopt
+ (fun tac _ -> try Some (tac status) with NTacStatus.Error _ -> None) tacl
+ in
+ match res with
+ | None -> fail (lazy "No tactics left")
+ | Some x -> x
+;;
-let exact_tac t = distribute_tac (fun status goal ->
+let exact_tac t : 's tactic = distribute_tac (fun status goal ->
let goalty = get_goalty status goal in
let status, t = disambiguate status t (Some goalty) (ctx_of goalty) in
instantiate status goal t)
;;
+let assumption_tac status = distribute_tac (fun status goal ->
+ let gty = get_goalty status goal in
+ let context = ctx_of gty in
+ let htac =
+ first_tac
+ (List.map (fun (name,_) -> exact_tac ("",0,(Ast.Ident (name,None))))
+ context)
+ in
+ exec htac status goal) status
+;;
+
let find_in_context name context =
let rec aux acc = function
| [] -> raise Not_found
fail (lazy ("hypothesis '" ^ name ^ "' not found")))
names
in
- let n,h,metasenv,subst,o = status.pstatus in
+ let n,h,metasenv,subst,o = status#obj in
let metasenv,subst,_ = NCicMetaSubst.restrict metasenv subst goal js in
- { status with pstatus = n,h,metasenv,subst,o })
+ status#set_obj (n,h,metasenv,subst,o))
;;
let generalize0_tac args =
if args = [] then id_tac
- else exact_tac ("",0,Ast.Appl (Ast.Implicit :: args))
+ else exact_tac ("",0,Ast.Appl (Ast.Implicit `JustOne :: 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 path =
match where with None -> NCic.Implicit `Term | Some where -> where
in
- let status, newgoalty =
- select_term status ~found ~postprocess goalty (wanted,path)
+ 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, newgoalty =
+ select_term status ~found ~postprocess goalty (wanted,path) in
+ (* WARNING: the next two lines simply change the context of newgoalty
+ from the old to the new one. Otherwise mk_meta will do that herself,
+ calling relocate that calls delift. However, newgoalty is now
+ ?[out_scope] and thus the delift would trigger the special unification
+ case, which is wrong now :-( *)
+ let status,newgoalty = term_of_cic_term status newgoalty (ctx_of goalty) in
+ let newgoalty = mk_cic_term newgoalctx newgoalty in
+
let status, instance =
- mk_meta status (ctx_of newgoalty) (`Decl newgoalty)
+ mk_meta status newgoalctx (`Decl newgoalty)
in
instantiate status goal instance)
;;
select_tac ~where ~job:(`Collect l) true;
print_tac true "ha selezionato?";
(fun s -> distribute_tac (fun status goal ->
- if !l = [] then fail (lazy "No term to generalize");
- let goalty = get_goalty status goal in
- let canon = List.hd !l in
- let status =
+ let goalty = get_goalty status goal in
+ let status,canon,rest =
+ match !l with
+ [] ->
+ (match where with
+ _,_,(None,_,_) -> fail (lazy "No term to generalize")
+ | txt,txtlen,(Some what,_,_) ->
+ let status, what =
+ disambiguate status (txt,txtlen,what) None (ctx_of goalty)
+ in
+ status,what,[]
+ )
+ | he::tl -> status,he,tl in
+ let status =
List.fold_left
- (fun s t -> unify s (ctx_of goalty) canon t) status (List.tl !l)
- in
- let status, canon = term_of_cic_term status canon (ctx_of goalty) in
- instantiate status goal
- (mk_cic_term (ctx_of goalty) (NCic.Appl [NCic.Implicit `Term ; canon ]))
+ (fun s t -> unify s (ctx_of goalty) canon t) status rest in
+ let status, canon = term_of_cic_term status canon (ctx_of goalty) in
+ instantiate status goal
+ (mk_cic_term (ctx_of goalty) (NCic.Appl [NCic.Implicit `Term ; canon ]))
) 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 reduce_tac ~reduction ~where =
+ let change status t =
+ match reduction with
+ | `Normalize perform_delta ->
+ normalize status
+ ?delta:(if perform_delta then None else Some max_int) (ctx_of t) t
+ | `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 ~what:(_,_,w) name =
+ block_tac [
+ select_tac ~where ~job:(`Substexpand 1) true;
+ exact_tac
+ ("",0,Ast.LetIn((Ast.Ident (name,None),None),w,Ast.Implicit `JustOne));
+ ]
;;
-let change_tac ~where ~with_what = distribute_tac (change ~where ~with_what) ;;
-let apply_tac = exact_tac;;
+let apply_tac (s,n,t) =
+ let t = Ast.Appl [t; Ast.Implicit `Vector] in
+ exact_tac (s,n,t)
+;;
type indtyinfo = {
rightno: int;
}
;;
-let analyze_indty_tac ~what indtyref = distribute_tac (fun status goal ->
+let analyze_indty_tac ~what indtyref =
+ distribute_tac (fun status goal ->
let goalty = get_goalty status goal in
let status, what = disambiguate status what None (ctx_of goalty) in
let status, ty_what = typeof status (ctx_of what) what in
let status, (r,consno,lefts,rights) = analyse_indty status ty_what in
- let leftno = List.length rights in
+ let leftno = List.length lefts in
let rightno = List.length rights in
indtyref := Some {
rightno = rightno; leftno = leftno; consno = consno;
exec id_tac status goal)
;;
-let elim_tac ~what ~where =
+let elim_tac ~what:(txt,len,what) ~where =
+ let what = txt, len, Ast.Appl [what; Ast.Implicit `Vector] in
let indtyinfo = ref None in
let sort = ref None in
let compute_goal_sort_tac = distribute_tac (fun status goal ->
let goalty = get_goalty status goal in
let status, goalsort = typeof status (ctx_of goalty) goalty in
+ let goalsort = fix_sorts goalsort in
sort := Some goalsort;
exec id_tac status goal)
in
let sort = HExtlib.unopt !sort in
let ity = HExtlib.unopt !indtyinfo in
let NReference.Ref (uri, _) = ity.reference in
- let istatus, sort = term_of_cic_term status.istatus sort (ctx_of sort) in
- let status = { status with istatus = istatus } in
+ let status, sort = term_of_cic_term status sort (ctx_of sort) in
let name = NUri.name_of_uri uri ^
match sort with
| NCic.Sort NCic.Prop -> "_ind"
- | NCic.Sort _ -> "_rect"
+ | NCic.Sort NCic.Type u ->
+ "_rect_" ^ NCicPp.ppterm ~metasenv:[] ~subst:[] ~context:[] sort
| _ -> assert false
in
- let holes =
- HExtlib.mk_list Ast.Implicit (ity.leftno+1+ ity.consno + ity.rightno) in
let eliminator =
let _,_,w = what in
- Ast.Appl(Ast.Ident(name,None)::holes @ [ w ])
+ Ast.Appl [ Ast.Ident (name,None) ; Ast.Implicit `Vector ; w ]
in
exact_tac ("",0,eliminator) status) ])
;;
-let rewrite_tac ~dir ~what:(_,_,what) ~where =
+let sort_of_goal_tac sortref = distribute_tac (fun status goal ->
+ let goalty = get_goalty status goal in
+ let status,sort = typeof status (ctx_of goalty) goalty in
+ let status,sort = term_of_cic_term status sort (ctx_of goalty) in
+ sortref := sort;
+ status)
+;;
+
+let rewrite_tac ~dir ~what:(_,_,what) ~where status =
+ let sortref = ref (NCic.Rel 1) in
+ let status = sort_of_goal_tac sortref status in
+ let suffix =
+ match !sortref with
+ | NCic.Sort NCic.Prop -> "_ind"
+ | NCic.Sort NCic.Type u ->
+ "_rect_" ^ NCicPp.ppterm ~metasenv:[] ~subst:[] ~context:[] !sortref
+ | _ -> assert false
+ in
let name =
- match dir with `LeftToRight -> "eq_elim_r" | `RightToLeft -> "eq_ind"
+ match dir with
+ `LeftToRight -> "eq" ^ suffix ^ "_r"
+ | `RightToLeft -> "eq" ^ suffix
in
block_tac
[ select_tac ~where ~job:(`Substexpand 1) true;
exact_tac
("",0,
- Ast.Appl(Ast.Ident(name,None)::HExtlib.mk_list Ast.Implicit 5 @
- [what]))]
+ Ast.Appl(Ast.Ident(name,None)::HExtlib.mk_list (Ast.Implicit `JustOne) 5@
+ [what]))] status
;;
let intro_tac name =
block_tac
[ exact_tac
("",0,(Ast.Binder (`Lambda,
- (Ast.Ident (name,None),None),Ast.Implicit)));
+ (Ast.Ident (name,None),None),Ast.Implicit `JustOne)));
if name = "_" then clear_tac [name] else id_tac ]
;;
instantiate status goal t
;;
-let cases_tac ~what ~where =
+let cases_tac ~what:(txt,len,what) ~where =
+ let what = txt, len, Ast.Appl [what; Ast.Implicit `Vector] in
let indtyinfo = ref None in
atomic_tac
(block_tac [
cases_tac
~where:("",0,(None,[],None))
~what:("",0,Ast.Ident (name,None));
- if name = "_clearme" then clear_tac ["_clearme"] else id_tac ]
+ if name = "_clearme" then clear_tac ["_clearme"] else id_tac ]
+;;
+
+let assert0_tac (hyps,concl) = distribute_tac (fun status goal ->
+ let gty = get_goalty status goal in
+ let eq status ctx t1 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
+ prerr_endline ("COMPARING: " ^ NCicPp.ppterm ~subst:[] ~metasenv:[] ~context:ctx t1 ^ " vs " ^ NCicPp.ppterm ~subst:[] ~metasenv:[] ~context:ctx t2);
+ assert (t1=t2);
+ status
+ in
+ let status,gty' = term_of_cic_term status gty (ctx_of gty) in
+ let status = eq status (ctx_of gty) concl gty' in
+ let status,_ =
+ List.fold_right2
+ (fun (id1,e1) ((id2,e2) as item) (status,ctx) ->
+ assert (id1=id2 || (prerr_endline (id1 ^ " vs " ^ id2); false));
+ match e1,e2 with
+ `Decl t1, NCic.Decl t2 ->
+ let status = eq status ctx t1 t2 in
+ status,item::ctx
+ | `Def (b1,t1), NCic.Def (b2,t2) ->
+ let status = eq status ctx t1 t2 in
+ let status = eq status ctx b1 b2 in
+ status,item::ctx
+ | _ -> assert false
+ ) hyps (ctx_of gty) (status,[])
+ in
+ exec id_tac status goal)
+;;
+
+let assert_tac seqs status =
+ match status#stack with
+ | [] -> assert false
+ | (g,_,_,_) :: s ->
+ assert (List.length g = List.length seqs);
+ (match seqs with
+ [] -> id_tac
+ | [seq] -> assert0_tac seq
+ | _ ->
+ block_tac
+ (branch_tac::
+ HExtlib.list_concat ~sep:[shift_tac]
+ (List.map (fun seq -> [assert0_tac seq]) seqs)@
+ [merge_tac])
+ ) status
;;
+
+let auto ~params:(l,_) status goal =
+ let gty = get_goalty status goal in
+ let n,h,metasenv,subst,o = status#obj in
+ let status,t = term_of_cic_term status gty (ctx_of gty) in
+ let status, l =
+ List.fold_left
+ (fun (status, l) t ->
+ let status, t = disambiguate status t None (ctx_of gty) in
+ let status, ty = typeof status (ctx_of t) t in
+ let status, t = term_of_cic_term status t (ctx_of gty) in
+ let status, ty = term_of_cic_term status ty (ctx_of ty) in
+ (status, (t,ty) :: l))
+ (status,[]) l
+ in
+ match
+ NCicParamod.nparamod status metasenv subst (ctx_of gty) (NCic.Rel ~-1,t) l
+ with
+ | [] -> raise (NTacStatus.Error (lazy "no proof found",None))
+ | (pt, metasenv, subst)::_ ->
+ let status = status#set_obj (n,h,metasenv,subst,o) in
+ instantiate status goal (NTacStatus.mk_cic_term (ctx_of gty) pt)
+;;
+
+let auto_tac ~params status =
+ distribute_tac (auto ~params) status
+;;
+