X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_tactics%2FnTactics.ml;h=b34a3a34dd0b4c594ffc7812e92dc437184778dc;hb=463dc6672bcdc0eb63e1638fa75212387d54179a;hp=0c5f5360c5ef579fa75851dbbbcea576298047a6;hpb=e898ca2563cc4dfbd328efc7aa3a4ff86feaec92;p=helm.git

diff --git a/helm/software/components/ng_tactics/nTactics.ml b/helm/software/components/ng_tactics/nTactics.ml
index 0c5f5360c..b34a3a34d 100644
--- a/helm/software/components/ng_tactics/nTactics.ml
+++ b/helm/software/components/ng_tactics/nTactics.ml
@@ -16,36 +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 
-
-type tac_status = {
-        gstatus : Continuationals.Stack.t; 
-        istatus : lowtac_status;
-} 
-
-type tactic = tac_status -> tac_status
-
-type tactic_term = CicNotationPt.term Disambiguate.disambiguator_input
-type tactic_pattern = GrafiteAst.npattern Disambiguate.disambiguator_input
-
-let pp_tac_status status = 
-  prerr_endline (NCicPp.ppobj status.istatus.pstatus)
-;;
-
-let pp_lowtac_status status = 
-  prerr_endline "--------------------------------------------";
-  prerr_endline (NCicPp.ppobj status.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 = 
@@ -180,8 +156,13 @@ let block_tac l status =
 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)
+ 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
 ;;
 
 
@@ -192,13 +173,14 @@ let compare_statuses ~past ~present =
          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 status = tac { gstatus = stack ; istatus = low_status } in
    status.istatus
@@ -211,7 +193,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 =
@@ -223,7 +207,7 @@ let distribute_tac tac status =
                 | Open n -> 
                    let sn = tac s n in
                    let go', gc' = compare_statuses ~past:s ~present:sn in
-                   sn, (go @- gc') @+ go', gc @+ gc'
+                   sn, ((go @+ [n]) @- gc') @+ go', gc @+ gc'
             in
             aux s go gc loc_tl
       in
@@ -239,213 +223,101 @@ let distribute_tac tac status =
        { gstatus = stack; istatus = sn }
 ;;
 
-type cic_term = NCic.conjecture
-type ast_term = string * int * CicNotationPt.term
-type position = [ `Ctx of NCic.context | `Term of cic_term ]
-
+let atomic_tac htac = distribute_tac (exec htac) ;;
 
-let relocate context (name,ctx,t as term) =
-  let is_prefix l1 l2 =
-    let rec aux = function
-      | [],[] -> true
-      | x::xs, y::ys -> x=y && aux (xs,ys)
-      | _ -> false
-    in
-      aux (List.rev l1, List.rev l2)
-  in
-  if ctx = context then term else 
-  if is_prefix ctx context then 
-    (name, context, 
-      NCicSubstitution.lift (List.length context - List.length ctx) t)
-  else
-    assert false
-;;
-
-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 context ty in Some x 
- in
- let metasenv, subst, lexicon_status, t = 
-   GrafiteDisambiguate.disambiguate_nterm expty
-    status.lstatus context metasenv subst t 
- in
- let new_pstatus = uri,height,metasenv,subst,obj in
- { lstatus = lexicon_status; pstatus = new_pstatus }, (None, context, t) 
+let exact t 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 in_scope_tag = "tag:in_scope" ;;
-let out_scope_tag = "tag:out_scope" ;;
+let exact_tac t = distribute_tac (exact t) ;;
 
-let typeof status where t =
-  let _,_,metasenv,subst,_ = status.pstatus in
-  let ctx = match where with `Ctx c -> c | `Term (_,c,_) -> c in
-  let _,_,t = relocate ctx t in
-  let ty = NCicTypeChecker.typeof ~subst ~metasenv ctx t in
-  None, ctx, ty
-;;
-  
-let unify status where a b =
-  let n,h,metasenv,subst,o = status.pstatus in
-  let ctx = match where with `Ctx c -> c | `Term (_,c,_) -> c in
-  let _,_,a = relocate ctx a in
-  let _,_,b = relocate ctx b in
-  let metasenv, subst = 
-    NCicUnification.unify (NCicUnifHint.db ()) metasenv subst ctx a b
+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
-  { status with pstatus = n,h,metasenv,subst,o }
+  aux 1 context
 ;;
 
-let refine status where term expty =
-  let ctx = match where with `Ctx c -> c | `Term (_,c,_) -> c in
-  let nt,_,term = relocate ctx term in
-  let ne, ty = 
-    match expty with None -> None, None 
-    | Some e -> let n,_, e = relocate ctx e in Some n, Some e
-  in
-  let name,height,metasenv,subst,obj = status.pstatus in
-  let db = NCicUnifHint.db () in (* XXX fixme *)
-  let coercion_db = NCicCoercion.db () in
-  let look_for_coercion = NCicCoercion.look_for_coercion coercion_db in
-  let metasenv, subst, t, ty = 
-   NCicRefiner.typeof db ~look_for_coercion metasenv subst ctx term ty
-  in
-  { status with pstatus = (name,height,metasenv,subst,obj) }, 
-  (nt,ctx,t), (ne,ctx,ty)
+let clear names 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 get_goal (status : lowtac_status) (g : int) =
- let _,_,metasenv,_,_ = status.pstatus in
- List.assoc g metasenv
+let clear_tac names =
+ if names = [] then id_tac else distribute_tac (clear names)
 ;;
 
-let instantiate status i t =
- let (goalname, context, _ as ety) = get_goal status i in
- let status, (_,_,t), (_,_,ty) = refine status (`Term ety) t (Some ety) in
-
- let name,height,metasenv,subst,obj = status.pstatus in
- let metasenv = List.filter (fun j,_ -> j <> i) metasenv in
- let subst = (i, (goalname, context, t, ty)) :: subst in
- { status with pstatus = (name,height,metasenv,subst,obj) }
+let generalize0_tac args =
+ if args = [] then id_tac
+ else exact_tac ("",0,Ast.Appl (Ast.Implicit :: args))
 ;;
 
-let mk_meta status ?name where bo_or_ty =
-  let n,h,metasenv,subst,o = status.pstatus in
-  let ctx = match where with `Ctx c -> c | `Term (_,c,_) -> c in
-  match bo_or_ty with
-  | `Decl ty ->
-      let _,_,ty = relocate ctx ty in
-      let metasenv, _, instance, _ = 
-        NCicMetaSubst.mk_meta ?name metasenv ctx (`WithType ty)
-      in
-      let status = { status with pstatus = n,h,metasenv,subst,o } in
-      status, (None,ctx,instance)
-  | `Def bo ->
-      let _,_,ty = typeof status (`Ctx ctx) bo in
-      let metasenv, metano, instance, _ = 
-        NCicMetaSubst.mk_meta ?name metasenv ctx (`WithType ty)
-      in
-      let status = { status with pstatus = n,h,metasenv,subst,o } in
-      let status = instantiate status metano bo in
-      status, (None,ctx,instance)
+let select0_tac ~where:(wanted,_,where) ~argsno = 
+ 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 argsno goalty (wanted,path) in
+   let status, instance = 
+     mk_meta status (ctx_of newgoalty) (`Decl newgoalty) 
+   in
+   instantiate status goal instance)
 ;;
 
-let select_term low_status (name,context,term) (wanted,path) =
-  let found status ctx t wanted =
-    (* we could lift wanted step-by-step *)
-    try true, unify status (`Ctx ctx) (None,ctx,t) wanted
-    with 
-    | NCicUnification.UnificationFailure _ 
-    | NCicUnification.Uncertain _ -> false, status
-  in
-  let match_term status ctx (wanted : cic_term) t =
-    let rec aux ctx status t =
-      let b, status = found status ctx t wanted in
-      if b then 
-        let status, (_,_,t) = 
-          mk_meta status ~name:in_scope_tag (`Ctx ctx) (`Def (None,ctx,t))
-        in    
-        status, t
-      else NCicUntrusted.map_term_fold_a (fun e c -> e::c) ctx aux status t
-     in 
-       aux ctx status t
-  in 
-  let rec select status ctx pat cic = 
-    match pat, cic with
-    | NCic.LetIn (_,t1,s1,b1), NCic.LetIn (n,t2,s2,b2) ->
-        let status, t = select status ctx t1 t2 in
-        let status, s = select status ctx s1 s2 in
-        let ctx = (n, NCic.Def (s2,t2)) :: ctx in
-        let status, b = select status ctx b1 b2 in
-        status, NCic.LetIn (n,t,s,b)
-    | NCic.Lambda (_,s1,t1), NCic.Lambda (n,s2,t2) ->
-        let status, s = select status ctx s1 s2 in
-        let ctx = (n, NCic.Decl s2) :: ctx in
-        let status, t = select status ctx t1 t2 in
-        status, NCic.Lambda (n,s,t)
-    | NCic.Prod (_,s1,t1), NCic.Prod (n,s2,t2) ->
-        let status, s = select status ctx s1 s2 in
-        let ctx = (n, NCic.Decl s2) :: ctx in
-        let status, t = select status ctx t1 t2 in
-        status, NCic.Prod (n,s,t)
-    | NCic.Appl l1, NCic.Appl l2 ->
-        let status, l = 
-           List.fold_left2
-             (fun (status,l) x y -> 
-              let status, x = select status ctx x y in
-              status, x::l)
-             (status,[]) l1 l2
-        in
-        status, NCic.Appl (List.rev l)
-    | NCic.Match (_,ot1,t1,pl1), NCic.Match (u,ot2,t2,pl2) ->
-        let status, t = select status ctx t1 t2 in
-        let status, ot = select status ctx ot1 ot2 in
-        let status, pl = 
-           List.fold_left2
-             (fun (status,l) x y -> 
-              let status, x = select status ctx x y in
-              status, x::l)
-             (status,[]) pl1 pl2
-        in
-        status, NCic.Match (u,ot,t,List.rev pl)
-    | NCic.Implicit `Hole, t -> 
-        (match wanted with
-        | Some wanted -> 
-             let status, wanted = disambiguate status wanted None (`Ctx ctx) in
-             match_term status ctx wanted t
-        | None -> match_term status ctx (None,ctx,t) t)
-    | NCic.Implicit _, t -> status, t
-    | _,t -> 
-        fail (lazy ("malformed pattern: " ^ NCicPp.ppterm ~metasenv:[]
-          ~context:[] ~subst:[] pat))
+let select_tac ~where ~argsno 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) ~argsno
+ else
+  let path = 
+   List.fold_left
+     (fun path (name,path_name) -> NCic.Prod ("_",path_name,path))
+     path (List.rev hyps)
   in
-  let status, term = select low_status context path term in
-  let term = (name, context, term) in
-  mk_meta status ~name:out_scope_tag (`Ctx context) (`Def term)
+   block_tac [ 
+     generalize0_tac (List.map (fun (name,_) -> Ast.Ident (name,None)) hyps);
+     select0_tac ~where:(wanted,[],Some path) ~argsno;
+     clear_tac (List.map fst hyps) ]
 ;;
 
-
-let exact t status goal =
- let goalty = get_goal status goal in
- let status, t = disambiguate status t (Some goalty) (`Term goalty) in
- instantiate status goal t
+(*
+let generalize_tac ~where = 
+ block_tac [ select_tac ~where true ; generalize0_tac ???? ]
 ;;
+*)
 
 
 let reopen status =
  let n,h,metasenv,subst,o = status.pstatus in
  let subst, newm = 
    List.partition 
-    (function (_,(Some tag,_,_,_)) -> tag <> in_scope_tag && tag <> out_scope_tag
+    (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 = in_scope_tag | _ -> assert false)
+     (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
@@ -455,43 +327,144 @@ let reopen status =
 ;;
 
 let change ~where ~with_what status goal =
- let (name,_,_ as goalty) = get_goal status goal in
+ 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 = select_term status goalty (wanted,path) in
+ let status, newgoalty = 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 (`Term goalty) (n,cctx,bo)  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 ?name (`Term newgoalty) (`Decl newgoalty) 
+   mk_meta status (ctx_of newgoalty) (`Decl newgoalty) 
  in
  instantiate status goal instance
 ;;
 
-let apply t status goal =
- let uri,height,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 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) ;;
+
+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;
+  };
+  prerr_endline "FO";
+  exec id_tac status goal)
+;;
+
+let force f s = Lazy.force f s;;
+
+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
+    prerr_endline "XXXXXXXX";
+    sort := Some goalsort;
+    exec id_tac status goal)
+  in
+  atomic_tac (block_tac [
+    analyze_indty_tac ~what indtyinfo;    
+    force (lazy (select_tac 
+      ~where ~argsno:((HExtlib.unopt !indtyinfo).rightno+1) true));
+    print_tac "CIAO";
+    compute_goal_sort_tac;
+    print_tac "CIAO2";
+    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 subst, metasenv = 
-   (goal, (name, context, t, gty)):: subst,
-   List.filter(fun (x,_) -> x <> goal) metasenv
+  block_tac
+   [ select_tac ~where ~argsno:2 true;
+     exact_tac
+      ("",0,
+       Ast.Appl(Ast.Ident(name,None)::HExtlib.mk_list Ast.Implicit 5 @
+        [what]))]
+;;
+
+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 ]
+;;
+
+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 new_pstatus = uri,height,metasenv,subst,obj in
- { lstatus = lexicon_status; pstatus = new_pstatus }
+ 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 change_tac ~where ~with_what = distribute_tac (change ~where ~with_what) ;;
+let cases_tac ~what ~where = 
+  let indtyinfo = ref None in
+  atomic_tac 
+   (block_tac [
+      analyze_indty_tac ~what indtyinfo;
+      select_tac ~where ~argsno:((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 ]
+;;