# HG changeset patch
# User blanchet
# Date 1284571354 -7200
# Node ID 126b879df3195561e4189e5cf3250cc6e894b0c8
# Parent  b42d9885c12962127bb6c45b1d00ee830f443b7e
move "CRITICAL" to "PortableXxx", where it belongs and used to be;
now that it is no longer used in "Random.sml"

diff -r b42d9885c129 -r 126b879df319 src/Tools/Metis/metis.ML
--- a/src/Tools/Metis/metis.ML	Wed Sep 15 18:52:37 2010 +0200
+++ b/src/Tools/Metis/metis.ML	Wed Sep 15 19:22:34 2010 +0200
@@ -29,8 +29,6 @@
 
 signature Metis_Random =
 sig
-  val CRITICAL: (unit -> 'a) -> 'a (* MODIFIED by Jasmin Blanchette *)
-
   val nextWord : unit -> word
 
   val nextBool : unit -> bool
@@ -54,9 +52,6 @@
 structure Metis_Random :> Metis_Random =
 struct
 
-(* MODIFIED by Jasmin Blanchette *)
-fun CRITICAL e = NAMED_CRITICAL "metis" e;
-
 (* random words: 0w0 <= result <= max_word *)
 
 (*minimum length of unboxed words on all supported ML platforms*)
@@ -124,6 +119,13 @@
 val time : ('a -> 'b) -> 'a -> 'b
 
 (* ------------------------------------------------------------------------- *)
+(* Critical section markup (multiprocessing)                                 *)
+(* ------------------------------------------------------------------------- *)
+
+(* MODIFIED by Jasmin Blanchette *)
+val CRITICAL: (unit -> 'a) -> 'a
+
+(* ------------------------------------------------------------------------- *)
 (* Generating random values.                                                 *)
 (* ------------------------------------------------------------------------- *)
 
@@ -197,6 +199,13 @@
       y
     end;
 
+(* ------------------------------------------------------------------------- *)
+(* Critical section markup (multiprocessing)                                 *)
+(* ------------------------------------------------------------------------- *)
+
+(* MODIFIED by Jasmin Blanchette *)
+fun CRITICAL e = NAMED_CRITICAL "metis" e;
+
 
 (* ------------------------------------------------------------------------- *)
 (* Generating random values.                                                 *)
diff -r b42d9885c129 -r 126b879df319 src/Tools/Metis/src/Portable.sig
--- a/src/Tools/Metis/src/Portable.sig	Wed Sep 15 18:52:37 2010 +0200
+++ b/src/Tools/Metis/src/Portable.sig	Wed Sep 15 19:22:34 2010 +0200
@@ -25,6 +25,13 @@
 val time : ('a -> 'b) -> 'a -> 'b
 
 (* ------------------------------------------------------------------------- *)
+(* Critical section markup (multiprocessing)                                 *)
+(* ------------------------------------------------------------------------- *)
+
+(* MODIFIED by Jasmin Blanchette *)
+val CRITICAL: (unit -> 'a) -> 'a
+
+(* ------------------------------------------------------------------------- *)
 (* Generating random values.                                                 *)
 (* ------------------------------------------------------------------------- *)
 
diff -r b42d9885c129 -r 126b879df319 src/Tools/Metis/src/PortableMlton.sml
--- a/src/Tools/Metis/src/PortableMlton.sml	Wed Sep 15 18:52:37 2010 +0200
+++ b/src/Tools/Metis/src/PortableMlton.sml	Wed Sep 15 19:22:34 2010 +0200
@@ -57,6 +57,13 @@
     end;
 
 (* ------------------------------------------------------------------------- *)
+(* Critical section markup (multiprocessing)                                 *)
+(* ------------------------------------------------------------------------- *)
+
+(* MODIFIED by Jasmin Blanchette *)
+fun CRITICAL e = e ();     (*dummy*)
+
+(* ------------------------------------------------------------------------- *)
 (* Generating random values.                                                 *)
 (* ------------------------------------------------------------------------- *)
 
diff -r b42d9885c129 -r 126b879df319 src/Tools/Metis/src/PortableMosml.sml
--- a/src/Tools/Metis/src/PortableMosml.sml	Wed Sep 15 18:52:37 2010 +0200
+++ b/src/Tools/Metis/src/PortableMosml.sml	Wed Sep 15 19:22:34 2010 +0200
@@ -29,6 +29,13 @@
 val time = Mosml.time;
 
 (* ------------------------------------------------------------------------- *)
+(* Critical section markup (multiprocessing)                                 *)
+(* ------------------------------------------------------------------------- *)
+
+(* MODIFIED by Jasmin Blanchette *)
+fun CRITICAL e = e ();     (*dummy*)
+
+(* ------------------------------------------------------------------------- *)
 (* Generating random values.                                                 *)
 (* ------------------------------------------------------------------------- *)
 
diff -r b42d9885c129 -r 126b879df319 src/Tools/Metis/src/PortablePolyml.sml
--- a/src/Tools/Metis/src/PortablePolyml.sml	Wed Sep 15 18:52:37 2010 +0200
+++ b/src/Tools/Metis/src/PortablePolyml.sml	Wed Sep 15 19:22:34 2010 +0200
@@ -56,6 +56,13 @@
       y
     end;
 
+(* ------------------------------------------------------------------------- *)
+(* Critical section markup (multiprocessing)                                 *)
+(* ------------------------------------------------------------------------- *)
+
+(* MODIFIED by Jasmin Blanchette *)
+fun CRITICAL e = NAMED_CRITICAL "metis" e;
+
 
 (* ------------------------------------------------------------------------- *)
 (* Generating random values.                                                 *)
diff -r b42d9885c129 -r 126b879df319 src/Tools/Metis/src/Random.sig
--- a/src/Tools/Metis/src/Random.sig	Wed Sep 15 18:52:37 2010 +0200
+++ b/src/Tools/Metis/src/Random.sig	Wed Sep 15 19:22:34 2010 +0200
@@ -8,8 +8,6 @@
 
 signature Random =
 sig
-  val CRITICAL: (unit -> 'a) -> 'a (* MODIFIED by Jasmin Blanchette *)
-
   val nextWord : unit -> word
 
   val nextBool : unit -> bool
diff -r b42d9885c129 -r 126b879df319 src/Tools/Metis/src/Random.sml
--- a/src/Tools/Metis/src/Random.sml	Wed Sep 15 18:52:37 2010 +0200
+++ b/src/Tools/Metis/src/Random.sml	Wed Sep 15 19:22:34 2010 +0200
@@ -9,9 +9,6 @@
 structure Random :> Random =
 struct
 
-(* MODIFIED by Jasmin Blanchette *)
-fun CRITICAL e = NAMED_CRITICAL "metis" e;
-
 (* random words: 0w0 <= result <= max_word *)
 
 (*minimum length of unboxed words on all supported ML platforms*)