Apparently fix "take" failure on JVM

rakudo · Oct 20, 2014 · f0efc88 · f0efc88
1 parent 3975e16
commit f0efc88
Showing 1 changed file with 17 additions and 21 deletions.
diff --git a/src/core/Baggy.pm b/src/core/Baggy.pm
@@ -159,20 +159,18 @@ my role Baggy does QuantHash {
         my Int $seen;
         my int $todo = ($keep ?? $count !! ($total min $count)) + 1;
 
-        gather {
-            while $todo = $todo - 1 {
-                $rand = $total.rand.Int;
-                $seen = 0;
-                for @pairs -> $pair {
-                    next if ( $seen += $pair.value ) <= $rand;
+        gather while $todo = $todo - 1 {
+            $rand = $total.rand.Int;
+            $seen = 0;
+            for @pairs -> $pair {
+                next if ( $seen += $pair.value ) <= $rand;
 
-                    take $pair.key;
-                    last if $keep;
+                take $pair.key;
+                last if $keep;
 
-                    $pair.value--;
-                    $total = $total - 1;
-                    last;
-                }
+                $pair.value--;
+                $total = $total - 1;
+                last;
             }
         }
     }
@@ -182,15 +180,13 @@ my role Baggy does QuantHash {
         my Int $rand;
         my Int $seen;
 
-        gather {
-            loop {
-                $rand = $total.rand.Int;
-                $seen = 0;
-                for @pairs -> $pair {
-                    next if ( $seen += $pair.value ) <= $rand;
-                    take $pair.key;
-                    last;
-                }
+        gather loop {
+            $rand = $total.rand.Int;
+            $seen = 0;
+            for @pairs -> $pair {
+                next if ( $seen += $pair.value ) <= $rand;
+                take $pair.key;
+                last;
             }
         }
     }