From 8aa2e600d375caffef47058f1d095777a0dfdbb0 Mon Sep 17 00:00:00 2001
From: letouzey
Date: Tue, 12 Mar 2013 23:59:28 +0000
Subject: Restrict (try...with...) to avoid catching critical exn (part 1)

 Why? : avoid catching (and probably ignoring) exceptions
 such as Sys.Break, anomalies, assertions, leading to undetected
 bugs and ignored Ctrl-C.

 How? : when the precise exception(s) concerned by the try is
 known, use them explicitely in the "with". Otherwise, let's use
 the pattern "with e when Errors.noncritical e -> "

 Particular case : when an exception is catched and reraised
 immediately after some adjustments, we leave it untouched.
 Simply, for easily identifying these situations later, the name
 of the exception variable is changed to "reraise".

 Please also adopt this coding style. Automatic checks based
 on the "mascot" tool of X. Clerc will be runned regularly.
 If you want to avoid to check a particular try...with, use
 the variable name "any" after the "with".

 All these changes have been tested using the standard library
 and the test-suite, but unfortunately this is far from ensuring
 that coqtop behaves as before. We'll see after the nightly bench...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16276 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 checker/check.ml | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'checker/check.ml')

diff --git a/checker/check.ml b/checker/check.ml
index c3f0e976fc..88306e2148 100644
--- a/checker/check.ml
+++ b/checker/check.ml
@@ -234,28 +234,29 @@ let locate_qualified_library qid =
       (dir, file)
   with Not_found -> raise LibNotFound
 
-let explain_locate_library_error qid = function
-  | LibUnmappedDir ->
-      let prefix = qid.dirpath in
-      errorlabstrm "load_absolute_library_from"
-      (str "Cannot load " ++ pr_path qid ++ str ":" ++ spc () ++
-      str "no physical path bound to" ++ spc () ++ pr_dirlist prefix ++ fnl ())
-  | LibNotFound ->
-      errorlabstrm "load_absolute_library_from"
-      (str"Cannot find library " ++ pr_path qid ++ str" in loadpath")
-  | e -> raise e
+let error_unmapped_dir qid =
+  let prefix = qid.dirpath in
+  errorlabstrm "load_absolute_library_from"
+    (str "Cannot load " ++ pr_path qid ++ str ":" ++ spc () ++
+     str "no physical path bound to" ++ spc () ++ pr_dirlist prefix ++ fnl ())
+
+let error_lib_not_found qid =
+  errorlabstrm "load_absolute_library_from"
+    (str"Cannot find library " ++ pr_path qid ++ str" in loadpath")
 
 let try_locate_absolute_library dir =
   try
     locate_absolute_library dir
-  with e ->
-    explain_locate_library_error (path_of_dirpath dir) e
+  with
+    | LibUnmappedDir -> error_unmapped_dir (path_of_dirpath dir)
+    | LibNotFound -> error_lib_not_found (path_of_dirpath dir)
 
 let try_locate_qualified_library qid =
   try
     locate_qualified_library qid
-  with e ->
-    explain_locate_library_error qid e
+  with
+    | LibUnmappedDir -> error_unmapped_dir qid
+    | LibNotFound -> error_lib_not_found qid
 
 (************************************************************************)
 (*s Low-level interning/externing of libraries to files *)
-- 
cgit v1.2.3