aboutsummaryrefslogtreecommitdiff
path: root/proofs
diff options
context:
space:
mode:
authorherbelin2008-04-28 08:19:14 +0000
committerherbelin2008-04-28 08:19:14 +0000
commit904116af36e25ba85049337b14e4ab17396d05a3 (patch)
tree2d93e019cd3499f87f28e98898e6b5e58a76f746 /proofs
parent7e6ce51bf1a7beea6fa7818d2e5447ade79c30e7 (diff)
Petites corrections vis à vis des commits 10860, 10859, 10850
- pour le "try", la nouvelle erreur CannotFindWellTypedAbstraction doit être catchable - pour accomoder Type -1 dans le discharge, il faut un refresh_universes strict - bugs dans les fichiers de test-suite git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@10861 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'proofs')
-rw-r--r--proofs/logic.ml11
1 files changed, 7 insertions, 4 deletions
diff --git a/proofs/logic.ml b/proofs/logic.ml
index 24de605ac8..d61fe21de0 100644
--- a/proofs/logic.ml
+++ b/proofs/logic.ml
@@ -51,8 +51,9 @@ let rec catchable_exception = function
| RefinerError _ | Indrec.RecursionSchemeError _
| Nametab.GlobalizationError _ | PretypeError (_,VarNotFound _)
(* unification errors *)
- | PretypeError(_,(CannotUnify _|CannotUnifyLocal _|CannotGeneralize _|NoOccurrenceFound _|
- CannotUnifyBindingType _|NotClean _)) -> true
+ | PretypeError(_,(CannotUnify _|CannotUnifyLocal _|CannotGeneralize _
+ |NoOccurrenceFound _|CannotUnifyBindingType _|NotClean _
+ |CannotFindWellTypedAbstraction _)) -> true
| _ -> false
(* Tells if the refiner should check that the submitted rules do not
@@ -277,8 +278,10 @@ let rec mk_refgoals sigma goal goalacc conclty trm =
| App (f,l) ->
let (acc',hdty) =
match kind_of_term f with
- | (Ind _ (* needed if defs in Type are polymorphic: | Const _*))
- when not (array_exists occur_meta l) (* we could be finer *) ->
+ | Ind _ | Const _
+ when not (array_exists occur_meta l) (* we could be finer *)
+ & (isInd f or Heads.has_inductive_head env f)
+ ->
(* Sort-polymorphism of definition and inductive types *)
goalacc,
type_of_global_reference_knowing_parameters env sigma f l