More do-while fixes

Author: odersky

tests/pos-special/strawman-collections/CollectionStrawMan4.scala

@@ -467,10 +467,11 @@ object CollectionStrawMan4 {
       private var hdDefined: Boolean = false
 
       def hasNext: Boolean = hdDefined || {
-        do {
+        while {
           if (!self.hasNext) return false
           hd = self.next()
-        } while (!p(hd))
+          !p(hd)
+        } do ()
         hdDefined = true
         true
       }

tests/pos-special/strawman-collections/CollectionStrawMan6.scala

@@ -964,10 +964,11 @@ object CollectionStrawMan6 extends LowPriority {
       private var hdDefined: Boolean = false
 
       def hasNext: Boolean = hdDefined || {
-        do {
+        while {
           if (!self.hasNext) return false
           hd = self.next()
-        } while (!p(hd))
+          !p(hd)
+        } do ()
         hdDefined = true
         true
       }

tests/run/colltest5/CollectionStrawMan5_1.scala

@@ -441,10 +441,11 @@ object CollectionStrawMan5 {
       private var hdDefined: Boolean = false
 
       def hasNext: Boolean = hdDefined || {
-        do {
+        while {
           if (!self.hasNext) return false
           hd = self.next()
-        } while (!p(hd))
+          !p(hd)
+        } do ()
         hdDefined = true
         true
       }

tests/run/colltest6/CollectionStrawMan6_1.scala

@@ -965,10 +965,11 @@ object CollectionStrawMan6 extends LowPriority {
       private var hdDefined: Boolean = false
 
       def hasNext: Boolean = hdDefined || {
-        do {
+        while {
           if (!self.hasNext) return false
           hd = self.next()
-        } while (!p(hd))
+          !p(hd)
+        } do ()
         hdDefined = true
         true
       }