Changeset 6680 for lang/scala/sandbox

Timestamp:

02/14/08 20:52:00 (10 months ago)

Author:

keisuken

Message:

Loop object update. forEach, whileEach, doWhileEach method add.

Location:

lang/scala/sandbox

Files:

• lib/scala-sandbox.jar (modified) (previous)
• src/jp/ne/cappuccino/keisuken/scl/lang/Loop.scala (modified) (6 diffs)
• webpages/lib/scala-sandbox.jar (modified) (previous)

lang/scala/sandbox/src/jp/ne/cappuccino/keisuken/scl/lang/Loop.scala

@@ -3 +3 @@
 object Loop {
 
-  class Break[T](var cond: Boolean, var value: Option[T]) {
+  class BreakWithValue[T](var cond: Boolean, var value: Option[T]) {
     def this() = this(true, None)
     def apply(): Unit = {cond = false; value = None}
@@ -9 +9 @@
   }
 
-  def foreach[A, B]
-    (iterable: Iterable[A])(f: (A, Break[B]) => Unit): Option[B] = {
-    val break = new Break[B]()
+  class Break(var cond: Boolean) {
+    def this() = this(true)
+    def apply(): Unit = cond = false
+  }
+
+  def forEach[A](iterable: Iterable[A])(p: (A, Break) => Unit): Unit = {
+    val break = new Break()
     val iterator = iterable.elements
-    while(break.cond && iterator.hasNext) {
-      val value = iterator.next
-      if(value != null) {
-        f(value, break)
-      } else {
-        break()
-      }
-    }
+    while(break.cond && iterator.hasNext)
+      p(iterator.next, break)
+  }
+
+  def findFor[A, B]
+    (iterable: Iterable[A])(p: (A, BreakWithValue[B]) => Unit): Option[B] = {
+    val break = new BreakWithValue[B]()
+    val iterator = iterable.elements
+    while(break.cond && iterator.hasNext)
+      p(iterator.next, break)
     break.value
   }
 
-  def findWhile[A](cond: => Boolean)(f: Break[A] => Unit): Option[A] = {
-    val break = new Break[A]()
-    while(break.cond && cond) f(break)
+  def whileEach[A](cond: => Boolean)(p: Break => Unit): Unit = {
+    val break = new Break()
+    while(break.cond && cond) p(break)
+  }
+
+  def findWhile[A]
+    (cond: => Boolean)(p: BreakWithValue[A] => Unit): Option[A] = {
+    val break = new BreakWithValue[A]()
+    while(break.cond && cond) p(break)
     break.value
   }
 
-  def findDoWhile[A](cond: => Boolean)(f: Break[A] => Unit): Option[A] = {
-    val break = new Break[A]()
-    do {f(break)} while(break.cond && cond)
+  def doWhileEach[A](cond: => Boolean)(p: Break => Unit): Unit = {
+    val break = new Break()
+    do p(break) while(break.cond && cond)
+  }
+
+  def findDoWhile[A]
+    (cond: => Boolean)(p: BreakWithValue[A] => Unit): Option[A] = {
+    val break = new BreakWithValue[A]()
+    do p(break) while(break.cond && cond)
     break.value
   }
@@ -38 +56 @@
   def main(args: Array[String]) {
 
+    forEach(1 to 10) {(i, break) =>
+      if(i == 5) {
+        println(i)
+        break()
+      }
+    }
+
     var i = 0
+    whileEach(i < 10) {break =>
+      if(i >= 5) {
+        println(i)
+        break()
+      } else
+        i += 1
+    }
+
+    i = 0
+    doWhileEach({i += 1; i < 10}) {break =>
+      if(i >= 5) {
+        println(i)
+        break()
+      }
+    }
+
+    i = 0
     var result1 = findWhile[Int](true) {break =>
       if(i >= 5)
@@ -71 +113 @@
     }
 
-    val result4 = foreach[String, String](
+    val result4 = findFor[String, String](
       Array("aaa", "bbb", "ccc")) {(value, break) =>
       if(value.equals("ddd"))
@@ -78 +120 @@
     println(result4)
 
-    val result5 = foreach[String,String](Array("aaa", "bbb", "ccc"))
+    val result5 = findFor[String,String](Array("aaa", "bbb", "ccc"))
     {(value, break) =>
       if(value.equals("bbb"))
@@ -87 +129 @@
     }
 
-    val result6 = foreach[Int,Int](1 to 10) {(i, break) =>
+    val result6 = findFor[Int,Int](1 to 10) {(i, break) =>
       if(i % 2 == 1) break(i)
     }