[MLton-commit] r6293

[Vesa Karvonen]

Using  ETAEXP'.

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

U   mltonlib/trunk/com/ssh/extended-basis/unstable/detail/io/reader.sml
U   mltonlib/trunk/com/ssh/extended-basis/unstable/detail/io/writer.sml
U   mltonlib/trunk/com/ssh/extended-basis/unstable/public/io/reader.sig
U   mltonlib/trunk/com/ssh/extended-basis/unstable/public/io/writer.sig

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

Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/io/reader.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/io/reader.sml	2007-12-29 13:05:29 UTC (rev 6292)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/io/reader.sml	2007-12-29 13:22:41 UTC (rev 6293)
@@ -11,11 +11,12 @@
 
    infix >>= <|>
 
-   type 'a monad_dom = Univ.t and 'a monad_cod = ('a * Univ.t) Option.t
+   type 'a etaexp_dom = Univ.t and 'a etaexp_cod = ('a * Univ.t) Option.t
+   type 'a etaexp = 'a etaexp_dom -> 'a etaexp_cod
 
    structure Monad =
       MkMonadP
-         (type 'a monad = 'a monad_dom -> 'a monad_cod
+         (type 'a monad = 'a etaexp
           fun return a s = SOME (a, s)
           fun aM >>= a2bM = Option.mapPartial (Fn.uncurry a2bM) o aM
           fun zero _ = NONE

Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/io/writer.sml
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/io/writer.sml	2007-12-29 13:05:29 UTC (rev 6292)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/io/writer.sml	2007-12-29 13:22:41 UTC (rev 6293)
@@ -9,8 +9,9 @@
 
    fun mapState (s2t, t2s) = Fn.map (Pair.map (Fn.id, s2t), t2s)
 
-   type 'a func_dom = 'a * Univ.t and 'a func_cod = Univ.t
-   type 'a func = 'a func_dom -> 'a func_cod
+   type 'a etaexp_dom = 'a * Univ.t and 'a etaexp_cod = Univ.t
+   type 'a etaexp = 'a etaexp_dom -> 'a etaexp_cod
+   type 'a func = 'a etaexp
    fun map b2a wA = wA o Pair.map (b2a, Fn.id)
 
    fun polymorphically uA2uB = let

Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/public/io/reader.sig
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/public/io/reader.sig	2007-12-29 13:05:29 UTC (rev 6292)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/public/io/reader.sig	2007-12-29 13:22:41 UTC (rev 6293)
@@ -12,8 +12,8 @@
 
    (** == Monad Interface == *)
 
-   type 'a monad_dom and 'a monad_cod
-   include MONADP_CORE where type 'a monad = 'a monad_dom -> 'a monad_cod
+   include ETAEXP'
+   include MONADP_CORE where type 'a monad = 'a etaexp
    structure Monad : MONADP where type 'a monad = 'a monad
 
    val polymorphically : ('a monad -> 'b monad) -> ('a, 's) t -> ('b, 's) t

Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/public/io/writer.sig
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/public/io/writer.sig	2007-12-29 13:05:29 UTC (rev 6292)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/public/io/writer.sig	2007-12-29 13:22:41 UTC (rev 6293)
@@ -12,8 +12,8 @@
 
    (** == Functor Interface == *)
 
-   type 'a func_dom and 'a func_cod
-   include CFUNC where type 'a func = 'a func_dom -> 'a func_cod
+   include ETAEXP'
+   include CFUNC where type 'a func = 'a etaexp
 
    val polymorphically : ('a func -> 'b func) -> ('a, 's) t -> ('b, 's) t
 end