Got rid of a few warnings.

[helm.git] / helm / ocaml / tactics / primitiveTactics.ml

diff --git a/helm/ocaml/tactics/primitiveTactics.ml b/helm/ocaml/tactics/primitiveTactics.ml
index 5b3e47fba02540d96cacb67138b0eb9a78d955df..7bbdbf6b068ece8400f291b3fc459a115076ba8a 100644 (file)
--- a/helm/ocaml/tactics/primitiveTactics.ml
+++ b/helm/ocaml/tactics/primitiveTactics.ml
@@ -26,9 +26,8 @@
 open ProofEngineHelpers
 open ProofEngineTypes
 
+exception TheTypeOfTheCurrentGoalIsAMetaICannotChooseTheRightElimiantionPrinciple
 exception NotAnInductiveTypeToEliminate
-exception NotTheRightEliminatorShape
-exception NoHypothesesFound
 exception WrongUriToVariable of string
 
 (* lambda_abstract newmeta ty *)
@@ -201,6 +200,12 @@ let new_metasenv_for_apply newmeta proof context ty =
          in
          let s' = CicReduction.normalize ~delta:false context s in
           res,(newmeta,context,s')::newmetasenv,newargument::arguments,lastmeta
+          (** 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 **)
     | t -> (CicReduction.normalize ~delta:false context t),[],[],newmeta
   in
    (* WARNING: here we are using the invariant that above the most *)
@@ -327,8 +332,8 @@ let apply_tac_verbose ~term (proof, goal) =
    let termty =
      CicSubstitution.subst_vars exp_named_subst_diff termty
    in
-   prerr_endline ("term:" ^ CicPp.ppterm term);
-   prerr_endline ("termty:" ^ CicPp.ppterm termty);
+(*   prerr_endline ("term:" ^ CicPp.ppterm term);*)
+(*   prerr_endline ("termty:" ^ CicPp.ppterm termty);*)
    let subst,newmetasenv',t = 
      try
        new_metasenv_and_unify_and_t newmeta' metasenv' proof context term' ty
@@ -400,7 +405,7 @@ let intros_tac ?howmany ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_
  in
   mk_tactic (intros_tac ~mk_fresh_name_callback ())
   
-let cut_tac?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name ~subst:[]) ~term=
+let cut_tac ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name ~subst:[]) term =
  let cut_tac
   ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name ~subst:[])
   term (proof, goal)
@@ -435,7 +440,7 @@ let cut_tac?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name ~subst:[
  in
   mk_tactic (cut_tac ~mk_fresh_name_callback term)
 
-let letin_tac ?(mk_fresh_name_callback=FreshNamesGenerator.mk_fresh_name ~subst:[]) ~term=
+let letin_tac ?(mk_fresh_name_callback=FreshNamesGenerator.mk_fresh_name ~subst:[]) term =
  let letin_tac
   ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name ~subst:[])
   term (proof, goal)
@@ -521,6 +526,7 @@ let elim_tac ~term =
         | C.Sort C.Set  -> "_rec"
         | C.Sort C.CProp -> "_rec"
         | C.Sort (C.Type _)-> "_rect" 
+        | C.Meta (_,_) -> raise TheTypeOfTheCurrentGoalIsAMetaICannotChooseTheRightElimiantionPrinciple
         | _ -> assert false
       in
        U.uri_of_string (buri ^ "/" ^ name ^ ext ^ ".con")