X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fcomponents%2Fng_tactics%2FnTactics.ml;h=a6ae87be720456623a3aaf9da1adaaea7a7dbb9f;hb=b2a9b21233b1b7c645175e26fc3f3ab03a308c08;hp=b64ef34f2087457e50dd6330f85436ec70dbcb6b;hpb=b438322c4140e3d2395d693e9c5f0e96934436a0;p=helm.git

diff --git a/helm/software/components/ng_tactics/nTactics.ml b/helm/software/components/ng_tactics/nTactics.ml
index b64ef34f2..a6ae87be7 100644
--- 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 = 
@@ -156,13 +160,8 @@ let block_tac l status =
 let compare_statuses ~past ~present =
  let _,_,past,_,_ = past.pstatus in 
  let _,_,present,_,_ = present.pstatus in 
- 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
+ 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)
 ;;
 
 
@@ -225,14 +224,12 @@ let distribute_tac tac status =
 
 let atomic_tac htac = distribute_tac (exec htac) ;;
 
-let exact t status goal =
+let exact_tac t = 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
+ instantiate status goal t)
 ;;
 
-let exact_tac t = distribute_tac (exact t) ;;
-
 let find_in_context name context =
   let rec aux acc = function
     | [] -> raise Not_found
@@ -242,25 +239,22 @@ let find_in_context name context =
   aux 1 context
 ;;
 
-let clear names status goal =
- let goalty = get_goalty status goal in
- let js =
-   List.map 
+let clear_tac names =
+ if names = [] then id_tac
+ else
+  distribute_tac (fun status goal ->
+   let goalty = get_goalty status goal in
+   let js =
+     List.map 
      (fun name -> 
         try find_in_context name (ctx_of goalty)
         with Not_found -> 
           fail (lazy ("hypothesis '" ^ name ^ "' not found"))) 
      names
- in
- let n,h,metasenv,subst,o = status.pstatus in
- let metasenv,subst,_ = NCicMetaSubst.restrict metasenv subst goal js in
-  { status with pstatus = n,h,metasenv,subst,o }
-;;
-
-let force f s = Lazy.force f s;;
-
-let clear_tac names =
- if names = [] then id_tac else distribute_tac (clear names)
+   in
+   let n,h,metasenv,subst,o = status.pstatus in
+   let metasenv,subst,_ = NCicMetaSubst.restrict metasenv subst goal js in
+    { status with pstatus = n,h,metasenv,subst,o })
 ;;
 
 let generalize0_tac args =
@@ -268,11 +262,12 @@ let generalize0_tac args =
  else exact_tac ("",0,Ast.Appl (Ast.Implicit :: args))
 ;;
 
-let select0_tac ~where:(wanted,_,where) ~job  =
+let select0_tac ~where:(wanted,hyps,where) ~job  =
  let found, postprocess = 
    match job with
    | `Substexpand argsno -> mk_in_scope, mk_out_scope argsno
    | `Collect l -> (fun s t -> l := t::!l; mk_in_scope s t), mk_out_scope 1
+   | `ChangeWith f -> f,(fun s t -> s, t)
  in
  distribute_tac (fun status goal ->
    let goalty = get_goalty status goal in
@@ -282,8 +277,30 @@ let select0_tac ~where:(wanted,_,where) ~job  =
    let status, newgoalty = 
      select_term status ~found ~postprocess goalty (wanted,path) 
    in
+   let status, newgoalctx =
+      List.fold_right
+       (fun (name,d as entry) (status,ctx) ->
+         try
+          let path = List.assoc name hyps in
+           match d with
+              NCic.Decl ty ->
+               let status,ty =
+                select_term status ~found ~postprocess (mk_cic_term ctx ty)
+                 (wanted,path) in
+               let status,ty = term_of_cic_term status ty ctx in
+                status,(name,NCic.Decl ty)::ctx
+            | NCic.Def (bo,ty) ->
+               let status,bo =
+                select_term status ~found ~postprocess (mk_cic_term ctx bo)
+                 (wanted,path) in
+               let status,bo = term_of_cic_term status bo ctx in
+                status,(name,NCic.Def (bo,ty))::ctx
+         with
+          Not_found -> status, entry::ctx
+       ) (ctx_of goalty) (status,[])
+   in
    let status, instance = 
-     mk_meta status (ctx_of newgoalty) (`Decl newgoalty) 
+     mk_meta status newgoalctx (`Decl newgoalty) 
    in
    instantiate status goal instance)
 ;;
@@ -310,66 +327,43 @@ 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
-     (* unift (ctx_of goal) t s *)
+     let canon = List.hd !l in
+     let status = 
+       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 (List.hd !l) (ctx_of goalty) ]))
-   ))) ]
+      (mk_cic_term (ctx_of goalty) (NCic.Appl [NCic.Implicit `Term ; canon ]))
+   ) s) ]
 ;;
 
-
-let reopen status =
- let n,h,metasenv,subst,o = status.pstatus in
- let subst, newm = 
-   List.partition 
-    (function (_,(Some tag,_,_,_)) -> 
-            tag <> NCicMetaSubst.in_scope_tag && 
-            not (NCicMetaSubst.is_out_scope_tag tag)
-    | _ -> true)
-    subst 
- in
- let in_m, out_m = 
-   List.partition
-     (function (_,(Some tag,_,_,_)) -> 
-         tag = NCicMetaSubst.in_scope_tag | _ -> assert false)
-     newm
- in
- let metasenv = List.map (fun (i,(_,c,_,t)) -> i,(None,c,t)) in_m @ metasenv in
- let in_m = List.map fst in_m in
- let out_m = match out_m with [i] -> i | _ -> assert false in
- { status with pstatus = n,h,metasenv,subst,o }, in_m, out_m 
+let eval_tac ~reduction ~where =
+  let change status t = 
+    match reduction with
+    | `Whd perform_delta -> 
+         whd status
+           ?delta:(if perform_delta then None else Some max_int) (ctx_of t) t
+  in
+  let where = GrafiteDisambiguate.disambiguate_npattern where in
+  select0_tac ~where ~job:(`ChangeWith change)
 ;;
 
-let change ~where ~with_what status goal =
- let goalty = get_goalty status goal in
- let (wanted,_,where) = GrafiteDisambiguate.disambiguate_npattern where in
- let path = 
-   match where with None -> NCic.Implicit `Term | Some where -> where 
- in
- let status, newgoalty = assert false (*
-   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 j,(n,cctx,bo,_) = out_scope in
- let _ = typeof status (ctx_of goalty) (Obj.magic (n,cctx,bo))  in
-
- let n,h,metasenv,subst,o = status.pstatus in
- let subst = out_scope :: subst in
- let status = { status with pstatus = n,h,metasenv,subst,o } in
-
- let status, instance = 
-   mk_meta status (ctx_of newgoalty) (`Decl newgoalty) 
- in
- instantiate status goal instance
+let change_tac ~where ~with_what =
+  let change status t = 
+    let status, ww = disambiguate status with_what  None (ctx_of t) in
+    let status = unify status (ctx_of t) t ww in
+    status, ww
+  in
+  let where = GrafiteDisambiguate.disambiguate_npattern where in
+  select0_tac ~where ~job:(`ChangeWith change)
 ;;
 
-let apply t status goal = exact t status goal;;
-
-let apply_tac t = distribute_tac (apply t) ;;
-let change_tac ~where ~with_what = distribute_tac (change ~where ~with_what) ;;
+let apply_tac = exact_tac;;
 
 type indtyinfo = {
         rightno: int;
@@ -384,15 +378,14 @@ 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 { 
     rightno = rightno; leftno = leftno; consno = consno;
     lefts = lefts; rights = rights; reference = r;
   };
-  prerr_endline "FO";
   exec id_tac status goal)
 ;;
 
@@ -401,24 +394,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
-    prerr_endline "XXXXXXXX";
+    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));
-    print_tac "CIAO";
+    (fun s -> select_tac 
+      ~where ~job:(`Substexpand ((HExtlib.unopt !indtyinfo).rightno+1)) true s);
     compute_goal_sort_tac;
-    print_tac "CIAO2";
-    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 
@@ -429,7 +421,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 =
@@ -437,7 +429,7 @@ let rewrite_tac ~dir ~what:(_,_,what) ~where =
   match dir with `LeftToRight -> "eq_elim_r" | `RightToLeft -> "eq_ind"
  in
   block_tac
-   [ select_tac ~where ~job:(`Substexpand 2) true;
+   [ select_tac ~where ~job:(`Substexpand 1) true;
      exact_tac
       ("",0,
        Ast.Appl(Ast.Ident(name,None)::HExtlib.mk_list Ast.Implicit 5 @
@@ -447,18 +439,19 @@ let rewrite_tac ~dir ~what:(_,_,what) ~where =
 let intro_tac name =
  block_tac
   [ exact_tac
-    ("",0,(Ast.Binder (`Lambda,
-     (Ast.Ident (name,None),None),Ast.Implicit)));
-     if name = "_" then clear_tac [name] else id_tac ]
+     ("",0,(Ast.Binder (`Lambda,
+      (Ast.Ident (name,None),None),Ast.Implicit)));
+    if name = "_" then clear_tac [name] else id_tac ]
 ;;
 
 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
@@ -471,8 +464,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) ])
 ;;