- generalize 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 a2042dda6d2ce6d40d491f2512f96b0714c61dea..e1fed4deb4e4ee6fbde406b7a796045d9412e1fb 100644 (file)
--- a/helm/software/components/ng_tactics/nTactics.ml
+++ b/helm/software/components/ng_tactics/nTactics.ml
@@ -21,7 +21,11 @@ open NTacStatus
 module Ast = CicNotationPt
 
 let id_tac status = status ;;
-let print_tac message status = prerr_endline message; status ;;
+let print_tac print_status message status = 
+  if print_status then pp_tac_status status;
+  prerr_endline message; 
+  status
+;;
 
 let dot_tac status =
   let new_gstatus = 
@@ -253,8 +257,6 @@ let clear_tac names =
     { status with pstatus = n,h,metasenv,subst,o })
 ;;
 
-let force f s = Lazy.force f s;;
-
 let generalize0_tac args =
  if args = [] then id_tac
  else exact_tac ("",0,Ast.Appl (Ast.Implicit :: args))
@@ -302,7 +304,8 @@ let generalize_tac ~where =
  let l = ref [] in
  block_tac [ 
    select_tac ~where ~job:(`Collect l) true; 
-   force (lazy (distribute_tac (fun status goal ->
+   print_tac true "ha selezionato?";
+   (fun s -> distribute_tac (fun status goal ->
      if !l = [] then fail (lazy "No term to generalize");
      let goalty = get_goalty status goal in
      let canon = List.hd !l in
@@ -310,10 +313,10 @@ let generalize_tac ~where =
        List.fold_left 
          (fun s t -> unify s (ctx_of goalty) canon t) status (List.tl !l)
      in
+     let status, canon = term_of_cic_term status canon (ctx_of goalty) in
      instantiate status goal 
-       (mk_cic_term (ctx_of goalty) (NCic.Appl [NCic.Implicit `Term ; 
-         term_of_cic_term canon (ctx_of goalty) ]))
-   ))) ]
+      (mk_cic_term (ctx_of goalty) (NCic.Appl [NCic.Implicit `Term ; canon ]))
+   ) s) ]
 ;;
 
 
@@ -381,8 +384,8 @@ type indtyinfo = {
 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 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 rightno = List.length rights in
   indtyref := Some { 
@@ -397,21 +400,23 @@ let elim_tac ~what ~where =
   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
+    let status, goalsort = typeof status (ctx_of goalty) goalty in
     sort := Some goalsort;
     exec id_tac status goal)
   in
   atomic_tac (block_tac [
     analyze_indty_tac ~what indtyinfo;    
-    force (lazy (select_tac 
-      ~where ~job:(`Substexpand ((HExtlib.unopt !indtyinfo).rightno+1)) true));
+    (fun s -> select_tac 
+      ~where ~job:(`Substexpand ((HExtlib.unopt !indtyinfo).rightno+1)) true s);
     compute_goal_sort_tac;
-    force (lazy (
+    (fun status ->
      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 name = NUri.name_of_uri uri ^
-      match term_of_cic_term sort (ctx_of sort) with
+      match sort with
        | NCic.Sort NCic.Prop -> "_ind"
        | NCic.Sort _ -> "_rect"
        | _ -> assert false 
@@ -422,7 +427,7 @@ let elim_tac ~what ~where =
        let _,_,w = what in
        Ast.Appl(Ast.Ident(name,None)::holes @ [ w ])
      in
-     exact_tac ("",0,eliminator))) ]) 
+     exact_tac ("",0,eliminator) status) ]) 
 ;;
 
 let rewrite_tac ~dir ~what:(_,_,what) ~where =
@@ -448,10 +453,11 @@ let intro_tac name =
 let cases ~what status goal =
  let gty = get_goalty status goal in
  let status, what = disambiguate status what None (ctx_of gty) in
- let ty = typeof status (ctx_of what) what in
- let ref, consno, _, _ = analyse_indty status ty in
+ let status, ty = typeof status (ctx_of what) what in
+ let status, (ref, consno, _, _) = analyse_indty status ty in
+ let status, what = term_of_cic_term status what (ctx_of gty) in
  let t =
-  NCic.Match (ref,NCic.Implicit `Term, term_of_cic_term what (ctx_of gty),
+  NCic.Match (ref,NCic.Implicit `Term, what,
     HExtlib.mk_list (NCic.Implicit `Term) consno)
  in
  let ctx = ctx_of gty in
@@ -464,8 +470,8 @@ let cases_tac ~what ~where =
   atomic_tac 
    (block_tac [
       analyze_indty_tac ~what indtyinfo;
-      force (lazy (select_tac 
-        ~where ~job:(`Substexpand ((HExtlib.unopt !indtyinfo).rightno+1))true));
+      (fun s -> select_tac 
+       ~where ~job:(`Substexpand ((HExtlib.unopt !indtyinfo).rightno+1))true s);
       distribute_tac (cases ~what) ])
 ;;