List.fold_left (fun status tac -> tac status) status l
;;
+
let compare_statuses ~past ~present =
let _,_,past,_,_ = past#obj in
let _,_,present,_,_ = present#obj in
((status#set_stack stack)#set_obj(sn:>lowtac_status)#obj)#set_estatus sn
;;
-let atomic_tac htac = distribute_tac (exec htac) ;;
+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
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,hyps,where) ~job =
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));
+ exact_tac
+ ("",0,Ast.LetIn((Ast.Ident (name,None),None),w,Ast.Implicit `JustOne));
]
;;
-let apply_tac = exact_tac;;
+let apply_tac (s,n,t) = exact_tac (s,n,Ast.Appl [t; Ast.Implicit `Vector]);;
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 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 [
distribute_tac (auto ~params) status
;;
-let rec repeat_tac t status =
- try repeat_tac t (atomic_tac t status)
- with NTacStatus.Error _ -> status
-;;