diff options
| author | Pierre-Marie Pédrot | 2016-06-13 20:13:10 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2016-06-13 20:13:10 +0200 |
| commit | cbb41129f15623ba5be50026f930e0435c9f5259 (patch) | |
| tree | a865d2dbdeb2bf628a863af8183741b6a55cc8bc /pretyping/pretype_errors.ml | |
| parent | 36f95a197b106b928a3fc99d7ee5904099a654e4 (diff) | |
| parent | bb43103f7ecea16e634d448215f24d6d55d56eb1 (diff) | |
Merge branch 'v8.5'
Diffstat (limited to 'pretyping/pretype_errors.ml')
| -rw-r--r-- | pretyping/pretype_errors.ml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pretyping/pretype_errors.ml b/pretyping/pretype_errors.ml index cf5b08c58f..b0715af734 100644 --- a/pretyping/pretype_errors.ml +++ b/pretyping/pretype_errors.ml @@ -14,15 +14,16 @@ open Type_errors type unification_error = | OccurCheck of existential_key * constr - | NotClean of existential * env * constr + | NotClean of existential * env * constr (* Constr is a variable not in scope *) | NotSameArgSize | NotSameHead | NoCanonicalStructure - | ConversionFailed of env * constr * constr + | ConversionFailed of env * constr * constr (* Non convertible closed terms *) | MetaOccurInBody of existential_key | InstanceNotSameType of existential_key * env * types * types | UnifUnivInconsistency of Univ.univ_inconsistency | CannotSolveConstraint of Evd.evar_constraint * unification_error + | ProblemBeyondCapabilities type position = (Id.t * Locus.hyp_location_flag) option |