prepare for Dotty: convert do-while to while

Author: SethTisue

core/src/main/scala/scala/collection/generic/Signalling.scala

@@ -131,19 +131,19 @@ trait AtomicIndexFlag extends Signalling {
   abstract override def setIndexFlag(f: Int) = intflag.set(f)
   abstract override def setIndexFlagIfGreater(f: Int) = {
     var loop = true
-    do {
+    while (loop) {
       val old = intflag.get
       if (f <= old) loop = false
       else if (intflag.compareAndSet(old, f)) loop = false
-    } while (loop)
+    }
   }
   abstract override def setIndexFlagIfLesser(f: Int) = {
     var loop = true
-    do {
+    while (loop) {
       val old = intflag.get
       if (f >= old) loop = false
       else if (intflag.compareAndSet(old, f)) loop = false
-    } while (loop)
+    }
   }
 }
 

core/src/main/scala/scala/collection/parallel/Tasks.scala

@@ -180,15 +180,16 @@ trait AdaptiveWorkStealingTasks extends Tasks {
     def spawnSubtasks() = {
       var last: AWSTWrappedTask[R, Tp] = null
       var head: AWSTWrappedTask[R, Tp] = this
-      do {
+      while ({
         val subtasks = head.split
         head = subtasks.head
         for (t <- subtasks.tail.reverse) {
           t.next = last
           last = t
           t.start()
         }
-      } while (head.body.shouldSplitFurther)
+        head.body.shouldSplitFurther
+      }) ()
       head.next = last
       head
     }

junit/src/test/scala/scala/collection/concurrent/ctries_new/ConcurrentMapSpec.scala

@@ -79,10 +79,11 @@ class ConcurrentMapSpec extends Spec {
           for (i <- 0 until sz) {
             val j = (offs + i) % sz
             var k = Int.MaxValue
-            do {
+            while ({
               if (k != Int.MaxValue) repeats += 1
               k = ct.getOrElse(new Wrap(j), 0)
-            } while (!ct.replace(new Wrap(j), k, -k))
+              !ct.replace(new Wrap(j), k, -k)
+            }) ()
           }
           //println("Thread %d repeats: %d".format(index, repeats))
         }
@@ -154,13 +155,14 @@ class ConcurrentMapSpec extends Spec {
           for (j <- 0 until sz) {
             val i = (offs + j) % sz
             var success = false
-            do {
+            while ({
               if (ct.contains(new Wrap(i))) {
                 success = ct.remove(new Wrap(i)) != None
               } else {
                 success = ct.putIfAbsent(new Wrap(i), i) == None
               }
-            } while (!success)
+              !success
+            }) ()
           }
         }
       }

junit/src/test/scala/scala/collection/concurrent/ctries_old/ConcurrentMapSpec.scala

@@ -79,10 +79,11 @@ class ConcurrentMapSpec extends Spec {
           for (i <- 0 until sz) {
             val j = (offs + i) % sz
             var k = Int.MaxValue
-            do {
+            while ({
               if (k != Int.MaxValue) repeats += 1
               k = ct.getOrElse(new Wrap(j), 0)
-            } while (!ct.replace(new Wrap(j), k, -k))
+              !ct.replace(new Wrap(j), k, -k)
+            }) ()
           }
           //println("Thread %d repeats: %d".format(index, repeats))
         }
@@ -154,13 +155,14 @@ class ConcurrentMapSpec extends Spec {
           for (j <- 0 until sz) {
             val i = (offs + j) % sz
             var success = false
-            do {
+            while ({
               if (ct.contains(new Wrap(i))) {
                 success = ct.remove(new Wrap(i)) != None
               } else {
                 success = ct.putIfAbsent(new Wrap(i), i) == None
               }
-            } while (!success)
+              !success
+            }) ()
           }
         }
       }