X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_tactics%2FnTactics.ml;h=1d3a4aeff3323fc7dbac0e55d9b884e4376da395;hb=dc26b607f828fdf4d1dffbb007e213263ffbef97;hp=49daed849e0fab1f9cbfaf7413b04b6d3f7f8ac8;hpb=9f1f0cb1ae2665a495db930f1561e381e64f5137;p=helm.git

diff --git a/helm/software/components/ng_tactics/nTactics.ml b/helm/software/components/ng_tactics/nTactics.ml
index 49daed849..1d3a4aeff 100644
--- a/helm/software/components/ng_tactics/nTactics.ml
+++ b/helm/software/components/ng_tactics/nTactics.ml
@@ -16,36 +16,9 @@ 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 dot_tac status =
   let new_gstatus = 
@@ -239,236 +212,93 @@ 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 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 whd status ?delta 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 t = NCicReduction.whd ~subst ?delta ctx t in
-  None, ctx, t
-;;
-  
-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
+  aux 1 context
+;;
+
+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 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 get_goal (status : lowtac_status) (g : int) =
- let _,_,metasenv,_,_ = status.pstatus in
- List.assoc g metasenv
-;;
-
-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 clear_tac names = distribute_tac (clear names);;
 
- 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 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 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))
-  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)
-;;
-
-let select ~where status goal = 
- let name, _, _ as goalty = get_goal status goal in
- let (wanted,_,where) = GrafiteDisambiguate.disambiguate_npattern where in
+let select ~where:(wanted,_,where) 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 goalty (wanted,path) 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 select_tac ~where = distribute_tac (select ~where) ;;
 
-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 select_tac ~where 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
+  select_tac ~where:(wanted,hyps,Some path)
+ else
+  let path = 
+   List.fold_left
+     (fun path (name,path_name) -> NCic.Prod ("_",path_name,path))
+     path (List.rev hyps)
+  in
+   let generalize_tac =
+    distribute_tac
+     (exec (exact_tac 
+         ("",0,Ast.Appl 
+           (Ast.Implicit :: List.map (fun (name,_) -> Ast.Ident (name,None)) 
+             hyps))))
+   in
+   block_tac [ 
+     generalize_tac; 
+     select_tac ~where:(wanted,[],Some path);
+     clear_tac (List.map fst hyps) ]
 ;;
 
-let exact_tac t = distribute_tac (exact t) ;;
-
 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
@@ -478,7 +308,7 @@ 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 
@@ -488,14 +318,14 @@ let change ~where ~with_what status goal =
  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
 ;;
@@ -507,57 +337,55 @@ let change_tac ~where ~with_what = distribute_tac (change ~where ~with_what) ;;
 
 let elim_tac ~what ~where status =
  block_tac
-   [ select_tac ~where;
+   [ select_tac ~where true;
      distribute_tac (fun status goal ->
-       let goalty = get_goal status goal in
-       let status, (_,_,w as what) = 
-         disambiguate status what None (`Term goalty) in
-       let _ty_what = typeof status (`Term what) what in 
+       let goalty = get_goalty status goal in
+       let _,_,w = what in
+       let status, what = 
+         disambiguate status what None (ctx_of goalty) in
+       let _ty_what = typeof status (ctx_of what) what in 
        (* check inductive... find eliminator *)
-       let w = (*astify what *) CicNotationPt.Ident ("m",None) in
        let holes = [ 
-         CicNotationPt.Implicit;CicNotationPt.Implicit;CicNotationPt.Implicit]
+         Ast.Implicit;Ast.Implicit;Ast.Implicit]
        in
        let eliminator = 
-         CicNotationPt.Appl(CicNotationPt.Ident("nat_ind",None)::holes @ [ w ])
+         Ast.Appl(Ast.Ident("nat_ind",None)::holes @ [ w ])
        in
        exec (apply_tac ("",0,eliminator)) status goal) ] 
    status
 ;;
 
 let intro_tac name =
- exact_tac
-  ("",0,(CicNotationPt.Binder (`Lambda,
-   (CicNotationPt.Ident (name,None),None),CicNotationPt.Implicit)))
-;;
-
-let analyse_indty status ty = 
- let ref, args =
-  match whd status (`Term ty) ty with
-   | _,_,NCic.Const ref -> ref, []
-   | _,_,NCic.Appl (NCic.Const ref :: args) -> ref, args
-   | _,_,_ -> fail (lazy ("not an inductive type")) in
- let _,lno,tl,_,i = NCicEnvironment.get_checked_indtys ref in
- let _,_,_,cl = List.nth tl i in
- let consno = List.length cl in
- let left, right = HExtlib.split_nth lno args in
- ref, consno, left, right
+ block_tac
+  [ exact_tac
+    ("",0,(Ast.Binder (`Lambda,
+     (Ast.Ident (name,None),None),Ast.Implicit)));
+     if name = "_" then clear_tac [name] else fun x -> x ]
 ;;
 
-let case status goal =
- let _,ctx,_ = get_goal status goal in
- let ty = typeof status (`Ctx ctx) ("",ctx,NCic.Rel 1) in
+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, left, right = analyse_indty status ty in
  let t =
-  NCic.Match (ref,NCic.Implicit `Term,NCic.Rel 1,
+  NCic.Match (ref,NCic.Implicit `Term, term_of_cic_term what (ctx_of gty),
     HExtlib.mk_list (NCic.Implicit `Term) consno)
  in
- let status,t,ty = refine status (`Ctx ctx) ("",ctx,t) None 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 case_tac = distribute_tac case;;
+let cases_tac ~what ~where = 
+        block_tac [ select_tac ~where true ; distribute_tac (cases ~what) ]
+;;
 
 let case1_tac name =
- block_tac [ intro_tac name; case_tac ]
+ 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 fun x -> x ]
 ;;