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 atomic_tac htac = distribute_tac (exec htac) ;;
let try_tac tac status =
try
;;
let first_tac tacl status =
- let res = HExtlib.list_findopt
- (fun tac _ ->
- try Some (tac status) with
- NTacStatus.Error _ -> None) tacl
+ let res =
+ HExtlib.list_findopt
+ (fun tac _ -> try Some (tac status) with NTacStatus.Error _ -> None) tacl
in
match res with
- | None -> raise (NTacStatus.Error (lazy("No tactic left")))
+ | 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 status goal =
+let assumption_tac status = distribute_tac (fun status goal ->
let gty = get_goalty status goal in
let context = ctx_of gty in
- let (htac:NTacStatus.tactic) =
- first_tac (List.map
- (fun (name,_) ->
- exact_tac ("",0,(Ast.Ident (name,None))))
- context)
+ let htac =
+ first_tac
+ (List.map (fun (name,_) -> exact_tac ("",0,(Ast.Ident (name,None))))
+ context)
in
- exec htac status goal
-;;
-
-let assumption_tac =
- distribute_tac assumption
+ exec htac status goal) status
;;
let find_in_context name context =
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,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 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;
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
+ HExtlib.mk_list (Ast.Implicit `JustOne)
+ (ity.leftno+1+ ity.consno + ity.rightno) in
let eliminator =
let _,_,w = what in
Ast.Appl(Ast.Ident(name,None)::holes @ [ w ])
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_elim_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 ]
;;
;;
let assert_tac seqs status =
- match status.gstatus with
+ match status#stack with
| [] -> assert false
| (g,_,_,_) :: s ->
assert (List.length g = List.length seqs);
let auto ~params:(l,_) status goal =
let gty = get_goalty status goal in
- let n,h,metasenv,subst,o = status.pstatus 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, 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
- let rdb = status.estatus in
- let pt, metasenv, subst =
- Paramod.nparamod rdb metasenv subst (ctx_of gty) (NCic.Rel ~-1,t) l
- in
- let status = { status with pstatus = n,h,metasenv,subst,o } in
- instantiate status goal (NTacStatus.mk_cic_term (ctx_of gty) pt)
+ 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
;;
+
projects / helm.git / blobdiff