Function to map NCic.term to CicNotationPt.term finished.

[helm.git] / helm / software / components / ng_tactics / nTactics.ml

diff --git a/helm/software/components/ng_tactics/nTactics.ml b/helm/software/components/ng_tactics/nTactics.ml
index a384d54d56259f89952a7a14f8d013022cee568a..895d7c3f0666007e61a4b78f6c9d2b728d60eaa4 100644 (file)
--- a/helm/software/components/ng_tactics/nTactics.ml
+++ b/helm/software/components/ng_tactics/nTactics.ml
@@ -157,6 +157,7 @@ let block_tac l status =
   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 
@@ -228,7 +229,16 @@ let distribute_tac tac (status : #tac_status) =
        ((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
@@ -440,7 +450,7 @@ let analyze_indty_tac ~what indtyref = distribute_tac (fun status goal ->
   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;
@@ -471,7 +481,8 @@ let elim_tac ~what ~where =
      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 = 
@@ -483,16 +494,33 @@ let elim_tac ~what ~where =
      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]))]
+        [what]))] status
 ;;
 
 let intro_tac name =
@@ -613,3 +641,4 @@ let auto ~params:(l,_) status goal =
 let auto_tac ~params status =
   distribute_tac (auto ~params) status
 ;;
+