X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=components%2Ftactics%2FeliminationTactics.ml;h=d05826ec0a514e962278afa6e69952bd8df919f7;hb=46bde81a59b45bedd6d859450decfc2263d92d7e;hp=22bdd0a4f5b78fac9d0146093bd70516b2ed3add;hpb=1beb5e1624ac1db045e36dff93d0cfafa6a70995;p=helm.git

diff --git a/components/tactics/eliminationTactics.ml b/components/tactics/eliminationTactics.ml
index 22bdd0a4f..d05826ec0 100644
--- a/components/tactics/eliminationTactics.ml
+++ b/components/tactics/eliminationTactics.ml
@@ -32,23 +32,37 @@ module S = ProofEngineStructuralRules
 module F = FreshNamesGenerator
 module E = ProofEngineTypes
 module H = ProofEngineHelpers
+module R = ReductionTactics
+
+(*
+(* search in term the Inductive Types and return a list of uris as triples like this: (uri,typeno,exp_named_subst) *)
+let search_inductive_types ty =
+   let rec aux types = function 
+      | C.MutInd (uri, typeno, _) when (not (List.mem (uri, typeno) types)) -> 
+         (uri, typeno) :: types
+      | C.Appl applist -> List.fold_left aux types applist
+      | _              -> types
+   in
+   aux [] ty
+(* N.B: in un caso tipo (and A forall C:Prop.(or B C)) l'or *non* viene selezionato! *)
+*)
 
 (* unexported tactics *******************************************************)
 
-let get_name context index =
-   try match List.nth context (pred index) with
-      | Some (Cic.Name name, _)     -> Some name
-      | _                           -> None
-   with Invalid_argument "List.nth" -> None
+type type_class = Other
+                | Ind
+ 	        | Con of C.lazy_term
+
+let premise_pattern what = None, [what, C.Implicit (Some `Hole)], None 
 
 let rec scan_tac ~old_context_length ~index ~tactic =
    let scan_tac status =
       let (proof, goal) = status in
-      let _, metasenv, _, _ = proof in
+      let _, metasenv, _, _, _ = proof in
       let _, context, _ = CicUtil.lookup_meta goal metasenv in
       let context_length = List.length context in
       let rec aux index =
-         match get_name context index with 
+         match H.get_name context index with 
 	    | _ when index <= 0 -> (proof, [goal])
 	    | None              -> aux (pred index)
 	    | Some what         -> 
@@ -57,29 +71,37 @@ let rec scan_tac ~old_context_length ~index ~tactic =
                in
 	       try E.apply_tactic tac status 
 	       with E.Fail _ -> aux (pred index)
-      in aux (index + context_length - old_context_length - 1)
+      in aux (index + context_length - old_context_length)
    in
    E.mk_tactic scan_tac
 
-let rec check_inductive_types types = function 
-   | C.MutInd (uri, typeno, _) -> List.mem (uri, typeno) types
-   | C.Appl (hd :: tl)         -> check_inductive_types types hd
-   | _                         -> false
+let rec check_types types = function 
+   | C.MutInd (uri, typeno, _) -> 
+      if List.mem (uri, Some typeno) types then Ind else Other
+   | C.Const (uri, _) as t     -> 
+      if List.mem (uri, None) types then Con (E.const_lazy_term t) else Other
+   | C.Appl (hd :: tl)         -> check_types types hd
+   | _                         -> Other
 
-let elim_clear_tac ~mk_fresh_name_callback ~types ~what =
-   let elim_clear_tac status =
+let elim_clear_unfold_tac ~mk_fresh_name_callback ~types ~what =
+   let elim_clear_unfold_tac status =
       let (proof, goal) = status in
-      let _, metasenv, _, _ = proof in
+      let _, metasenv, _, _, _ = proof in
       let _, context, _ = CicUtil.lookup_meta goal metasenv in
       let index, ty = H.lookup_type metasenv context what in
-      if check_inductive_types types ty then 
-         let tac = T.then_ ~start:(P.elim_intros_tac ~mk_fresh_name_callback (C.Rel index))
-	                   ~continuation:(S.clear [what])
-	 in
-	 E.apply_tactic tac status
-      else raise (E.Fail (lazy "unexported elim_clear: not an eliminable type"))
+      match check_types types ty with 
+         | Ind   ->
+	    let tac = T.then_ ~start:(P.elim_intros_tac ~mk_fresh_name_callback (C.Rel index))
+	                      ~continuation:(S.clear [what])
+	    in
+	    E.apply_tactic tac status
+         | Con t ->
+	    let tac = R.unfold_tac (Some t) ~pattern:(premise_pattern what) in
+	    E.apply_tactic tac status
+	 | Other -> 
+	    raise (E.Fail (lazy "unexported elim_clear: not an eliminable type"))
    in
-   E.mk_tactic elim_clear_tac
+   E.mk_tactic elim_clear_unfold_tac
 
 (* elim type ****************************************************************)
 
@@ -108,27 +130,16 @@ let debug_print = fun _ -> ()
   (** debugging print *)
 let warn s = debug_print (lazy ("DECOMPOSE: " ^ (Lazy.force s)))
 
-(* search in term the Inductive Types and return a list of uris as triples like this: (uri,typeno,exp_named_subst) *)
-let search_inductive_types ty =
-   let rec aux types = function 
-      | C.MutInd (uri, typeno, _) when (not (List.mem (uri, typeno) types)) -> 
-         (uri, typeno) :: types
-      | C.Appl applist -> List.fold_left aux types applist
-      | _              -> types
-   in
-   aux [] ty
-(* N.B: in un caso tipo (and A forall C:Prop.(or B C)) l'or *non* viene selezionato! *)
-
 (* roba seria ------------------------------------------------------------- *)
 
 let decompose_tac ?(mk_fresh_name_callback = F.mk_fresh_name ~subst:[])
                   ?(user_types=[]) ?what ~dbd =
    let decompose_tac status =
       let (proof, goal) = status in
-      let _, metasenv,_,_ = proof in
+      let _, metasenv,_,_, _ = proof in
       let _, context, _ = CicUtil.lookup_meta goal metasenv in
       let types = List.rev_append user_types (FwdQueries.decomposables dbd) in
-      let tactic = elim_clear_tac ~mk_fresh_name_callback ~types in
+      let tactic = elim_clear_unfold_tac ~mk_fresh_name_callback ~types in
       let old_context_length = List.length context in      
       let tac = match what with
 	 | Some what ->