the forest-fire benchmarks now work properly post-glr as well

Author: timo

perl6/rc-forest-fire

@@ -21,12 +21,12 @@ class Forest {
     }
 
     method !init-grid {
-        @!grid = [ (Bool.pick ?? Tree !! Empty) xx $!width ] xx $!height;
+        @!grid = [ flat (Bool.pick ?? Tree !! Empty) xx $!width ] xx $!height;
     }
 
     method !init-neighbors {
         @!neighbors = [ [] xx $!width ] xx $!height; # XXX rakudo doesn't autoviv yet
-        for ^$!height X ^$!width -> $i, $j {
+        for flat(^$!height X ^$!width) -> $i, $j {
             my $k = 0;
             for
                     [-1,-1],[+0,-1],[+1,-1],
@@ -42,7 +42,7 @@ class Forest {
     method step {
         my @new;
         @new = [] xx $!height;   # XXX rakudo doesn't autoviv yet
-        for ^$!height X ^$!width -> $i, $j {
+        for flat (^$!height X ^$!width) -> $i, $j {
             given @!grid[$i][$j] {
                 when Empty   { @new[$i][$j] = rand < $!p ?? Tree !! Empty }
                 when Tree    { @new[$i][$j] =
@@ -51,7 +51,7 @@ class Forest {
                 when Burning { @new[$i][$j] = Empty }
             }
         }
-        for ^$!height X ^$!width -> $i, $j {
+        for flat(^$!height X ^$!width) -> $i, $j {
             @!grid[$i][$j] = @new[$i][$j];
         }
     }

perl6/rc-forest-fire-stringify

@@ -4,8 +4,8 @@ sub MAIN($w, $h, $steps) {
     my $CLEAR = "\e[0m";
 
     enum Cell-State <Empty Tree Burning>;
-    my @show  = ('  ', $GREEN ~ '木' ~ $CLEAR, $RED ~ '火' ~ $CLEAR);
-    my @grid := [ (Empty, Tree, Burning) xx $w ] xx $h;
+    my @show  = '  ', $GREEN ~ '木' ~ $CLEAR, $RED ~ '火' ~ $CLEAR;
+    my @grid  = [ flat (Empty, Tree, Burning) xx $w ] xx $h;
 
     sub stringify(@grid) {
         join '', gather for ^@grid -> $i {
@@ -15,7 +15,7 @@ sub MAIN($w, $h, $steps) {
 
     my $chars = 0;
     for ^$steps {
-        my $grid := stringify(@grid);
+        my $grid = stringify(@grid);
         $chars += $grid.chars;
     }
     say $chars;