diff options
| author |  herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2007-02-21 18:12:24 +0000 |
|---|---|---|
| committer | herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2007-02-21 18:12:24 +0000 |
| commit | 09ceaf1bac341c66c5d733f0358fc9b4b3dbad93 (patch) | |
| tree | 33a6a7847096425175d31ca826587d7f3ab7014a /pretyping | |
| parent | d5e2b54b22fcc4850888e0d04d9910fe78d6bbdb (diff) | |
Utilisation de l'environnement pour l'affichage de certains messages d'erreurs
+ petit nettoyage himsg.ml + petite uniformisation erreurs CannotUnify
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@9668 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'pretyping')
| -rw-r--r-- | pretyping/pretype_errors.ml | 6 | ||||
| -rw-r--r-- | pretyping/pretype_errors.mli | 4 | ||||
| -rw-r--r-- | pretyping/unification.ml | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pretyping/pretype_errors.ml b/pretyping/pretype_errors.ml index 1f2c2351f..4a0f12d66 100644 --- a/pretyping/pretype_errors.ml +++ b/pretyping/pretype_errors.ml @@ -27,7 +27,7 @@ type pretype_error = | NotClean of existential_key * constr * Evd.hole_kind | UnsolvableImplicit of Evd.hole_kind | CannotUnify of constr * constr - | CannotUnifyLocal of Environ.env * constr * constr * constr + | CannotUnifyLocal of constr * constr * constr | CannotUnifyBindingType of constr * constr | CannotGeneralize of constr | NoOccurrenceFound of constr @@ -158,8 +158,8 @@ let error_unsolvable_implicit loc env sigma e = let error_cannot_unify env sigma (m,n) = raise (PretypeError (env_ise sigma env,CannotUnify (m,n))) -let error_cannot_unify_local env sigma (e,m,n,sn) = - raise (PretypeError (env_ise sigma env,CannotUnifyLocal (e,m,n,sn))) +let error_cannot_unify_local env sigma (m,n,sn) = + raise (PretypeError (env_ise sigma env,CannotUnifyLocal (m,n,sn))) let error_cannot_coerce env sigma (m,n) = raise (PretypeError (env_ise sigma env,CannotUnify (m,n))) diff --git a/pretyping/pretype_errors.mli b/pretyping/pretype_errors.mli index 81a58dd20..3a2a2f7f4 100644 --- a/pretyping/pretype_errors.mli +++ b/pretyping/pretype_errors.mli @@ -29,7 +29,7 @@ type pretype_error = | NotClean of existential_key * constr * Evd.hole_kind | UnsolvableImplicit of Evd.hole_kind | CannotUnify of constr * constr - | CannotUnifyLocal of Environ.env * constr * constr * constr + | CannotUnifyLocal of constr * constr * constr | CannotUnifyBindingType of constr * constr | CannotGeneralize of constr | NoOccurrenceFound of constr @@ -97,7 +97,7 @@ val error_unsolvable_implicit : val error_cannot_unify : env -> Evd.evar_map -> constr * constr -> 'b -val error_cannot_unify_local : env -> Evd.evar_map -> Environ.env * constr * constr * constr -> 'b +val error_cannot_unify_local : env -> Evd.evar_map -> constr * constr * constr -> 'b (*s Ml Case errors *) diff --git a/pretyping/unification.ml b/pretyping/unification.ml index a70f0876b..b74eac9a5 100644 --- a/pretyping/unification.ml +++ b/pretyping/unification.ml @@ -130,12 +130,12 @@ let unify_0 env sigma cv_pb mod_delta m n = (* Here we check that [cN] does not contain any local variables *) if (closedn (nb_rel env) cN) then (k,cN,snd (extract_instance_status pb))::metasubst,evarsubst - else error_cannot_unify_local curenv sigma (curenv,m,n,cN) + else error_cannot_unify_local curenv sigma (m,n,cN) | _, Meta k -> (* Here we check that [cM] does not contain any local variables *) if (closedn (nb_rel env) cM) then (k,cM,fst (extract_instance_status pb))::metasubst,evarsubst - else error_cannot_unify_local curenv sigma (curenv,m,n,cM) + else error_cannot_unify_local curenv sigma (m,n,cM) | Evar _, _ -> metasubst,((cM,cN)::evarsubst) | _, Evar _ -> metasubst,((cN,cM)::evarsubst) | Lambda (na,t1,c1), Lambda (_,t2,c2) -> |