# HG changeset patch
# User wenzelm
# Date 1231603136 -3600
# Node ID 3f49ae779bddcbedabbce7da511403182e9a7cfc
# Parent  c42620170fa6b3662f7a7996f0be2981c2855894
remove_thy: perform PureThy.cancel_proofs;
schedule_futures: PureThy.join_proofs before after_load -- achieves parallel error messages;

diff -r c42620170fa6 -r 3f49ae779bdd src/Pure/Thy/thy_info.ML
--- a/src/Pure/Thy/thy_info.ML	Sat Jan 10 16:55:46 2009 +0100
+++ b/src/Pure/Thy/thy_info.ML	Sat Jan 10 16:58:56 2009 +0100
@@ -231,15 +231,31 @@
 end;
 
 
+(* manage pending proofs *)
+
+fun join_thy name =
+  (case lookup_theory name of
+    NONE => []
+  | SOME thy => PureThy.join_proofs thy);
+
+fun cancel_thy name =
+  (case lookup_theory name of
+    NONE => ()
+  | SOME thy => PureThy.cancel_proofs thy);
+
+
 (* remove theory *)
 
 fun remove_thy name =
   if is_finished name then error (loader_msg "cannot remove finished theory" [name])
   else
-    let val succs = thy_graph Graph.all_succs [name] in
-      priority (loader_msg "removing" succs);
-      CRITICAL (fn () => (List.app (perform Remove) succs; change_thys (Graph.del_nodes succs)))
-    end;
+    let
+      val succs = thy_graph Graph.all_succs [name];
+      val _ = List.app cancel_thy succs;
+      val _ = priority (loader_msg "removing" succs);
+      val _ = CRITICAL (fn () =>
+        (List.app (perform Remove) succs; change_thys (Graph.del_nodes succs)));
+    in () end;
 
 val kill_thy = if_known_thy remove_thy;
 
@@ -350,15 +366,15 @@
 
     val futures = fold fork tasks Symtab.empty;
 
-    val exns = tasks |> maps (fn (name, _) =>
+    val exns = rev tasks |> maps (fn (name, _) =>
       let
         val after_load = Future.join (the (Symtab.lookup futures name));
+        val proof_exns = join_thy name;
+        val _ = null proof_exns orelse raise Exn.EXCEPTIONS proof_exns;
         val _ = after_load ();
-        val proof_exns = PureThy.join_proofs (get_theory name);
-        val _ = null proof_exns orelse raise Exn.EXCEPTIONS proof_exns;
       in [] end handle exn => (kill_thy name; [exn]));
 
-  in ignore (Exn.release_all (map Exn.Exn exns)) end;
+  in ignore (Exn.release_all (map Exn.Exn (rev exns))) end;
 
 fun schedule_seq tasks =
   Graph.topological_order tasks