diff options
| author | Alain Frisch <alain@frisch.fr> | 2013-09-12 14:45:03 +0000 |
|---|---|---|
| committer | Alain Frisch <alain@frisch.fr> | 2013-09-12 14:45:03 +0000 |
| commit | 884ca00fdfc1fe5f6165fbb847c6744a47fb59d2 (patch) | |
| tree | bd64e49f3c3a449e41120b0e3508e120986ceab0 /driver | |
| parent | 8660e346df9c4b9bb5db38d5c91689f8a6ad906c (diff) | |
| download | ocaml-884ca00fdfc1fe5f6165fbb847c6744a47fb59d2.tar.gz | |
Continue cleanup. driver/errors.ml is no longer needed.
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/exception_registration@14120 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/errors.ml | 17 | ||||
| -rw-r--r-- | driver/main.ml | 2 | ||||
| -rw-r--r-- | driver/opterrors.ml | 1 |
3 files changed, 2 insertions, 18 deletions
diff --git a/driver/errors.ml b/driver/errors.ml index 4f8a4eb3e4..cb1a047ec6 100644 --- a/driver/errors.ml +++ b/driver/errors.ml @@ -10,19 +10,4 @@ (* *) (***********************************************************************) -(* WARNING: if you change something in this file, you must look at - opterrors.ml and ocamldoc/odoc_analyse.ml - to see if you need to make the same changes there. -*) - -open Format - -(* Report an error *) - -let report_error ppf exn = - let report ppf x = - match Location.error_of_exn x with - | Some err -> Location.report_error ppf err - | None -> fprintf ppf "@]"; raise x - in - fprintf ppf "@[%a@]@." report exn +let report_error = Location.report_exception diff --git a/driver/main.ml b/driver/main.ml index 4ab251c7f6..d038af75a5 100644 --- a/driver/main.ml +++ b/driver/main.ml @@ -184,7 +184,7 @@ let main () = end; exit 0 with x -> - Errors.report_error ppf x; + Location.report_exception ppf x; exit 2 let _ = main () diff --git a/driver/opterrors.ml b/driver/opterrors.ml index d516707db3..68279bff6e 100644 --- a/driver/opterrors.ml +++ b/driver/opterrors.ml @@ -40,5 +40,4 @@ let report_error ppf exn = | Some err -> Location.report_error ppf err | None -> fprintf ppf "@]"; raise x in - fprintf ppf "@[%a@]@." report exn |
