diff options
Diffstat (limited to 'pretyping')
| -rw-r--r-- | pretyping/cases.ml | 4 | ||||
| -rw-r--r-- | pretyping/pretype_errors.ml | 3 | ||||
| -rw-r--r-- | pretyping/typeclasses_errors.ml | 7 |
3 files changed, 5 insertions, 9 deletions
diff --git a/pretyping/cases.ml b/pretyping/cases.ml index 2910774db6..358cc2f034 100644 --- a/pretyping/cases.ml +++ b/pretyping/cases.ml @@ -69,9 +69,7 @@ let rec list_try_compile f = function | [] -> anomaly (str "try_find_f") | h::t -> try f h - with UserError _ | TypeError _ | PretypeError _ | PatternMatchingError _ - | Loc.Exc_located - (_, (UserError _ | TypeError _ | PretypeError _ | PatternMatchingError _)) -> + with UserError _ | TypeError _ | PretypeError _ | PatternMatchingError _ -> list_try_compile f t let force_name = diff --git a/pretyping/pretype_errors.ml b/pretyping/pretype_errors.ml index 5403c1e99e..91d24ec698 100644 --- a/pretyping/pretype_errors.ml +++ b/pretyping/pretype_errors.ml @@ -53,8 +53,7 @@ exception PretypeError of env * Evd.evar_map * pretype_error let precatchable_exception = function | Errors.UserError _ | TypeError _ | PretypeError _ - | Loc.Exc_located(_,(Errors.UserError _ | TypeError _ | - Nametab.GlobalizationError _ | PretypeError _)) -> true + | Nametab.GlobalizationError _ -> true | _ -> false (* This simplifies the typing context of Cases clauses *) diff --git a/pretyping/typeclasses_errors.ml b/pretyping/typeclasses_errors.ml index cfcf9cf43f..d0d90017fd 100644 --- a/pretyping/typeclasses_errors.ml +++ b/pretyping/typeclasses_errors.ml @@ -39,14 +39,13 @@ let unsatisfiable_constraints env evd ev = | None -> raise (TypeClassError (env, UnsatisfiableConstraints (evd, None))) | Some ev -> - let loc, kind = Evd.evar_source ev evd in - raise (Loc.Exc_located (loc, TypeClassError - (env, UnsatisfiableConstraints (evd, Some (ev, kind))))) + let loc, kind = Evd.evar_source ev evd in + let err = TypeClassError (env, UnsatisfiableConstraints (evd, Some (ev, kind))) in + Loc.raise loc err let mismatched_ctx_inst env c n m = typeclass_error env (MismatchedContextInstance (c, n, m)) let rec unsatisfiable_exception exn = match exn with | TypeClassError (_, UnsatisfiableConstraints _) -> true - | Loc.Exc_located(_, e) -> unsatisfiable_exception e | _ -> false |