[MLton-commit] r5615

[Vesa Karvonen]

Renamed numConsecutiveAlts -> numAlts.
----------------------------------------------------------------------

U   mltonlib/trunk/com/ssh/generic/unstable/detail/value/arbitrary.sml
U   mltonlib/trunk/com/ssh/generic/unstable/detail/value/type-info.sml
U   mltonlib/trunk/com/ssh/generic/unstable/public/value/type-info.sig

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

Modified: mltonlib/trunk/com/ssh/generic/unstable/detail/value/arbitrary.sml
===================================================================
--- mltonlib/trunk/com/ssh/generic/unstable/detail/value/arbitrary.sml	2007-06-11 19:55:17 UTC (rev 5614)
+++ mltonlib/trunk/com/ssh/generic/unstable/detail/value/arbitrary.sml	2007-06-11 20:07:23 UTC (rev 5615)
@@ -99,8 +99,8 @@
                  let
                     val aGen = map INL aGen
                     val bGen = map INR bGen
-                    val gen = G.frequency [(Arg.numConsecutiveAlts a, aGen),
-                                           (Arg.numConsecutiveAlts b, bGen)]
+                    val gen = G.frequency [(Arg.numAlts a, aGen),
+                                           (Arg.numAlts b, bGen)]
                     val gen0 =
                         case Arg.hasBaseCase a & Arg.hasBaseCase b of
                            true & false => aGen

Modified: mltonlib/trunk/com/ssh/generic/unstable/detail/value/type-info.sml
===================================================================
--- mltonlib/trunk/com/ssh/generic/unstable/detail/value/type-info.sml	2007-06-11 19:55:17 UTC (rev 5614)
+++ mltonlib/trunk/com/ssh/generic/unstable/detail/value/type-info.sml	2007-06-11 20:07:23 UTC (rev 5615)
@@ -154,7 +154,7 @@
    fun canBeCyclic ? = (isRefOrArray andAlso (hasExn orElse hasRecData)) ?
 
    fun outS (INS r, _) = r
-   fun numConsecutiveAlts ? = (#alts o outS) ?
+   fun numAlts ? = (#alts o outS) ?
    fun hasBaseCase ? = (#base o outS) ?
 end
 
@@ -163,11 +163,11 @@
    open TypeInfo Joined
    structure TypeInfo = Rep
    fun mk f = f o Outer.Rep.getT
-   val canBeCyclic        = fn ? => mk canBeCyclic        ?
-   val hasExn             = fn ? => mk hasExn             ?
-   val hasRecData         = fn ? => mk hasRecData         ?
-   val isRefOrArray       = fn ? => mk isRefOrArray       ?
+   val canBeCyclic  = fn ? => mk canBeCyclic  ?
+   val hasExn       = fn ? => mk hasExn       ?
+   val hasRecData   = fn ? => mk hasRecData   ?
+   val isRefOrArray = fn ? => mk isRefOrArray ?
    fun mk f = f o Outer.Rep.getS
-   val hasBaseCase        = fn ? => mk hasBaseCase        ?
-   val numConsecutiveAlts = fn ? => mk numConsecutiveAlts ?
+   val hasBaseCase  = fn ? => mk hasBaseCase  ?
+   val numAlts      = fn ? => mk numAlts      ?
 end

Modified: mltonlib/trunk/com/ssh/generic/unstable/public/value/type-info.sig
===================================================================
--- mltonlib/trunk/com/ssh/generic/unstable/public/value/type-info.sig	2007-06-11 19:55:17 UTC (rev 5614)
+++ mltonlib/trunk/com/ssh/generic/unstable/public/value/type-info.sig	2007-06-11 20:07:23 UTC (rev 5615)
@@ -47,9 +47,9 @@
     * the form {'b ref}.
     *)
 
-   val numConsecutiveAlts : ('a, 'x) TypeInfo.s -> Int.t
+   val numAlts : ('a, 'x) TypeInfo.s -> Int.t
    (**
-    * Number of consecutive alternatives.
+    * Number of alternatives in the given incomplete sum.
     *)
 end