aboutsummaryrefslogtreecommitdiffhomepage
path: root/library/summary.ml
diff options
context:
space:
mode:
authorGravatar Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr>2014-12-03 20:34:09 +0100
committerGravatar Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr>2014-12-16 13:15:12 +0100
commitbff51607cfdda137d7bc55d802895d7f794d5768 (patch)
tree1a159136a88ddc6561b814fb4ecbacdf9de0dd70 /library/summary.ml
parent37ed28dfe253615729763b5d81a533094fb5425e (diff)
Getting rid of Exninfo hacks.
Instead of modifying exceptions to wear additional information, we instead use a dedicated type now. All exception-using functions were modified to support this new type, in particular Future's fix_exn-s and the tactic monad. To solve the problem of enriching exceptions at raise time and recover this data in the try-with handler, we use a global datastructure recording the given piece of data imperatively that we retrieve in the try-with handler. We ensure that such instrumented try-with destroy the data so that there may not be confusion with another exception. To further harden the correction of this structure, we also check for pointer equality with the last raised exception. The global data structure is not thread-safe for now, which is incorrect as the STM uses threads and enriched exceptions. Yet, we splitted the patch in two parts, so that we do not introduce dependencies to the Thread library immediatly. This will allow to revert only the second patch if ever we switch to OCaml-coded lightweight threads.
Diffstat (limited to 'library/summary.ml')
-rw-r--r--library/summary.ml6
1 files changed, 3 insertions, 3 deletions
diff --git a/library/summary.ml b/library/summary.ml
index 96b9d0691..7a0064a1f 100644
--- a/library/summary.ml
+++ b/library/summary.ml
@@ -105,8 +105,8 @@ let unfreeze_summaries fs =
with e when Errors.noncritical e ->
let e = Errors.push e in
Printf.eprintf "Error unfrezing summay %s\n%s\n%!"
- (name_of_summary id) (Pp.string_of_ppcmds (Errors.print e));
- raise e
+ (name_of_summary id) (Pp.string_of_ppcmds (Errors.iprint e));
+ iraise e
in
(** We rely on the order of the frozen list, and the order of folding *)
ignore (Int.Map.fold_left fold !summaries fs.summaries)
@@ -147,7 +147,7 @@ let unfreeze_summary datas =
with e ->
let e = Errors.push e in
prerr_endline ("Exception unfreezing " ^ name);
- raise e)
+ iraise e)
datas
(** All-in-one reference declaration + registration *)