break and continue now both go to a breakable b...

break and continue now both go to a breakable block.

1 files changed, 8 insertions, 9 deletions

diff --git a/src/library/scalax/util/control/Breaks.scala b/src/library/scalax/util/control/Breaks.scala
index d5ca883b77..6c938950d4 100755
--- a/src/library/scalax/util/control/Breaks.scala
+++ b/src/library/scalax/util/control/Breaks.scala
@@ -5,21 +5,20 @@ object Breaks {
   private val breakException = new BreakException
   private class ContinueException extends RuntimeException
   private val continueException = new BreakException
-  def break { throw breakException }
+
+  /** A block from which one can exit with a `break' and which can be resumed with a `continue'. */
   def breakable(op: => Unit) {
     try {
       op
     } catch {
       case ex: BreakException =>
+      case ex: ContinueException => breakable(op)
     }
   }
+
+  /* Break from closest enclosing breakable block */
+  def break { throw breakException }
+
+  /* Continue with start of closest enclosing breakable block */
   def continue { throw continueException }
-  def continuable(op: => Unit) {
-    try {
-      op
-    } catch {
-      case ex: ContinueException =>
-	continuable(op)
-    }
-  }
 }