From 33c3c3c0a2dd39d577e0295e70f10e9f9d3574cb Mon Sep 17 00:00:00 2001 From: Hugo Herbelin Date: Fri, 3 Oct 2014 13:54:39 +0200 Subject: Fixing #3634 (wrong env in "cannot instantiate because not in its scope" error message). --- pretyping/evarsolve.ml | 2 +- pretyping/pretype_errors.ml | 2 +- pretyping/pretype_errors.mli | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pretyping') diff --git a/pretyping/evarsolve.ml b/pretyping/evarsolve.ml index 94ec820297..621174aaa1 100644 --- a/pretyping/evarsolve.ml +++ b/pretyping/evarsolve.ml @@ -1532,7 +1532,7 @@ let solve_simple_eqn conv_algo ?(choose=false) env evd (pbty,(evk1,args1 as ev1) reconsider_conv_pbs conv_algo evd with | NotInvertibleUsingOurAlgorithm t -> - UnifFailure (evd,NotClean (ev1,t)) + UnifFailure (evd,NotClean (ev1,env,t)) | OccurCheckIn (evd,rhs) -> UnifFailure (evd,OccurCheck (evk1,rhs)) | MetaOccurInBodyInternal -> diff --git a/pretyping/pretype_errors.ml b/pretyping/pretype_errors.ml index cad0beabf3..e16d1206aa 100644 --- a/pretyping/pretype_errors.ml +++ b/pretyping/pretype_errors.ml @@ -14,7 +14,7 @@ open Type_errors type unification_error = | OccurCheck of existential_key * constr - | NotClean of existential * constr + | NotClean of existential * env * constr | NotSameArgSize | NotSameHead | NoCanonicalStructure diff --git a/pretyping/pretype_errors.mli b/pretyping/pretype_errors.mli index cc1443162c..b74ca19368 100644 --- a/pretyping/pretype_errors.mli +++ b/pretyping/pretype_errors.mli @@ -15,7 +15,7 @@ open Type_errors type unification_error = | OccurCheck of existential_key * constr - | NotClean of existential * constr + | NotClean of existential * env * constr | NotSameArgSize | NotSameHead | NoCanonicalStructure -- cgit v1.2.3