X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=components%2Ftactics%2FproofEngineHelpers.ml;h=9dfad7651cdc555abedf4ed1f71233ebce45059f;hb=6d5f1a19aaa18813dca94b4e2e7e5ee3b97b4e4b;hp=c3e6f04aa8286d56c8aa31bc5129eb99edbfd346;hpb=f68f452173a5077c58f93587faad65fcced77223;p=helm.git

diff --git a/components/tactics/proofEngineHelpers.ml b/components/tactics/proofEngineHelpers.ml
index c3e6f04aa..9dfad7651 100644
--- a/components/tactics/proofEngineHelpers.ml
+++ b/components/tactics/proofEngineHelpers.ml
@@ -613,69 +613,6 @@ let locate_in_conjecture ?(equality=fun _ -> (==)) what (_,context,ty) =
  in
   res @ locate_in_term what ~where:ty context
 
-(* saturate_term newmeta metasenv context ty goal_arity                       *)
-(* Given a type [ty] (a backbone), it returns its suffix of length            *)
-(* [goal_arity] head and a new metasenv in which there is new a META for each *)
-(* hypothesis, a list of arguments for the new applications and the index of  *)
-(* the last new META introduced. The nth argument in the list of arguments is *)
-(* just the nth new META.                                                     *)
-let saturate_term newmeta metasenv context ty goal_arity =
- let module C = Cic in
- let module S = CicSubstitution in
- assert (goal_arity >= 0);
-  let rec aux newmeta ty =
-   match ty with
-      C.Cast (he,_) -> aux newmeta he
-(* CSC: patch to generate ?1 : ?2 : Type in place of ?1 : Type to simulate ?1 :< Type
-      (* If the expected type is a Type, then also Set is OK ==>
-      *  we accept any term of type Type *)
-      (*CSC: BUG HERE: in this way it is possible for the term of
-      * type Type to be different from a Sort!!! *)
-    | C.Prod (name,(C.Sort (C.Type _) as s),t) ->
-       (* TASSI: ask CSC if BUG HERE refers to the C.Cast or C.Propd case *)
-       let irl =
-         CicMkImplicit.identity_relocation_list_for_metavariable context
-       in
-        let newargument = C.Meta (newmeta+1,irl) in
-         let (res,newmetasenv,arguments,lastmeta) =
-          aux (newmeta + 2) (S.subst newargument t)
-         in
-          res,
-           (newmeta,[],s)::(newmeta+1,context,C.Meta (newmeta,[]))::newmetasenv,
-           newargument::arguments,lastmeta
-*)
-    | C.Prod (name,s,t) ->
-       let irl =
-         CicMkImplicit.identity_relocation_list_for_metavariable context
-       in
-        let newargument = C.Meta (newmeta,irl) in
-         let res,newmetasenv,arguments,lastmeta,prod_no =
-          aux (newmeta + 1) (S.subst newargument t)
-         in
-          if prod_no + 1 = goal_arity then
-           let head = CicReduction.normalize ~delta:false context ty in
-            head,[],[],lastmeta,goal_arity + 1
-          else
-           (** NORMALIZE RATIONALE 
-            * we normalize the target only NOW since we may be in this case:
-            * A1 -> A2 -> T where T = (\lambda x.A3 -> P) k  
-            * and we want a mesasenv with ?1:A1 and ?2:A2 and not
-            * ?1, ?2, ?3 (that is the one we whould get if we start from the
-            * beta-normalized A1 -> A2 -> A3 -> P **)
-           let s' = CicReduction.normalize ~delta:false context s in
-            res,(newmeta,context,s')::newmetasenv,newargument::arguments,
-             lastmeta,prod_no + 1
-    | t ->
-       let head = CicReduction.normalize ~delta:false context t in
-        match CicReduction.whd context head with
-           C.Prod _ as head' -> aux newmeta head'
-         | _ -> head,[],[],newmeta,0
-  in
-   (* WARNING: here we are using the invariant that above the most *)
-   (* recente new_meta() there are no used metas.                  *)
-   let res,newmetasenv,arguments,lastmeta,_ = aux newmeta ty in
-    res,metasenv @ newmetasenv,arguments,lastmeta
-
 let lookup_type metasenv context hyp =
    let rec aux p = function
       | Some (Cic.Name name, Cic.Decl t) :: _ when name = hyp -> p, t
@@ -689,19 +626,16 @@ let lookup_type metasenv context hyp =
 
 (* FG: **********************************************************************)
 
-let list_rev_map_filter f l =
-   let rec aux a = function
-      | []       -> a
-      | hd :: tl -> 
-         begin match f hd with
-	    | None   -> aux a tl
-	    | Some b -> aux (b :: a) tl 
-         end
-   in 
-   aux [] l
-
 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
+
+let get_rel context name =
+   let rec aux i = function
+      | []                                      -> None
+      | Some (Cic.Name s, _) :: _ when s = name -> Some (Cic.Rel i)
+      | _ :: tl                                 -> aux (succ i) tl
+   in
+   aux 1 context