Merge branch 'master' of git@github.com:rakudo/rakudo

rakudo · Apr 8, 2009 · 6b97553 · 6b97553
2 parents b6b61a1 + b028635
commit 6b97553
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 40 deletions.
diff --git a/build/Makefile.in b/build/Makefile.in
@@ -121,7 +121,6 @@ SETTING = \
   src/setting/Object.pm \
   src/setting/Pair.pm \
   src/setting/Range.pm \
-  src/setting/Str.pm \
   src/setting/Whatever.pm \
 
 PMCS        = perl6str objectref perl6scalar mutablevar perl6multisub

diff --git a/src/builtins/any-str.pir b/src/builtins/any-str.pir
@@ -196,29 +196,6 @@ file.
     .return(match)
 .end
 
-=item reverse
-
-=cut
-
-.namespace []
-.sub 'reverse' :multi()
-    .param pmc values          :slurpy
-    $I0 = elements values
-    unless $I0 == 1 goto reverse_list
-    $P0 = values[0]
-    .tailcall $P0.'reverse'()
-  reverse_list:
-    values.'!flatten'()
-    .tailcall values.'reverse'()
-.end
-
-.namespace ['Any']
-.sub 'reverse' :method
-    $P0 = self.'split'('')
-    $P0 = $P0.'reverse'()
-    .tailcall $P0.'join'('')
-.end
-
 =item rindex()
 
 =cut

diff --git a/src/setting/Any-list.pm b/src/setting/Any-list.pm
@@ -79,6 +79,14 @@ class Any is also {
         }
         return @args[0];
     }
+
+    method reverse() {
+        my @result;
+        for @.list {
+            @result.unshift($_);
+        }
+        return @result;
+    }
 }
 
 multi first(Code $test, *@values) {
@@ -101,4 +109,8 @@ multi reduce(Code $expression, *@values) {
     @values.reduce($expression);
 }
 
+multi reverse(*@values) {
+    @values.reverse;
+}
+
 # vim: ft=perl6
diff --git a/src/setting/Any-str.pm b/src/setting/Any-str.pm
@@ -70,6 +70,10 @@ class Any is also {
         }
     }
 
+    multi method flip() is export {
+        (~self).split('').reverse().join;
+    }
+
     # TODO: substitute with '$delimiter as Str' once coercion is implemented
     our List multi method split($delimiter, $limit = *) {
         my Int $prev = 0;
@@ -131,7 +135,7 @@ class Any is also {
     }
 }
 
-sub split($delimiter, $target, $limit = *) {
+multi sub split($delimiter, $target, $limit = *) {
     $target.split($delimiter, $limit);
 }
 

diff --git a/src/setting/Hash.pm b/src/setting/Hash.pm
@@ -6,4 +6,8 @@ class Hash is also {
     }
 }
 
+multi reverse(%hash) {
+    %hash.reverse;
+}
+
 # vim: ft=perl6
diff --git a/src/setting/List.pm b/src/setting/List.pm
@@ -42,14 +42,6 @@ Returns a Perl representation of a List.
         return '[' ~ self.map({ .perl }).join(", ") ~ ']';
     }
 
-    method reverse() {
-        my @result;
-        for self.iterator() {
-            @result.unshift($_);
-        }
-        return @result;
-    }
-
 }
 
 # vim: ft=perl6
diff --git a/src/setting/Str.pm b/src/setting/Str.pm