open NTacStatus
module Ast = CicNotationPt
-let id_tac status = status;;
+let id_tac status = status ;;
+let print_tac message status = prerr_endline message; status ;;
let dot_tac status =
let new_gstatus =
let compare_statuses ~past ~present =
let _,_,past,_,_ = past.pstatus in
let _,_,present,_,_ = present.pstatus 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)
+ let closed =
+ List.map fst (List.filter (fun (i,_) -> not (List.mem_assoc i present)) past)
+ in
+ let opened =
+ List.map fst (List.filter (fun (i,_) -> not(List.mem_assoc i past)) present)
+ in
+ opened, closed
;;
distribute_tac (exec tac) [s]::G = (G1@...Gn)::G'
3) tac G = distribute_tac (exec tac) G if
tac = distribute_tac lowtac
+ 4) atomic_tac t === distribute_tac (exec t)
Note that executing an high tactic on a set of goals may be stronger
than executing the same tactic on those goals, but once at a time
debug_print (lazy ("context length " ^string_of_int (List.length g)));
let rec aux s go gc =
function
- | [] -> s, go, gc
+ | [] ->
+ debug_print (lazy "no selected goals");
+ s, go, gc
| loc :: loc_tl ->
debug_print (lazy "inner eval tactical");
let s, go, gc =
| Open n ->
let sn = tac s n in
let go', gc' = compare_statuses ~past:s ~present:sn in
- sn, (go @- gc') @+ go', gc @+ gc'
+ sn, ((go @+ [n]) @- gc') @+ go', gc @+ gc'
in
aux s go gc loc_tl
in
{ gstatus = stack; istatus = sn }
;;
+let atomic_tac htac = distribute_tac (exec htac) ;;
+
let exact t status goal =
let goalty = get_goalty status goal in
let status, t = disambiguate status t (Some goalty) (ctx_of goalty) in
else exact_tac ("",0,Ast.Appl (Ast.Implicit :: args))
;;
-let select ~where:(wanted,_,where) 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 goalty (wanted,path) in
- let status, instance =
- mk_meta status (ctx_of newgoalty) (`Decl newgoalty)
- in
- instantiate status goal instance
+let select0_tac ~where:(wanted,_,where) ~argsno =
+ 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 argsno goalty (wanted,path) in
+ let status, instance =
+ mk_meta status (ctx_of newgoalty) (`Decl newgoalty)
+ in
+ instantiate status goal instance)
;;
-let select0_tac ~where = distribute_tac (select ~where) ;;
-
-let select_tac ~where move_down_hyps =
+let select_tac ~where ~argsno move_down_hyps =
let (wanted,hyps,where) = GrafiteDisambiguate.disambiguate_npattern where in
let path =
match where with None -> NCic.Implicit `Term | Some where -> where in
if not move_down_hyps then
- select0_tac ~where:(wanted,hyps,Some path)
+ select0_tac ~where:(wanted,hyps,Some path) ~argsno
else
let path =
List.fold_left
in
block_tac [
generalize0_tac (List.map (fun (name,_) -> Ast.Ident (name,None)) hyps);
- select0_tac ~where:(wanted,[],Some path);
+ select0_tac ~where:(wanted,[],Some path) ~argsno;
clear_tac (List.map fst hyps) ]
;;
let path =
match where with None -> NCic.Implicit `Term | Some where -> where
in
- let status, newgoalty = select_term status goalty (wanted,path) in
+ let status, newgoalty = 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 apply_tac t = distribute_tac (apply t) ;;
let change_tac ~where ~with_what = distribute_tac (change ~where ~with_what) ;;
-let elim_tac ~what ~where status =
- block_tac
- [ select_tac ~where true;
- distribute_tac (fun status goal ->
- let goalty = get_goalty status goal in
- let goalsort = typeof status (ctx_of goalty) goalty in
+type indtyinfo = {
+ rightno: int;
+ leftno: int;
+ consno: int;
+ lefts: NCic.term list;
+ rights: NCic.term list;
+ reference: NReference.reference;
+ }
+;;
+
+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 ty_what = typeof status (ctx_of what) what in
+ let r,consno,lefts,rights = analyse_indty status ty_what in
+ let leftno = List.length rights in
+ let rightno = List.length rights in
+ indtyref := Some {
+ rightno = rightno; leftno = leftno; consno = consno;
+ lefts = lefts; rights = rights; reference = r;
+ };
+ prerr_endline "FO";
+ exec id_tac status goal)
+;;
+
+let force f s = Lazy.force f s;;
+
+let elim_tac ~what ~where =
+ 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 goalsort = typeof status (ctx_of goalty) goalty in
+ prerr_endline "XXXXXXXX";
+ sort := Some goalsort;
+ exec id_tac status goal)
+ in
+ atomic_tac (block_tac [
+ analyze_indty_tac ~what indtyinfo;
+ force (lazy (select_tac
+ ~where ~argsno:((HExtlib.unopt !indtyinfo).rightno+1) true));
+ print_tac "CIAO";
+ compute_goal_sort_tac;
+ print_tac "CIAO2";
+ force (lazy (
+ let sort = HExtlib.unopt !sort in
+ let ity = HExtlib.unopt !indtyinfo in
+ let NReference.Ref (uri, _) = ity.reference in
+ let name = NUri.name_of_uri uri ^
+ match term_of_cic_term sort (ctx_of sort) with
+ | NCic.Sort NCic.Prop -> "_ind"
+ | NCic.Sort _ -> "_rect"
+ | _ -> assert false
+ in
+ let holes =
+ HExtlib.mk_list Ast.Implicit (ity.leftno+1+ ity.consno + ity.rightno) in
+ let eliminator =
let _,_,w = what in
- let status, what =
- disambiguate status what None (ctx_of goalty) in
- let ty_what = typeof status (ctx_of what) what in
- let NReference.Ref (uri,_),consno,lefts,rights =
- analyse_indty status ty_what in
- let name = NUri.name_of_uri uri ^
- match term_of_cic_term goalsort (ctx_of goalsort) with
- NCic.Sort NCic.Prop -> "_ind"
- | NCic.Sort _ -> "_rect"
- | _ -> assert false in
- let leftno = List.length rights in
- let rightno = List.length rights in
- let holes=HExtlib.mk_list Ast.Implicit (leftno + 1 + consno + rightno) in
- let eliminator =
- Ast.Appl(Ast.Ident(name,None)::holes @ [ w ])
- in
- exec (apply_tac ("",0,eliminator)) status goal) ]
- status
+ Ast.Appl(Ast.Ident(name,None)::holes @ [ w ])
+ in
+ exact_tac ("",0,eliminator))) ])
;;
let rewrite_tac ~dir ~what:(_,_,what) ~where =
match dir with `LeftToRight -> "eq_elim_r" | `RightToLeft -> "eq_ind"
in
block_tac
- [ select_tac ~where true;
+ [ select_tac ~where ~argsno:2 true;
exact_tac
("",0,
Ast.Appl(Ast.Ident(name,None)::HExtlib.mk_list Ast.Implicit 5 @
;;
let cases_tac ~what ~where =
- block_tac [ select_tac ~where true ; distribute_tac (cases ~what) ]
+ let indtyinfo = ref None in
+ atomic_tac
+ (block_tac [
+ analyze_indty_tac ~what indtyinfo;
+ select_tac ~where ~argsno:((HExtlib.unopt !indtyinfo).rightno+1) true;
+ distribute_tac (cases ~what) ])
;;
let case1_tac name =
projects / helm.git / commitdiff