- amelioration des messages d'erreur de la condition de garde

- restructuration de clenv.ml


git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@3455 85f007b7-540e-0410-9357-904b9bb8a0f7

1 files changed, 5 insertions, 5 deletions

diff --git a/kernel/type_errors.ml b/kernel/type_errors.ml
index fc98a2ef16..f37a6cb031 100644
--- a/kernel/type_errors.ml
+++ b/kernel/type_errors.ml
@@ -20,8 +20,8 @@ type guard_error =
   (* Fixpoints *)
   | NotEnoughAbstractionInFixBody
   | RecursionNotOnInductiveType
-  | RecursionOnIllegalTerm
-  | NotEnoughArgumentsForFixCall
+  | RecursionOnIllegalTerm of int * constr * int list * int list
+  | NotEnoughArgumentsForFixCall of int
   (* CoFixpoints *)
   | CodomainNotInductiveType of constr
   | NestedRecursiveOccurrences
@@ -56,7 +56,7 @@ type type_error =
   | CantApplyBadType of
       (int * constr * constr) * unsafe_judgment * unsafe_judgment array
   | CantApplyNonFunctional of unsafe_judgment * unsafe_judgment array
-  | IllFormedRecBody of guard_error * name array * int * constr array
+  | IllFormedRecBody of guard_error * name array * int
   | IllTypedRecBody of
       int * name array * unsafe_judgment array * types array
 
@@ -105,8 +105,8 @@ let error_cant_apply_not_functional env rator randl =
 let error_cant_apply_bad_type env t rator randl =
   raise(TypeError (env, CantApplyBadType (t,rator,randl)))
 
-let error_ill_formed_rec_body env why lna i vdefs =
-  raise (TypeError (env, IllFormedRecBody (why,lna,i,vdefs)))
+let error_ill_formed_rec_body env why lna i =
+  raise (TypeError (env, IllFormedRecBody (why,lna,i)))
 
 let error_ill_typed_rec_body env i lna vdefj vargs =
   raise (TypeError (env, IllTypedRecBody (i,lna,vdefj,vargs)))