From ae6c95a3755fc3a9434bcc9fdd81b7c69baa8280 Mon Sep 17 00:00:00 2001
From: herbelin
Date: Sat, 17 Dec 2005 21:13:48 +0000
Subject: Création d'un type d'erreur RecursionSchemeError distinct de
 InductiveError et suite correction bug #1028

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@7660 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 proofs/logic.ml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'proofs')

diff --git a/proofs/logic.ml b/proofs/logic.ml
index 26848802e2..ee9959a695 100644
--- a/proofs/logic.ml
+++ b/proofs/logic.ml
@@ -46,19 +46,16 @@ exception RefinerError of refiner_error
 
 open Pretype_errors
 
-let catchable_exception = function
-  | Util.UserError _ | TypeError _ | RefinerError _
+let rec catchable_exception = function
+  | Stdpp.Exc_located(_,e) -> catchable_exception e
+  | Util.UserError _ | TypeError _ 
+  | RefinerError _ | Indrec.RecursionSchemeError _
+  | Nametab.GlobalizationError _ | PretypeError (_,VarNotFound _)
   (* unification errors *)
   | PretypeError(_,(CannotUnify _|CannotGeneralize _|NoOccurrenceFound _|
-      CannotUnifyBindingType _|NotClean _))
-  | Stdpp.Exc_located(_,PretypeError(_,(CannotUnify _|CannotGeneralize _|
-          NoOccurrenceFound _ | CannotUnifyBindingType _|NotClean _)))
-  | Stdpp.Exc_located(_,(Util.UserError _ | TypeError _ | RefinerError _ |
-    Nametab.GlobalizationError _ | PretypeError (_,VarNotFound _)
-    | Indtypes.InductiveError (Indtypes.NotAllowedCaseAnalysis _ )))-> true
+      CannotUnifyBindingType _|NotClean _)) -> true
   | _ -> false
 
-
 (* Tells if the refiner should check that the submitted rules do not
    produce invalid subgoals *)
 let check = ref false
-- 
cgit v1.2.3