[MLton-commit] r5377

[Vesa Karvonen]

Fixed.
----------------------------------------------------------------------

U   mltonlib/trunk/com/ssh/misc-util/unstable/qc-test-example.sml
U   mltonlib/trunk/com/ssh/misc-util/unstable/sorted-list-test.sml
U   mltonlib/trunk/com/ssh/misc-util/unstable/unit-test.sml

----------------------------------------------------------------------

Modified: mltonlib/trunk/com/ssh/misc-util/unstable/qc-test-example.sml
===================================================================
--- mltonlib/trunk/com/ssh/misc-util/unstable/qc-test-example.sml	2007-03-01 17:23:07 UTC (rev 5376)
+++ mltonlib/trunk/com/ssh/misc-util/unstable/qc-test-example.sml	2007-03-01 17:26:26 UTC (rev 5377)
@@ -32,7 +32,7 @@
        let
           val l = list int
        in
-          withGen (RanQD1Gen.map stableSort (arbitrary l)) l
+          withGen (RanQD1Gen.Monad.map stableSort (arbitrary l)) l
        end
 
    (* Note that one can (of course) make local auxiliary definitions, like

Modified: mltonlib/trunk/com/ssh/misc-util/unstable/sorted-list-test.sml
===================================================================
--- mltonlib/trunk/com/ssh/misc-util/unstable/sorted-list-test.sml	2007-03-01 17:23:07 UTC (rev 5376)
+++ mltonlib/trunk/com/ssh/misc-util/unstable/sorted-list-test.sml	2007-03-01 17:26:26 UTC (rev 5377)
@@ -25,7 +25,7 @@
    val sortedList = let
       val l = list int
    in
-      fn #? => withGen (RanQD1Gen.map (stableSort #?) (arbitrary l)) l
+      fn #? => withGen (RanQD1Gen.Monad.map (stableSort #?) (arbitrary l)) l
    end
 
    fun revPartition3Way c = let

Modified: mltonlib/trunk/com/ssh/misc-util/unstable/unit-test.sml
===================================================================
--- mltonlib/trunk/com/ssh/misc-util/unstable/unit-test.sml	2007-03-01 17:23:07 UTC (rev 5376)
+++ mltonlib/trunk/com/ssh/misc-util/unstable/unit-test.sml	2007-03-01 17:26:26 UTC (rev 5377)
@@ -194,7 +194,7 @@
       local
          open Maybe
          val I = I.fromString
-         val cols = sum [S"-w"@`I, L"--width"@`I, E"COLUMNS"@`I, `70]
+         val cols = Monad.sum [S"-w"@`I, L"--width"@`I, E"COLUMNS"@`I, `70]
       in
          val println = println TextIO.stdOut (get cols)
       end
@@ -428,13 +428,13 @@
    fun skip _ _ = (NONE, [], [])
 
    fun classify tOpt p =
-       G.map (fn p as (r, ts, msg) =>
-                   case tOpt & r of
-                      NONE & _ => p
-                    | _ & NONE => p
-                    | SOME t & _ => (r, t::ts, msg)) p
+       G.Monad.map (fn p as (r, ts, msg) =>
+                       case tOpt & r of
+                          NONE & _ => p
+                        | _ & NONE => p
+                        | SOME t & _ => (r, t::ts, msg)) p
    fun trivial b = classify (if b then SOME "trivial" else NONE)
 
    fun collect t v p =
-       G.map (fn (r, ts, msg) => (r, pretty NONE (layout t v)::ts, msg)) p
+       G.Monad.map (fn (r, ts, msg) => (r, pretty NONE (layout t v)::ts, msg)) p
 end