Merge pull request #1477 from andemark/branch-for-challenge-053

final versions

2 files changed, 20 insertions, 11 deletions

diff --git a/challenge-053/mark-anderson/raku/ch-1.p6 b/challenge-053/mark-anderson/raku/ch-1.p6
index b45f906722..318312966a 100644
--- a/challenge-053/mark-anderson/raku/ch-1.p6
+++ b/challenge-053/mark-anderson/raku/ch-1.p6
@@ -1,11 +1,17 @@
-#!/usr/bin/env raku
+#!/usr/bin/env raku 
 
 my @matrix = [ 1, 2, 3 ],
              [ 4, 5, 6 ],
              [ 7, 8, 9 ];
 
-say [Z] @matrix.reverse;            # rotate 90
+say "Matrix";
+.say for @matrix;
 
-say @matrix.map(*.reverse).reverse; # rotate 180
+say "\nMatrix rotated 90";
+.say for ([Z] @matrix.reverse)>>.Array;
 
-say ([Z] @matrix).reverse;          # rotate 270
+say "\nMatrix rotated 180";
+.say for @matrix>>.reverse.reverse>>.Array;
+
+say "\nMatrix rotated 270";
+.say for ([Z] @matrix).reverse>>.Array;
diff --git a/challenge-053/mark-anderson/raku/ch-2.p6 b/challenge-053/mark-anderson/raku/ch-2.p6
index 94cc2f68d9..9fdec917a1 100644
--- a/challenge-053/mark-anderson/raku/ch-2.p6
+++ b/challenge-053/mark-anderson/raku/ch-2.p6
@@ -8,17 +8,20 @@ sub MAIN($length where 1 <= $length <= 5) {
                       u => <o e>;
 
     for <a e i o u> -> $first_letter {
-        my @queue = Empty;
-        @queue.push($first_letter);
+        append_letter($first_letter);
+    }
+
+    sub append_letter($str) {
+        if ($str.chars == $length) {
+            say $str;
+        }
 
-        while @queue[0].chars < $length {
-            my $str = @queue.shift;
+        else {
             my $last_letter = $str.substr(*-1);
+
             for %next_letter{$last_letter}.Array -> $ltr {
-                @queue.push($str ~ $ltr);
+                append_letter($str ~ $ltr);
             }
         }
-
-        say @queue.join("\n");
     }
 }