From 4d30972530c4ea6792f0c6e47c355a00e3b8c924 Mon Sep 17 00:00:00 2001
From: herbelin
Date: Sun, 11 Jan 2009 20:11:18 +0000
Subject: - Deactivation of dynamic loading on Mac OS 10.5 (see bug #2024). -
 Added dependency of mltop.ml4 into config/Makefile (see bug #2023). - Fixed
 bug #1963 (dependent inversion building a universe-ill-formed   conversion
 problem). - Incidentally, moved "Large non-propositional inductive ..." error
   message to standard himsg.ml error displayer.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@11774 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 kernel/indtypes.ml  | 3 ++-
 kernel/indtypes.mli | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'kernel')

diff --git a/kernel/indtypes.ml b/kernel/indtypes.ml
index 3452be55c3..4aac096fc4 100644
--- a/kernel/indtypes.ml
+++ b/kernel/indtypes.ml
@@ -46,6 +46,7 @@ type inductive_error =
   | SameNamesOverlap of identifier list
   | NotAnArity of identifier
   | BadEntry
+  | LargeNonPropInductiveNotInType
 
 exception InductiveError of inductive_error
 
@@ -269,7 +270,7 @@ let typecheck_inductive env mie =
       | Prop Pos when engagement env <> Some ImpredicativeSet ->
 	  (* Predicative set: check that the content is indeed predicative *)
 	  if not (is_type0m_univ lev) & not (is_type0_univ lev) then
-	    error "Large non-propositional inductive types must be in Type.";
+	    raise (InductiveError LargeNonPropInductiveNotInType);
 	  Inl (info,full_arity,s), cst
       | Prop _ ->
 	  Inl (info,full_arity,s), cst in
diff --git a/kernel/indtypes.mli b/kernel/indtypes.mli
index 5a583bcb13..0cbe15034d 100644
--- a/kernel/indtypes.mli
+++ b/kernel/indtypes.mli
@@ -33,6 +33,7 @@ type inductive_error =
   | SameNamesOverlap of identifier list
   | NotAnArity of identifier
   | BadEntry
+  | LargeNonPropInductiveNotInType
 
 exception InductiveError of inductive_error
 
-- 
cgit v1.2.3