X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_tactics%2FnTactics.ml;h=a2042dda6d2ce6d40d491f2512f96b0714c61dea;hb=df9b1c00777e4ff1c73b467624bbc3117c1bb0a3;hp=baa7f38a99bd78d72fc751822842b164a1a5731b;hpb=7718257d24d2f0478810711e5b5a9c6bdded1f8e;p=helm.git

diff --git a/helm/software/components/ng_tactics/nTactics.ml b/helm/software/components/ng_tactics/nTactics.ml
index baa7f38a9..a2042dda6 100644
--- a/helm/software/components/ng_tactics/nTactics.ml
+++ b/helm/software/components/ng_tactics/nTactics.ml
@@ -16,30 +16,12 @@ open Printf
 let debug = true
 let debug_print s = if debug then prerr_endline (Lazy.force s) else ()
 
-exception Error of string lazy_t
-let fail msg = raise (Error msg)
-
-type lowtac_status = {
-        pstatus : NCic.obj;
-        lstatus : LexiconEngine.status
-}
-
-type lowtactic = lowtac_status * int -> lowtac_status * int list * int list
-
-type tac_status = {
-        gstatus : Continuationals.Stack.t; 
-        istatus : lowtac_status;
-} 
-
-type tactic = tac_status -> tac_status
-
-type tactic_term = CicNotationPt.term Disambiguate.disambiguator_input
-
-let pp_tac_status status = 
-  prerr_endline (NCicPp.ppobj status.istatus.pstatus)
-;;
-
 open Continuationals.Stack
+open NTacStatus
+module Ast = CicNotationPt
+
+let id_tac status = status ;;
+let print_tac message status = prerr_endline message; status ;;
 
 let dot_tac status =
   let new_gstatus = 
@@ -170,31 +152,33 @@ let skip_tac status =
 let block_tac l status =
   List.fold_left (fun status tac -> tac status) status l
 ;;
- 
-let compare_menv ~past ~present =
-  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)
+
+let compare_statuses ~past ~present =
+ let _,_,past,_,_ = past.pstatus in 
+ let _,_,present,_,_ = present.pstatus 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)
 ;;
 
+
+
 (* Exec and distribute_tac form a retraction pair:
     1) exec (distribute_tac low_tac) (s,i) = low_tac (s,i)
     2) tac [s]::G = G1::...::Gn::G' && G' is G with some goals closed =>
          distribute_tac (exec tac) [s]::G = (G1@...Gn)::G'
+    3) tac G = distribute_tac (exec tac) G if  
+       tac = distribute_tac lowtac
+    4) atomic_tac t === distribute_tac (exec t)
 
    Note that executing an high tactic on a set of goals may be stronger
    than executing the same tactic on those goals, but once at a time
    (e.g. the tactic could perform a global analysis of the set of goals)
 *)
 
-let exec tac (low_status,g) =
+let exec tac low_status g =
   let stack = [ [0,Open g], [], [], `NoTag ] in
-  let _,_,old_metasenv,_,_ = low_status.pstatus in
   let status = tac { gstatus = stack ; istatus = low_status } in
-  let _,_,metasenv,_,_ = status.istatus.pstatus in
-  let open_goals, closed_goals = 
-    compare_menv ~past:old_metasenv ~present:metasenv 
-  in
-   status.istatus, open_goals, closed_goals
+   status.istatus
 ;;
 
 let distribute_tac tac status =
@@ -204,7 +188,9 @@ let distribute_tac tac status =
       debug_print (lazy ("context length " ^string_of_int (List.length g)));
       let rec aux s go gc =
         function
-        | [] -> s, go, gc
+        | [] -> 
+            debug_print (lazy "no selected goals");
+            s, go, gc
         | loc :: loc_tl ->
             debug_print (lazy "inner eval tactical");
             let s, go, gc =
@@ -214,8 +200,9 @@ let distribute_tac tac status =
                 match switch_of_loc loc with
                 | Closed _ -> fail (lazy "cannot apply to a Closed goal")
                 | Open n -> 
-                   let s, go', gc' = tac (s,n) in
-                   s, (go @- gc') @+ go', gc @+ gc'
+                   let sn = tac s n in
+                   let go', gc' = compare_statuses ~past:s ~present:sn in
+                   sn, ((go @+ [n]) @- gc') @+ go', gc @+ gc'
             in
             aux s go gc loc_tl
       in
@@ -231,79 +218,262 @@ let distribute_tac tac status =
        { gstatus = stack; istatus = sn }
 ;;
 
-(* attempt....
-type cic_term = NCic.conjecture
-type ast_term = CicNotationPt.term
-type position = Ctx of NCic.context | Term of cic_term
+let atomic_tac htac = distribute_tac (exec htac) ;;
 
-let relocate (name,ctx,t as term) context =
-  if ctx = context then term else assert false
+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 disambiguate (status : lowtac_status) (t : ast_term)  
-                 (ty : cic_term option) (where : position) =
- let uri,height,metasenv,subst,obj = status.pstatus in
- let context = match where with Ctx c -> c | Term (_,c,_) -> c in
- let expty = 
-   match ty with 
-   | None -> None | Some ty -> let _,_,x = relocate ty context in Some x 
- in
- let metasenv, subst, lexicon_status, t = 
-   GrafiteDisambiguate.disambiguate_nterm expty
-    status.lstatus context metasenv subst t 
+let find_in_context name context =
+  let rec aux acc = function
+    | [] -> raise Not_found
+    | (hd,_) :: tl when hd = name -> acc
+    | _ :: tl ->  aux (acc + 1) tl
+  in
+  aux 1 context
+;;
+
+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 generalize0_tac args =
+ if args = [] then id_tac
+ else exact_tac ("",0,Ast.Appl (Ast.Implicit :: args))
+;;
+
+let select0_tac ~where:(wanted,_,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
  in
- let new_pstatus = uri,height,metasenv,subst,obj in
- { lstatus = lexicon_status; pstatus = new_pstatus }, (None, context, t) 
+ 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) 
+   in
+   let status, instance = 
+     mk_meta status (ctx_of newgoalty) (`Decl newgoalty) 
+   in
+   instantiate status goal instance)
 ;;
 
-let get_goal (status : low_status) (g : int) =
- let _,_,metasenv,_,_ = status.pstatus in
- List.assoc goal metasenv
+let select_tac ~where ~job move_down_hyps = 
+ let (wanted,hyps,where) = GrafiteDisambiguate.disambiguate_npattern where in
+ let path = 
+  match where with None -> NCic.Implicit `Term | Some where -> where in
+ if not move_down_hyps then
+  select0_tac ~where:(wanted,hyps,Some path) ~job
+ else
+  let path = 
+   List.fold_left
+     (fun path (name,path_name) -> NCic.Prod ("_",path_name,path))
+     path (List.rev hyps)
+  in
+   block_tac [ 
+     generalize0_tac (List.map (fun (name,_) -> Ast.Ident (name,None)) hyps);
+     select0_tac ~where:(wanted,[],Some path) ~job;
+     clear_tac (List.map fst hyps) ]
 ;;
 
-let return ~orig status = 
- let _,_,past,_,_ = orig.pstatus in
- let _,_,present,_,_ = status.pstatus in
- let open_goals, closed_goals = compare_menv ~past ~present in
- status, open_goals, closed_goals
+let generalize_tac ~where = 
+ let l = ref [] in
+ block_tac [ 
+   select_tac ~where ~job:(`Collect l) true; 
+   force (lazy (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 = 
+       List.fold_left 
+         (fun s t -> unify s (ctx_of goalty) canon t) status (List.tl !l)
+     in
+     instantiate status goal 
+       (mk_cic_term (ctx_of goalty) (NCic.Appl [NCic.Implicit `Term ; 
+         term_of_cic_term canon (ctx_of goalty) ]))
+   ))) ]
 ;;
 
-let apply t (status as orig,goal) =
- let goal = get_goal status goal in
- let status, t = disambiguate status t goal (Term goal) in
- let subst, metasenv = 
-   (goal, (name, context, t, gty)):: subst,
-   List.filter(fun (x,_) -> x <> goal) metasenv
+
+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
- return ~orig status
+ 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 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 apply t (status,goal) =
- let uri,height,(metasenv as old_metasenv), subst,obj = status.pstatus in
- let name,context,gty = List.assoc goal metasenv in
- let metasenv, subst, lexicon_status, t = 
-   GrafiteDisambiguate.disambiguate_nterm (Some gty) 
-    status.lstatus context metasenv subst t 
+ 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
- let subst, metasenv = 
-   (goal, (name, context, t, gty)):: subst,
-   List.filter(fun (x,_) -> x <> goal) metasenv
+ instantiate status goal instance
+*)
+;;
+let change_tac ~where ~with_what = distribute_tac (change ~where ~with_what) ;;
+
+let apply_tac = exact_tac;;
+
+type indtyinfo = {
+        rightno: int;
+        leftno: int;
+        consno: int;
+        lefts: NCic.term list;
+        rights: NCic.term list;
+        reference: NReference.reference;
+ }
+;;
+
+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 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;
+  };
+  exec id_tac status goal)
+;;
+
+let elim_tac ~what ~where = 
+  let indtyinfo = ref None in
+  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
+    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));
+    compute_goal_sort_tac;
+    force (lazy (
+     let sort = HExtlib.unopt !sort in
+     let ity = HExtlib.unopt !indtyinfo in
+     let NReference.Ref (uri, _) = ity.reference in
+     let name = NUri.name_of_uri uri ^
+      match term_of_cic_term sort (ctx_of sort) with
+       | NCic.Sort NCic.Prop -> "_ind"
+       | NCic.Sort _ -> "_rect"
+       | _ -> assert false 
+     in
+     let holes = 
+       HExtlib.mk_list Ast.Implicit (ity.leftno+1+ ity.consno + ity.rightno) in
+     let eliminator = 
+       let _,_,w = what in
+       Ast.Appl(Ast.Ident(name,None)::holes @ [ w ])
+     in
+     exact_tac ("",0,eliminator))) ]) 
+;;
+
+let rewrite_tac ~dir ~what:(_,_,what) ~where =
+ let name =
+  match dir with `LeftToRight -> "eq_elim_r" | `RightToLeft -> "eq_ind"
  in
- let open_goals, closed_goals = 
-   compare_menv ~past:old_metasenv ~present:metasenv in
- let new_pstatus = uri,height,metasenv,subst,obj 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]))]
+;;
 
-   prerr_endline ("termine disambiguato: " ^ 
-     NCicPp.ppterm ~context ~metasenv ~subst t);
-   prerr_endline ("menv:" ^ NCicPp.ppmetasenv ~subst metasenv);
-   prerr_endline ("subst:" ^ NCicPp.ppsubst subst ~metasenv);
-   prerr_endline "fine napply";
+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 ]
+;;
 
-  { lstatus = lexicon_status; pstatus = new_pstatus }, open_goals, closed_goals
+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 t =
+  NCic.Match (ref,NCic.Implicit `Term, term_of_cic_term what (ctx_of gty),
+    HExtlib.mk_list (NCic.Implicit `Term) consno)
+ in
+ let ctx = ctx_of gty in
+ let status,t,ty = refine status ctx (mk_cic_term ctx t) (Some gty) in
+ instantiate status goal t
 ;;
 
-let apply_tac t = distribute_tac (apply t) ;;
+let cases_tac ~what ~where = 
+  let indtyinfo = ref None in
+  atomic_tac 
+   (block_tac [
+      analyze_indty_tac ~what indtyinfo;
+      force (lazy (select_tac 
+        ~where ~job:(`Substexpand ((HExtlib.unopt !indtyinfo).rightno+1))true));
+      distribute_tac (cases ~what) ])
+;;
 
+let case1_tac name =
+ let name = if name = "_" then "_clearme" else name in
+ block_tac [ intro_tac name; 
+             cases_tac 
+              ~where:("",0,(None,[],None)) 
+              ~what:("",0,Ast.Ident (name,None));
+              if name = "_clearme" then clear_tac ["_clearme"] else id_tac ]
+;;