bugfix: the function that abstract constant occurrences by putting metavariables

in place of identity explicit substitutions (local contexts) is generalized to
put ?1 : ?2 : Type in place of a ?1 : Type to take care of <Type in contravariant
position. Note: this is still partially bugged (see previous commit on the same
topic).

diff --git a/helm/ocaml/tactics/primitiveTactics.ml b/helm/ocaml/tactics/primitiveTactics.ml
index 1631e767fb7a5f59f7482a598081195267969f5b..55b9d2e420ec8def3d11fd93902dfe1bb320486c 100644 (file)
--- a/helm/ocaml/tactics/primitiveTactics.ml
+++ b/helm/ocaml/tactics/primitiveTactics.ml
@@ -217,15 +217,30 @@ let
                CicSubstitution.subst_vars !exp_named_subst_diff ty
             | _ -> raise (WrongUriToVariable (UriManager.string_of_uri uri))
           in
-           let irl =
-             CicMkImplicit.identity_relocation_list_for_metavariable context
-           in
-           let subst_item = uri,C.Meta (!next_fresh_meta,irl) in
-            newmetasenvfragment :=
-             (!next_fresh_meta,context,ty)::!newmetasenvfragment ;
-            exp_named_subst_diff := !exp_named_subst_diff @ [subst_item] ;
-            incr next_fresh_meta ;
-            subst_item::(aux (tl,[]))
+           (match ty with
+               C.Sort C.Type as s ->
+                let irl =
+                  CicMkImplicit.identity_relocation_list_for_metavariable context
+                in
+                 let fresh_meta = !next_fresh_meta in
+                 let fresh_meta' = fresh_meta + 1 in
+                  next_fresh_meta := !next_fresh_meta + 2 ;
+                  let subst_item = uri,C.Meta (fresh_meta',irl) in
+                   newmetasenvfragment :=
+                    (fresh_meta,[],C.Sort C.Type) ::
+                     (fresh_meta',[],C.Meta (fresh_meta,[])) :: !newmetasenvfragment ;
+                   exp_named_subst_diff := !exp_named_subst_diff @ [subst_item] ;
+                   subst_item::(aux (tl,[]))
+             | _ ->
+              let irl =
+                CicMkImplicit.identity_relocation_list_for_metavariable context
+              in
+              let subst_item = uri,C.Meta (!next_fresh_meta,irl) in
+               newmetasenvfragment :=
+                (!next_fresh_meta,context,ty)::!newmetasenvfragment ;
+               exp_named_subst_diff := !exp_named_subst_diff @ [subst_item] ;
+               incr next_fresh_meta ;
+               subst_item::(aux (tl,[])))
        | uri::tl1,((uri',_) as s)::tl2 ->
           assert (UriManager.eq uri uri') ;
           s::(aux (tl1,tl2))
@@ -235,7 +250,6 @@ let
        !exp_named_subst_diff,!next_fresh_meta,
         List.rev !newmetasenvfragment, exp_named_subst'
    in
-prerr_endline ("@@@ " ^ CicPp.ppterm (Cic.Var (uri,exp_named_subst)) ^ " |--> " ^ CicPp.ppterm (Cic.Var (uri,exp_named_subst'))) ;
     new_fresh_meta,newmetasenvfragment,exp_named_subst',exp_named_subst_diff
 ;;
 
@@ -307,7 +321,6 @@ let apply_tac ~term ~status:(proof, goal) =
              Cic.Appl (term'::arguments)
            )
          in
-prerr_endline ("XXXX " ^ CicPp.ppterm (if List.length newmetas = 0 then term' else Cic.Appl (term'::arguments)) ^ " |>>> " ^ CicPp.ppterm bo') ;
           let newmetasenv'' = new_uninstantiatedmetas@old_uninstantiatedmetas in
           let (newproof, newmetasenv''') =
            let subst_in = CicMetaSubst.apply_subst ((metano,bo')::subst) in