Changeset 6678 for lang/scala

Timestamp:

02/14/08 20:22:11 (10 months ago)

Author:

keisuken

Message:

Loop object updated. findDoWhile method add.

Location:

lang/scala/sandbox

Files:

• lib/scala-sandbox.jar (added)
• 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

@@ -9 +9 @@
   }
 
-  def find[A, B]
+  def foreach[A, B]
     (iterable: Iterable[A])(f: (A, Break[B]) => Unit): Option[B] = {
     val break = new Break[B]()
@@ -24 +24 @@
   }
 
-  def find[A](cond: => Boolean)(f: Break[A] => Unit): Option[A] = {
+  def findWhile[A](cond: => Boolean)(f: Break[A] => Unit): Option[A] = {
     val break = new Break[A]()
     while(break.cond && cond) f(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)
     break.value
   }
@@ -33 +39 @@
 
     var i = 0
-    find[Int](true) {break =>
+    findWhile[Int](true) {break =>
       if(i >= 5)
         break(i)
@@ -43 +49 @@
     }
 
-    val result = find[String, String](
+    i = 0
+    findWhile[Int](i < 10) {break =>
+      if(i == 20)
+        break(i)
+      else
+        i += 1
+    } match {
+      case Some(result) => println(result)
+      case None => println("Not found")
+    }
+
+    i = 0
+    findDoWhile[Int]({i += 1; i < 10}) {break =>
+      if(i == 5) break(i)
+    } match {
+      case Some(result) => println(result)
+      case None => println("Not found")
+    }
+
+    val result = foreach[String, String](
       Array("aaa", "bbb", "ccc")) {(value, break) =>
       if(value.equals("ddd"))
@@ -50 +75 @@
     println(result)
 
-    find[String,String](Array("aaa", "bbb", "ccc")) {(value, break) =>
+    foreach[String,String](Array("aaa", "bbb", "ccc")) {(value, break) =>
       if(value.equals("bbb"))
         break(value)
@@ -58 +83 @@
     }
 
-    find[Int,Int](1 to 10) {(i, break) =>
+    foreach[Int,Int](1 to 10) {(i, break) =>
       if(i % 2 == 1) break(i)
     } match {