X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_tactics%2FnTactics.ml;h=366a9fe16f61ce3666767bec64cc3985ee69e648;hb=8e905c34eb47a3f5fa67afa7997576d57588a50f;hp=0030fd75abec375ef1cc06b0ab8d0da0c7206969;hpb=5366f90df289f2ab2bd97c68643198f54ad2d2ac;p=helm.git

diff --git a/helm/software/components/ng_tactics/nTactics.ml b/helm/software/components/ng_tactics/nTactics.ml
index 0030fd75a..366a9fe16 100644
--- a/helm/software/components/ng_tactics/nTactics.ml
+++ b/helm/software/components/ng_tactics/nTactics.ml
@@ -87,6 +87,26 @@ let pos_tac i_s status =
    status#set_stack gstatus
 ;;
 
+let case_tac lab status =
+  let gstatus = 
+    match status#stack with
+    | [] -> assert false
+    | ([ loc ], t, [],`BranchTag) :: (g', t', k', tag) :: s
+      when is_fresh loc ->
+        let l_js =
+          List.filter 
+           (fun curloc -> 
+              let _,_,metasenv,_,_ = status#obj in
+              match NCicUtils.lookup_meta (goal_of_loc curloc) metasenv with
+                  attrs,_,_ when List.mem (`Name lab) attrs -> true
+                | _ -> false) ([loc] @+ g') in
+          ((l_js, t , [],`BranchTag)
+           :: (([ loc ] @+ g') @- l_js, t', k', tag) :: s)
+    | _ -> fail (lazy "can't use relative positioning here")
+  in
+   status#set_stack gstatus
+;;
+
 let wildcard_tac status =
   let gstatus = 
     match status#stack with
@@ -133,8 +153,9 @@ let unfocus_tac status =
   let gstatus = 
     match status#stack with
     | [] -> assert false
-    | ([], [], [], `FocusTag) :: s -> s
-    | _ -> fail (lazy "can't unfocus, some goals are still open")
+    | (g, [], [], `FocusTag) :: s when filter_open g = [] -> s
+    | _ as s -> fail (lazy ("can't unfocus, some goals are still open:\n"^
+      Continuationals.Stack.pp s))
   in
    status#set_stack gstatus
 ;;
@@ -214,9 +235,7 @@ let distribute_tac tac (status : #tac_status) =
             in
             aux s go gc loc_tl
       in
-      let s0 =
-       (new NTacStatus.status status#obj ())#set_estatus
-        (status :> NEstatus.status) in
+      let s0 = (new NTacStatus.status status#obj ())#set_estatus status in
       let s0, go0, gc0 = s0, [], [] in
       let sn, gon, gcn = aux s0 go0 gc0 g in
       debug_print (lazy ("opened: "
@@ -402,6 +421,19 @@ let generalize_tac ~where =
    ) s) ]
 ;;
 
+let cut_tac t = 
+ block_tac [ 
+  exact_tac ("",0, Ast.Appl [Ast.Implicit `JustOne; Ast.Implicit `JustOne]);
+  branch_tac;
+   pos_tac [2]; exact_tac t;
+   shift_tac; pos_tac [1]; skip_tac;
+  merge_tac ]
+;;
+
+let lapply_tac (s,n,t) = 
+ exact_tac (s,n, Ast.Appl [Ast.Implicit `JustOne; t])
+;;
+
 let reduce_tac ~reduction ~where =
   let change status t = 
     match reduction with
@@ -434,7 +466,10 @@ let letin_tac ~where ~what:(_,_,w) name =
  ]
 ;;
 
-let apply_tac (s,n,t) = exact_tac (s,n,Ast.Appl [t; Ast.Implicit `Vector]);;
+let apply_tac (s,n,t) = 
+  let t = Ast.Appl [t; Ast.Implicit `Vector] in
+  exact_tac (s,n,t)
+;;
 
 type indtyinfo = {
         rightno: int;
@@ -461,33 +496,31 @@ let analyze_indty_tac ~what indtyref =
   exec id_tac status goal)
 ;;
 
+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 sort = fix_sorts sort in
+  let status, sort = term_of_cic_term status sort (ctx_of goalty) in
+   sortref := sort;
+   status)
+;;
+
 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 = ref (NCic.Rel 1) in
   atomic_tac (block_tac [
     analyze_indty_tac ~what indtyinfo;    
     (fun s -> select_tac 
       ~where ~job:(`Substexpand ((HExtlib.unopt !indtyinfo).rightno+1)) true s);
-    compute_goal_sort_tac;
+    sort_of_goal_tac sort;
     (fun status ->
-     let sort = HExtlib.unopt !sort in
      let ity = HExtlib.unopt !indtyinfo in
      let NReference.Ref (uri, _) = ity.reference 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 NCic.Type u ->
-          "_rect_" ^ NCicPp.ppterm ~metasenv:[] ~subst:[] ~context:[] sort
-       | _ -> assert false 
+     let name = 
+       NUri.name_of_uri uri ^ "_" ^
+        snd (NCicElim.ast_of_sort 
+          (match !sort with NCic.Sort x -> x | _ -> assert false))
      in
      let eliminator = 
        let _,_,w = what in
@@ -496,23 +529,11 @@ let elim_tac ~what:(txt,len,what) ~where =
      exact_tac ("",0,eliminator) status) ]) 
 ;;
 
-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 
+ let suffix = "_" ^ snd (NCicElim.ast_of_sort 
+   (match !sortref with NCic.Sort x -> x | _ -> assert false))
  in
  let name =
   match dir with
@@ -570,6 +591,21 @@ let case1_tac name =
              if name = "_clearme" then clear_tac ["_clearme"] else id_tac ]
 ;;
 
+let constructor ?(num=1) ~args status goal = 
+  if num < 1 then fail (lazy "constructor numbers begin with 1");
+  let gty = get_goalty status goal in
+  let status, (r,_,_,_) = analyse_indty status gty in
+  let ref = NReference.mk_constructor num r in
+  let t = 
+    if args = [] then Ast.NRef ref else
+    Ast.Appl (HExtlib.list_concat ~sep:[Ast.Implicit `Vector]
+      ([Ast.NRef ref] :: List.map (fun _,_,x -> [x]) args))
+  in
+  exec (apply_tac ("",0,t)) status goal
+;;
+
+let constructor_tac ?num ~args = distribute_tac (constructor ?num ~args);;
+
 let assert0_tac (hyps,concl) = distribute_tac (fun status goal ->
  let gty = get_goalty status goal in
  let eq status ctx t1 t2 =
@@ -620,30 +656,3 @@ let assert_tac seqs status =
      ) 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
-;;
-