Fix some tests to work post-GLR

Author: softmoth

categories/99-problems/P26-topo.pl

@@ -9,18 +9,18 @@
 =head1 Example
 
     > say c(2, <a b c d e>);
-    a b a c a d b c b d c d
+    ((a b) (a c) (a d) (a e) (b c) (b d) (b e) (c d) (c e) (d e))
 
 =end pod
 
-sub c(Int $n, [ $x, *@xs ])
-{
-    if $n  == 0  { return [] }
-    if @xs ~~ () { return () }
-
-    map({ [ $x, @^others ] }, c($n - 1, @xs)), c($n, @xs);
+multi sub c(0,      @xs)          { return ((),) }
+multi sub c(Int $n, [])           { return ()    }
+multi sub c(Int $n, [ $x, *@xs ]) {
+    |map({($x, |@$_)}, c($n - 1, @xs)), |c($n, @xs);
 }
 
-say c(3, <a b c d e f g h i j k l>);
+my @combos = c(3, <a b c d e f g h i j k l>);
+say @combos.elems;
+say @combos[200..*];
 
 # vim: expandtab shiftwidth=4 ft=perl6

categories/99-problems/P91-edpratomo.pl

@@ -30,7 +30,7 @@ =head1 Specification
 sub valid_moves($curr, @temp_track=@track) {
     my @valid_squares = @directions.map(->$a,$b { ($curr.key + $a) => ($curr.value + $b) }).grep({0 <= all(.key, .value) < $n});
     # exclude occupied squares. !eqv doesn't work yet.
-    @valid_squares.grep({ not $_ eqv any(@temp_track, $curr) });
+    @valid_squares.grep({ not $_ eqv any(|@temp_track, $curr) });
 }
 
 sub knight($square) {
@@ -39,7 +39,9 @@ ($square)
 
     # simple heuristic, for move ordering
     my @possible_moves = valid_moves($square).sort: ->$a,$b {
-        valid_moves($a, [@track,$a]).elems <=> valid_moves($b, [@track, $b]).elems;
+        valid_moves($a, [|@track,$a]).elems <=> valid_moves($b, [|@track, $b]).elems
+            or $a.key <=> $b.key
+            or $a.value <=> $b.value;
     };
 
     return unless @possible_moves.elems;

categories/best-of-rosettacode/create-a-two-dimensional-array-at-runtime.pl

@@ -26,7 +26,7 @@ =head1 More
 
 @array[ (^$major).pick  ][ (^$minor).pick ] = ' ';
 
-.say for @array;
+.Str.say for @array;
 
 
 # vim: expandtab shiftwidth=4 ft=perl6

categories/euler/prob009-gerdr-feeds.pl

@@ -38,11 +38,7 @@
 ==> map -> @triple { [*] @triple } \
 
 # ... to give the result.
-# We don't .say directly on the output yet, since Rakudo (2015.02) doesn't
-# yet handle this case of a feed into a .say
-==> $result;
-
-# print result
-$result.[0].say;
+# XXX Rakudo feed operator wraps results in an extra sequence, thus .[0]
+==> { .[0].say }();
 
 # vim: expandtab shiftwidth=4 ft=perl6

categories/euler/prob010-polettix.pl

@@ -44,7 +44,7 @@ sub primes_iterator {
 while $prime < $upper_bound {
     $sum += $prime;
     if $prime > $feedback_threshold {
-        say "Processed up to prime number: $prime";
+        say "# Processed up to prime number: $prime";
         $feedback_threshold += 10000;
     }
     $prime = $it();

categories/euler/prob053-gerdr.pl

@@ -25,15 +25,11 @@
 
 =end pod
 
-my @result;
-
 $[1], -> @p { $[0, |@p Z+ |@p, 0] } ... * \ # generate Pascal's triangle
 ==> (*[0..100])() \
-==> map *.list \
+==> map *.Slip \
 ==> grep * > 1_000_000 \
 ==> elems() \
-==> @result;  # work around .say not yet handling feeds in Rakudo 2015.02
-#==> say;
-@result[0].say;
+==> (*.say)()
 
 # vim: expandtab shiftwidth=4 ft=perl6

categories/euler/prob059-andreoss.pl

@@ -94,7 +94,7 @@ sub infix:<XOR>(@cipher, @password) {
 
     unless $pass {
         my %variants = guess-password $word, @cipher;
-        $pass  = %variants.max(*.value).key;
+        $pass  = %variants.pairs.max(*.value).key;
         say "The password is more likely to be '$pass'. " if $verbose;
     }
 

categories/euler/prob081-moritz.pl

@@ -28,7 +28,7 @@
 
 my $matrix-file = $*SPEC.catdir($*PROGRAM-NAME.IO.dirname, 'matrix.txt');
 my $f = open $matrix-file or die "Can't open file for reading: $!";
-for $f.lines <-> $line {
+for $f.lines -> $line {
     @m.push: $line.comb(/\d+/).Array.item;
 }
 $f.close;

categories/euler/prob098-andreoss.pl

@@ -45,7 +45,7 @@ (@x)
         %result{@v[0].chars}.push:
                 +@v == 2
                   ?? @v.item
-                  !! @v.combinations(2).map(*.item);
+                  !! |@v.combinations(2).map(*.item);
     }
 
     %result;
@@ -61,17 +61,16 @@ (@x)
 
     my %words   =  anagrams(@words);
     my $longest-word = %words.keys.max;
-    
+
     my %squares =  anagrams(
-        (1 ... (10**($longest-word + 1).sqrt)).list »**» 2
+        (1 ... (10**($longest-word + 1).sqrt)) »**» 2
     );
 
-
     say max do for 3 ... $longest-word -> \size {
         next unless %words{size};
-        do for @(%words{size}) -> @pair {
+        |do for @(%words{size}) -> @pair {
             next unless %squares{size};
-            do for @(%squares{size}) -> @nums {
+            |do for @(%squares{size}) -> @nums {
                 if correspond(@pair, @nums) {
                     $verbose and say "@pair[] => @nums[]" ;
                     max @nums;

t/categories/99-problems.t

@@ -34,7 +34,7 @@ for @script-names -> $name {
     }
 }
 
-done;
+done-testing;
 
 #| return hash of expected output for each example script
 sub expected-output {
@@ -298,7 +298,8 @@ sub expected-output {
     END
 
     %expected-output{"P26-topo.pl"} = q:to/END/;
-    a b c a b d a b e a b f a b g a b h a b i a b j a b k a c d a c e a c f a c g a c h a c i a c j a c k a d e a d f a d g a d h a d i a d j a d k a e f a e g a e h a e i a e j a e k a f g a f h a f i a f j a f k a g h a g i a g j a g k a h i a h j a h k a i j a i k a j k b c d b c e b c f b c g b c h b c i b c j b c k b d e b d f b d g b d h b d i b d j b d k b e f b e g b e h b e i b e j b e k b f g b f h b f i b f j b f k b g h b g i b g j b g k b h i b h j b h k b i j b i k b j k c d e c d f c d g c d h c d i c d j c d k c e f c e g c e h c e i c e j c e k c f g c f h c f i c f j c f k c g h c g i c g j c g k c h i c h j c h k c i j c i k c j k d e f d e g d e h d e i d e j d e k d f g d f h d f i d f j d f k d g h d g i d g j d g k d h i d h j d h k d i j d i k d j k e f g e f h e f i e f j e f k e g h e g i e g j e g k e h i e h j e h k e i j e i k e j k f g h f g i f g j f g k f h i f h j f h k f i j f i k f j k g h i g h j g h k g i j g i k g j k h i j h i k h j k i j k
+    220
+    ((g h i) (g h j) (g h k) (g h l) (g i j) (g i k) (g i l) (g j k) (g j l) (g k l) (h i j) (h i k) (h i l) (h j k) (h j l) (h k l) (i j k) (i j l) (i k l) (j k l))
     END
 
     %expected-output{"P31-rhebus.pl"} = q:to/END/;
@@ -609,7 +610,7 @@ sub expected-output {
     END
 
     %expected-output{"P91-edpratomo.pl"} = q:to/END/;
-    FOUND: [0 => 0, 1 => 2, 0 => 4, 2 => 3, 4 => 4, 3 => 2, 4 => 0, 2 => 1, 3 => 3, 4 => 1, 2 => 0, 0 => 1, 1 => 3, 3 => 4, 4 => 2, 3 => 0, 1 => 1, 0 => 3, 2 => 4, 4 => 3, 3 => 1, 1 => 0, 0 => 2, 1 => 4, 2 => 2]
+    FOUND: [0 => 0, 1 => 2, 0 => 4, 2 => 3, 4 => 4, 3 => 2, 4 => 0, 2 => 1, 0 => 2, 1 => 0, 3 => 1, 4 => 3, 2 => 4, 0 => 3, 1 => 1, 3 => 0, 4 => 2, 3 => 4, 1 => 3, 0 => 1, 2 => 0, 4 => 1, 2 => 2, 1 => 4, 3 => 3]
     END
 
     return %expected-output;