# HG changeset patch
# User webertj
# Date 1138304535 -3600
# Node ID 418131f631fc57b95811c87663b4f5ece996158b
# Parent  8a5c6fc3ad27aff41d3930cc06892573a0bdcd00
interrupt_timeout now raises Interrupt instead of SML90.Interrupt

diff -r 8a5c6fc3ad27 -r 418131f631fc src/Pure/ML-Systems/smlnj-interrupt-timeout.ML
--- a/src/Pure/ML-Systems/smlnj-interrupt-timeout.ML	Thu Jan 26 20:17:54 2006 +0100
+++ b/src/Pure/ML-Systems/smlnj-interrupt-timeout.ML	Thu Jan 26 20:42:15 2006 +0100
@@ -8,4 +8,4 @@
 
 fun interrupt_timeout time f x =
   TimeLimit.timeLimit time f x
-    handle TimeLimit.TimeOut => raise SML90.Interrupt;
+    handle TimeLimit.TimeOut => raise Interrupt;
diff -r 8a5c6fc3ad27 -r 418131f631fc src/Pure/ML-Systems/smlnj.ML
--- a/src/Pure/ML-Systems/smlnj.ML	Thu Jan 26 20:17:54 2006 +0100
+++ b/src/Pure/ML-Systems/smlnj.ML	Thu Jan 26 20:42:15 2006 +0100
@@ -59,11 +59,6 @@
 | _ => use "ML-Systems/cpu-timer-gc.ML");
 
 
-(* bounded time execution *)
-
-use "ML-Systems/smlnj-interrupt-timeout.ML";
-
-
 (*prompts*)
 fun ml_prompts p1 p2 =
   (Compiler.Control.primaryPrompt := p1; Compiler.Control.secondaryPrompt := p2);
@@ -108,7 +103,6 @@
   end;
 
 
-
 (** interrupts **)
 
 exception Interrupt;
@@ -151,6 +145,12 @@
 | _ => ());
 
 
+
+(* bounded time execution *)
+
+use "ML-Systems/smlnj-interrupt-timeout.ML";
+
+
 (** Signal handling: emulation of the Poly/ML Signal structure. Note that types
     Posix.Signal.signal and Signals.signal differ **)