X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_tactics%2FnTactics.ml;h=fe7f176a0e5a3a8ed3a44e0d4c7e9a0228868da4;hb=e603c19e82c160362587cb0bc578287c87122b90;hp=3be17c5e7eca608993a2304e663b9670643f9ec6;hpb=8d7287519cc51145fcac0ee603ba136dc749857d;p=helm.git

diff --git a/helm/software/components/ng_tactics/nTactics.ml b/helm/software/components/ng_tactics/nTactics.ml
index 3be17c5e7..fe7f176a0 100644
--- a/helm/software/components/ng_tactics/nTactics.ml
+++ b/helm/software/components/ng_tactics/nTactics.ml
@@ -28,8 +28,8 @@ let print_tac print_status message status =
 ;;
 
 let dot_tac status =
-  let new_gstatus = 
-    match status.gstatus with
+  let gstatus = 
+    match status#stack with
     | [] -> assert false
     | ([], _, [], _) :: _ as stack ->
         (* backward compatibility: do-nothing-dot *)
@@ -43,12 +43,12 @@ let dot_tac status =
             (([ loc ], t, k, tag) :: s)
         | _ -> fail (lazy "can't use \".\" here")
   in
-   { status with gstatus = new_gstatus }
+   status#set_stack gstatus
 ;;
 
 let branch_tac status =
-  let new_gstatus = 
-    match status.gstatus with
+  let gstatus = 
+    match status#stack with
     | [] -> assert false
     | (g, t, k, tag) :: s ->
           match init_pos g with (* TODO *)
@@ -56,12 +56,12 @@ let branch_tac status =
           | loc :: loc_tl ->
                ([ loc ], [], [], `BranchTag) :: (loc_tl, t, k, tag) :: s
   in
-   { status with gstatus = new_gstatus }
+   status#set_stack gstatus
 ;;
 
 let shift_tac status =
-  let new_gstatus = 
-    match status.gstatus with
+  let gstatus = 
+    match status#stack with
     | (g, t, k, `BranchTag) :: (g', t', k', tag) :: s ->
           (match g' with
           | [] -> fail (lazy "no more goals to shift")
@@ -70,12 +70,12 @@ let shift_tac status =
                 :: (loc_tl, t', k', tag) :: s))
      | _ -> fail (lazy "can't shift goals here")
   in
-   { status with gstatus = new_gstatus }
+   status#set_stack gstatus
 ;;
 
 let pos_tac i_s status =
-  let new_gstatus = 
-    match status.gstatus with
+  let gstatus = 
+    match status#stack with
     | [] -> assert false
     | ([ loc ], t, [],`BranchTag) :: (g', t', k', tag) :: s
       when is_fresh loc ->
@@ -84,35 +84,35 @@ let pos_tac i_s status =
            :: (([ loc ] @+ g') @- l_js, t', k', tag) :: s)
     | _ -> fail (lazy "can't use relative positioning here")
   in
-   { status with gstatus = new_gstatus }
+   status#set_stack gstatus
 ;;
 
 let wildcard_tac status =
-  let new_gstatus = 
-    match status.gstatus with
+  let gstatus = 
+    match status#stack with
     | [] -> assert false
     | ([ loc ] , t, [], `BranchTag) :: (g', t', k', tag) :: s
        when is_fresh loc ->
             (([loc] @+ g', t, [], `BranchTag) :: ([], t', k', tag) :: s)
     | _ -> fail (lazy "can't use wildcard here")
   in
-   { status with gstatus = new_gstatus }
+   status#set_stack gstatus
 ;;
 
 let merge_tac status =
-  let new_gstatus = 
-    match status.gstatus with
+  let gstatus = 
+    match status#stack with
     | [] -> assert false
     | (g, t, k,`BranchTag) :: (g', t', k', tag) :: s ->
         ((t @+ filter_open g @+ g' @+ k, t', k', tag) :: s)
     | _ -> fail (lazy "can't merge goals here")
   in
-   { status with gstatus = new_gstatus }
+   status#set_stack gstatus
 ;;
       
 let focus_tac gs status =
-  let new_gstatus = 
-    match status.gstatus with
+  let gstatus = 
+    match status#stack with
     | [] -> assert false
     | s -> assert(gs <> []);
           let stack_locs =
@@ -126,22 +126,22 @@ let focus_tac gs status =
             gs;
           (zero_pos gs, [], [], `FocusTag) :: deep_close gs s
   in
-   { status with gstatus = new_gstatus }
+   status#set_stack gstatus
 ;;
 
 let unfocus_tac status =
-  let new_gstatus = 
-    match status.gstatus with
+  let gstatus = 
+    match status#stack with
     | [] -> assert false
     | ([], [], [], `FocusTag) :: s -> s
     | _ -> fail (lazy "can't unfocus, some goals are still open")
   in
-   { status with gstatus = new_gstatus }
+   status#set_stack gstatus
 ;;
 
 let skip_tac status =
-  let new_gstatus = 
-    match status.gstatus with
+  let gstatus = 
+    match status#stack with
     | [] -> assert false
     | (gl, t, k, tag) :: s -> 
         let gl = List.map switch_of_loc gl in
@@ -150,7 +150,7 @@ let skip_tac status =
         else 
           ([],t,k,tag) :: s
   in
-   { status with gstatus = new_gstatus }
+   status#set_stack gstatus
 ;;
 
 let block_tac l status =
@@ -158,8 +158,8 @@ let block_tac l status =
 ;;
 
 let compare_statuses ~past ~present =
- let _,_,past,_,_ = past.pstatus in 
- let _,_,present,_,_ = present.pstatus in 
+ let _,_,past,_,_ = past#obj in 
+ let _,_,present,_,_ = present#obj in 
  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)
 ;;
@@ -181,12 +181,16 @@ let compare_statuses ~past ~present =
 
 let exec tac low_status g =
   let stack = [ [0,Open g], [], [], `NoTag ] in
-  let status = tac { gstatus = stack ; istatus = low_status } in
-   status.istatus
+  let status =
+   (new NTacStatus.status low_status#obj stack)#set_estatus
+    (low_status :> NEstatus.status)
+  in
+  let status = tac status in
+   (low_status#set_estatus (status :> NEstatus.status))#set_obj status#obj
 ;;
 
 let distribute_tac tac status =
-  match status.gstatus with
+  match status#stack with
   | [] -> assert false
   | (g, t, k, tag) :: s ->
       debug_print (lazy ("context length " ^string_of_int (List.length g)));
@@ -210,7 +214,10 @@ let distribute_tac tac status =
             in
             aux s go gc loc_tl
       in
-      let s0, go0, gc0 = status.istatus, [], [] in
+      let s0 =
+       (new NTacStatus.status status#obj ())#set_estatus
+        (status :> NEstatus.status) in
+      let s0, go0, gc0 = s0, [], [] in
       let sn, gon, gcn = aux s0 go0 gc0 g in
       debug_print (lazy ("opened: "
         ^ String.concat " " (List.map string_of_int gon)));
@@ -219,17 +226,45 @@ let distribute_tac tac status =
       let stack =
         (zero_pos gon, t @~- gcn, k @~- gcn, tag) :: deep_close gcn s
       in
-       { gstatus = stack; istatus = sn }
+       ((status#set_stack stack)#set_obj (sn :> lowtac_status)#obj)#set_estatus (sn :> NEstatus.status)
 ;;
 
 let atomic_tac htac = distribute_tac (exec htac) ;;
 
+let try_tac tac status =
+  try
+    tac status
+  with NTacStatus.Error _ ->
+    status
+;;
+
+let first_tac tacl status =
+  let res = 
+   HExtlib.list_findopt
+    (fun tac _ -> try Some (tac status) with NTacStatus.Error _ -> None) tacl
+  in
+    match res with
+      | None -> raise (NTacStatus.Error (lazy("No tactic left")))
+      | Some x -> x
+;;
+
 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)
 ;;
 
+let assumption_tac status = distribute_tac (fun status goal ->
+  let gty = get_goalty status goal in
+  let context = ctx_of gty in
+  let htac = 
+   first_tac
+    (List.map (fun (name,_) -> exact_tac ("",0,(Ast.Ident (name,None))))
+      context)
+  in
+    exec htac status goal) status
+;;
+
 let find_in_context name context =
   let rec aux acc = function
     | [] -> raise Not_found
@@ -252,9 +287,9 @@ let clear_tac names =
           fail (lazy ("hypothesis '" ^ name ^ "' not found"))) 
      names
    in
-   let n,h,metasenv,subst,o = status.pstatus in
+   let n,h,metasenv,subst,o = status#obj in
    let metasenv,subst,_ = NCicMetaSubst.restrict metasenv subst goal js in
-    { status with pstatus = n,h,metasenv,subst,o })
+    status#set_obj (n,h,metasenv,subst,o))
 ;;
 
 let generalize0_tac args =
@@ -274,9 +309,6 @@ let select0_tac ~where:(wanted,hyps,where) ~job  =
    let path = 
      match where with None -> NCic.Implicit `Term | Some where -> where 
    in
-   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) ->
@@ -299,6 +331,16 @@ let select0_tac ~where:(wanted,hyps,where) ~job  =
           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 newgoalctx (`Decl newgoalty) 
    in
@@ -329,25 +371,37 @@ 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 eval_tac ~reduction ~where =
+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
+        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)
@@ -363,23 +417,11 @@ let change_tac ~where ~with_what =
   select0_tac ~where ~job:(`ChangeWith change)
 ;;
 
-let letin_tac ~where:(_,_,(m,hyp,gp)) ~what:(_,_,w) name =
-  assert(m = None);
-  let where = Some w, [], 
-     match gp with 
-     | None -> Some Ast.Implicit
-     | Some where -> 
-         Some 
-          (List.fold_left 
-           (fun t _ -> 
-              Ast.Binder(`Pi,(Ast.Ident("_",None),Some Ast.UserInput),t)) 
-           where hyp)
-  in
-  block_tac [
-   generalize0_tac (List.map (fun (name,_) -> Ast.Ident (name,None)) hyp);
-   exact_tac ("",0,Ast.LetIn((Ast.Ident (name,None),None),w,Ast.Implicit));
-   change_tac ~where:("",0,where) ~with_what:("",0,Ast.Ident (name,None))
-  ]
+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 apply_tac = exact_tac;;
@@ -426,8 +468,7 @@ let elim_tac ~what ~where =
      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 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"
@@ -494,46 +535,80 @@ 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 assert_tac (hyps,concl) = distribute_tac (fun status goal ->
+let assert0_tac (hyps,concl) = distribute_tac (fun status goal ->
  let gty = get_goalty status goal in
- let status,concl = disambiguate status concl None (ctx_of gty) in
- let status,concl = term_of_cic_term status concl (ctx_of gty) 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
- assert (concl=gty');
+ 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);
+     assert (id1=id2 || (prerr_endline (id1 ^ " vs " ^ id2); false));
      match e1,e2 with
         `Decl t1, NCic.Decl 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
-          assert (t1=t2);
+          let status = eq status ctx t1 t2 in
           status,item::ctx
       | `Def (b1,t1), NCic.Def (b2,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 status,b1 = disambiguate status b1 None ctx in
-          let status,b1 = apply_subst status ctx b1 in
-          let status,b1 = term_of_cic_term status b1 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
-          let b2 = mk_cic_term ctx b2 in
-          let status,b2 = apply_subst status ctx b2 in
-          let status,b2 = term_of_cic_term status b2 ctx in
-          assert (t1=t2 && b1=b2);
+          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#stack 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#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
+  let pt, metasenv, subst = 
+    Paramod.nparamod status metasenv subst (ctx_of gty) (NCic.Rel ~-1,t) l 
+  in      
+  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
+;;