Improve list handling in sequence generator.

rakudo · Jul 7, 2011 · 5fac548 · 5fac548
1 parent c12b7cc
commit 5fac548
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/core/operators.pm b/src/core/operators.pm
@@ -8,7 +8,7 @@ sub infix:<=>(Mu \$a, Mu \$b) {
 }
 
 sub SEQUENCE($left, $right, :$exclude_end) {
-    my @right := ($right,).list;
+    my @right := $right.flat;
     my $endpoint = @right.shift;
     my $infinite = $endpoint ~~ Whatever;
     $endpoint = Bool::False if $infinite;
@@ -31,8 +31,8 @@ sub SEQUENCE($left, $right, :$exclude_end) {
         ($cmp < 0) ?? { $^x.succ } !! ( $cmp > 0 ?? { $^x.pred } !! { $^x } )
     }
 
-    GATHER({
-        my @left := $left.list;
+    (GATHER({
+        my @left := $left.flat;
         my $value;
         my $code;
         my $stop;
@@ -85,7 +85,7 @@ sub SEQUENCE($left, $right, :$exclude_end) {
             $value = generate($code);
         }
         take $value unless $exclude_end;
-    }, :$infinite), @right;
+    }, :$infinite), @right).list;
 }
 
 # XXX Wants to be a macro when we have them.