aboutsummaryrefslogtreecommitdiffhomepage
path: root/checker/checker.ml
diff options
context:
space:
mode:
authorGravatar ppedrot <ppedrot@85f007b7-540e-0410-9357-904b9bb8a0f7>2012-06-02 13:52:31 +0000
committerGravatar ppedrot <ppedrot@85f007b7-540e-0410-9357-904b9bb8a0f7>2012-06-02 13:52:31 +0000
commitde9e40dc84d1e4cfc201eb196659d6b04a7012ec (patch)
tree6a24553f3391adeb45a9c7e839711226faed4c1a /checker/checker.ml
parenta92a0d051b987ba996905ccd4ce7ee3a5feb41c1 (diff)
Flushing formatters before program exit.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@15415 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'checker/checker.ml')
-rw-r--r--checker/checker.ml21
1 files changed, 11 insertions, 10 deletions
diff --git a/checker/checker.ml b/checker/checker.ml
index 848fd22f4..53c059eb3 100644
--- a/checker/checker.ml
+++ b/checker/checker.ml
@@ -16,6 +16,11 @@ open Names
open Term
open Check
+let () = at_exit flush_all
+
+let fatal_error info =
+ pperrnl info; flush_all (); exit 1
+
let coq_root = id_of_string "Coq"
let parse_dir s =
let len = String.length s in
@@ -292,7 +297,7 @@ let parse_args argv =
| "-coqlib" :: s :: rem ->
if not (exists_dir s) then
- (pperrnl (str ("Directory '"^s^"' does not exist")); exit 1);
+ fatal_error (str ("Directory '"^s^"' does not exist"));
Flags.coqlib := s;
Flags.coqlib_spec := true;
parse rem
@@ -332,7 +337,7 @@ let parse_args argv =
Flags.make_silent true; parse rem
| s :: _ when s<>"" && s.[0]='-' ->
- pperrnl (str "Unknown option " ++ str s); exit 1
+ fatal_error (str "Unknown option " ++ str s)
| s :: rem -> add_compile s; parse rem
in
try
@@ -342,9 +347,9 @@ let parse_args argv =
try
Stream.empty s; exit 1
with Stream.Failure ->
- pperrnl (explain_exn e); exit 1
+ fatal_error (explain_exn e)
end
- | e -> begin pperrnl (explain_exn e); exit 1 end
+ | e -> begin fatal_error (explain_exn e) end
(* To prevent from doing the initialization twice *)
@@ -360,9 +365,7 @@ let init_with_argv argv =
init_load_path ();
engage ();
with e ->
- flush_all();
- pperrnl (str "Error during initialization :" ++ (explain_exn e));
- exit 1
+ fatal_error (str "Error during initialization :" ++ (explain_exn e))
end
let init() = init_with_argv Sys.argv
@@ -372,8 +375,6 @@ let run () =
compile_files ();
flush_all()
with e ->
- (Pp.ppnl(explain_exn e);
- flush_all();
- exit 1)
+ fatal_error (explain_exn e)
let start () = init(); run(); Check_stat.stats(); exit 0