X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_tactics%2FnTactics.ml;h=147df78f857f8be9979772a154a3d1c26af10a39;hb=4ae7d510a430a2a6929f973d36b993d528772d64;hp=e1fed4deb4e4ee6fbde406b7a796045d9412e1fb;hpb=aefcb5f4e531c0318b7f495956c28eab971a4aa1;p=helm.git

diff --git a/helm/software/components/ng_tactics/nTactics.ml b/helm/software/components/ng_tactics/nTactics.ml
index e1fed4deb..147df78f8 100644
--- a/helm/software/components/ng_tactics/nTactics.ml
+++ b/helm/software/components/ng_tactics/nTactics.ml
@@ -262,22 +262,52 @@ 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
    let path = 
      match where with None -> NCic.Implicit `Term | Some where -> where 
    in
-   let status, newgoalty = 
-     select_term status ~found ~postprocess goalty (wanted,path) 
+   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, newgoalty = 
+     select_term status ~found ~postprocess goalty (wanted,path) in
+   (* WARNING: the next two lines simply change the context of newgoalty
+      from the old to the new one. Otherwise mk_meta will do that herself,
+      calling relocate that calls delift. However, newgoalty is now
+      ?[out_scope] and thus the delift would trigger the special unification
+      case, which is wrong now :-( *)
+   let status,newgoalty = term_of_cic_term status newgoalty (ctx_of goalty) in
+   let newgoalty = mk_cic_term newgoalctx newgoalty in
+
    let status, instance = 
-     mk_meta status (ctx_of newgoalty) (`Decl newgoalty) 
+     mk_meta status newgoalctx (`Decl newgoalty) 
    in
    instantiate status goal instance)
 ;;
@@ -306,68 +336,58 @@ let generalize_tac ~where =
    select_tac ~where ~job:(`Collect l) true; 
    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
-     let status = 
+      let goalty = get_goalty status goal in
+      let status,canon,rest =
+       match !l with
+          [] ->
+           (match where with
+               _,_,(None,_,_)  -> fail (lazy "No term to generalize")
+             | txt,txtlen,(Some what,_,_) ->
+                let status, what =
+                 disambiguate status (txt,txtlen,what) None (ctx_of goalty)
+                in
+                 status,what,[]
+           )
+        | he::tl -> status,he,tl 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 ; canon ]))
+         (fun s t -> unify s (ctx_of goalty) canon t) status rest 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 ; 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 reduce_tac ~reduction ~where =
+  let change status t = 
+    match reduction with
+    | `Normalize perform_delta ->
+        normalize status
+         ?delta:(if perform_delta then None else Some max_int) (ctx_of t) t
+    | `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 =
-assert false; (*
- 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 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 status, instance = 
-   mk_meta status (ctx_of newgoalty) (`Decl newgoalty) 
- in
- instantiate status goal instance
-*)
+let letin_tac ~where ~what:(_,_,w) name =
+ block_tac [
+  select_tac ~where ~job:(`Substexpand 1) true;
+  exact_tac ("",0,Ast.LetIn((Ast.Ident (name,None),None),w,Ast.Implicit));
+ ]
 ;;
-let change_tac ~where ~with_what = distribute_tac (change ~where ~with_what) ;;
 
 let apply_tac = exact_tac;;
 
@@ -481,5 +501,77 @@ let case1_tac name =
              cases_tac 
               ~where:("",0,(None,[],None)) 
               ~what:("",0,Ast.Ident (name,None));
-              if name = "_clearme" then clear_tac ["_clearme"] else id_tac ]
+             if name = "_clearme" then clear_tac ["_clearme"] else id_tac ]
+;;
+
+let assert0_tac (hyps,concl) = distribute_tac (fun status goal ->
+ let gty = get_goalty status goal in
+ let eq status ctx t1 t2 =
+  let status,t1 = disambiguate status t1 None ctx in
+  let status,t1 = apply_subst status ctx t1 in
+  let status,t1 = term_of_cic_term status t1 ctx in
+  let t2 = mk_cic_term ctx t2 in
+  let status,t2 = apply_subst status ctx t2 in
+  let status,t2 = term_of_cic_term status t2 ctx in
+  prerr_endline ("COMPARING: " ^ NCicPp.ppterm ~subst:[] ~metasenv:[] ~context:ctx t1 ^ " vs " ^ NCicPp.ppterm ~subst:[] ~metasenv:[] ~context:ctx t2);
+  assert (t1=t2);
+  status
+ in
+ let status,gty' = term_of_cic_term status gty (ctx_of gty) in
+ let status = eq status (ctx_of gty) concl gty' in
+ let status,_ =
+  List.fold_right2
+   (fun (id1,e1) ((id2,e2) as item) (status,ctx) ->
+     assert (id1=id2 || (prerr_endline (id1 ^ " vs " ^ id2); false));
+     match e1,e2 with
+        `Decl t1, NCic.Decl t2 ->
+          let status = eq status ctx t1 t2 in
+          status,item::ctx
+      | `Def (b1,t1), NCic.Def (b2,t2) ->
+          let status = eq status ctx t1 t2 in
+          let status = eq status ctx b1 b2 in
+          status,item::ctx
+      | _ -> assert false
+   ) hyps (ctx_of gty) (status,[])
+ in
+  exec id_tac status goal)
+;;
+
+let assert_tac seqs status =
+ match status.gstatus with
+  | [] -> assert false
+  | (g,_,_,_) :: s ->
+     assert (List.length g = List.length seqs);
+     (match seqs with
+         [] -> id_tac
+       | [seq] -> assert0_tac seq
+       | _ ->
+         block_tac
+          (branch_tac::
+          HExtlib.list_concat ~sep:[shift_tac]
+            (List.map (fun seq -> [assert0_tac seq]) seqs)@
+          [merge_tac])
+     ) status
+;;
+
+let auto ~params:(l,_) status goal =
+  let gty = get_goalty status goal in
+  let n,h,metasenv,subst,o = status.pstatus 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
+  Paramod.nparamod metasenv subst (ctx_of gty) (NCic.Rel ~-1,t) l;      
+    status
+;;
+
+let auto_tac ~params status =
+  distribute_tac (auto ~params) status
 ;;