Move subs around to sync with where methods are.

rakudo · Aug 10, 2015 · a9e01c4 · a9e01c4
1 parent 4eeacad
commit a9e01c4
Show file tree

Hide file tree

Showing 4 changed files with 103 additions and 101 deletions.
diff --git a/src/core/Any-list-methods.pm b/src/core/Any-list-methods.pm
@@ -558,4 +558,89 @@ augment class Any {
 
 BEGIN Attribute.^compose;
 
+proto sub infix:<min>(|) is pure { * }
+multi sub infix:<min>(Mu:D \a, Mu:U) { a }
+multi sub infix:<min>(Mu:U, Mu:D \b) { b }
+multi sub infix:<min>(Mu:D \a, Mu:D \b) { (a cmp b) < 0 ?? a !! b }
+multi sub infix:<min>(*@args) { @args.min }
+# XXX the multi version suffers from a multi dispatch bug
+# where the mandatory named is ignored in the presence of a slurpy
+#proto sub min(|)     { * }
+#multi sub min(*@args) { @args.min() }
+#multi sub min(*@args, :&by!) { @args.min(&by) }
+sub min(*@args, :&by = &infix:<cmp>) { @args.min(&by) }
+
+proto sub infix:<max>(|) is pure { * }
+multi sub infix:<max>(Mu:D \a, Mu:U) { a }
+multi sub infix:<max>(Mu:U, Mu:D \b) { b }
+multi sub infix:<max>(Mu:D \a, Mu:D \b) { (a cmp b) > 0 ?? a !! b }
+multi sub infix:<max>(*@args) { @args.max }
+sub max(*@args, :&by = &infix:<cmp>) { @args.max(&by) }
+
+proto sub infix:<minmax>(|) is pure { * }
+multi sub infix:<minmax>(*@args) { @args.minmax }
+sub minmax(*@args, :&by = &infix:<cmp>) { @args.minmax(&by) }
+
+proto sub map(|) {*}
+# fails integration/99problems-21-to-30, test 12/13
+#multi sub map(&code, @values) { @values.map(&code) }
+multi sub map(&code, *@values is rw) { @values.map(&code) }
+multi sub map(Whatever, \a)    { a }
+multi sub map(&code, Whatever) { (1..Inf).map(&code) }
+
+proto sub grep(|) {*}
+multi sub grep(Mu $test, @values) { @values.grep($test) }
+multi sub grep(Mu $test, *@values) { @values.grep($test) }
+multi sub grep(Bool:D $t, *@v) { fail X::Match::Bool.new( type => 'grep' ) }
+
+proto sub grep-index(|) {*}
+multi sub grep-index(Mu $test, @values) { @values.grep-index($test) }
+multi sub grep-index(Mu $test, *@values) { @values.grep-index($test) }
+multi sub grep-index(Bool:D $t, *@v) {
+    fail X::Match::Bool.new(type => 'grep-index');
+}
+
+proto sub first(|) {*}
+multi sub first(Mu $test, @values) { @values.first($test) }
+multi sub first(Mu $test, *@values) { @values.first($test) }
+multi sub first(Bool:D $t, *@v) { fail X::Match::Bool.new( type => 'first' ) }
+
+proto sub first-index(|) {*}
+multi sub first-index(Mu $test, @values) { @values.first-index($test) }
+multi sub first-index(Mu $test, *@values) { @values.first-index($test) }
+multi sub first-index(Bool:D $t,*@v) {
+    fail X::Match::Bool.new(type => 'first-index');
+}
+
+proto sub last-index(|) {*}
+multi sub last-index(Mu $test, @values) { @values.last-index($test) }
+multi sub last-index(Mu $test, *@values) { @values.last-index($test) }
+multi sub last-index(Bool:D $t, *@v) {
+    fail X::Match::Bool.new(type => 'last-index');
+}
+
+proto sub join(|) { * }
+multi sub join($sep = '', *@values) { @values.join($sep) }
+
+sub reduce (&with, *@list)  { @list.reduce(&with) }
+
+proto sub uniq(|) { * }
+multi sub uniq(*@values, |c) {
+    DEPRECATED('unique', |<2014.12 2015.09>);
+    @values.unique(|c)
+}
+
+proto sub unique(|) { * }
+multi sub unique(*@values, |c) { @values.unique(|c) }
+
+proto sub squish(|) { * }
+multi sub squish(*@values, |c) { @values.squish(|c) }
+
+proto sub sort(|) {*}
+multi sub sort(*@values)      {
+    nqp::istype(@values.AT-POS(0), Callable)
+        ?? SEQ(my $cmp := @values.shift; @values.sort($cmp) )
+        !! @values.sort;
+}
+
 # vim: ft=perl6 expandtab sw=4
diff --git a/src/core/Any.pm b/src/core/Any.pm
@@ -401,71 +401,6 @@ proto postfix:<-->(|)             { * }
 multi postfix:<-->(Mu:D \a is rw) { my $b = a; a = a.pred; $b }
 multi postfix:<-->(Mu:U \a is rw) { a = -1; 0 }
 
-# builtins
-proto sub infix:<min>(|) is pure { * }
-multi sub infix:<min>(Mu:D \a, Mu:U) { a }
-multi sub infix:<min>(Mu:U, Mu:D \b) { b }
-multi sub infix:<min>(Mu:D \a, Mu:D \b) { (a cmp b) < 0 ?? a !! b }
-multi sub infix:<min>(*@args) { @args.min }
-# XXX the multi version suffers from a multi dispatch bug
-# where the mandatory named is ignored in the presence of a slurpy
-#proto sub min(|)     { * }
-#multi sub min(*@args) { @args.min() }
-#multi sub min(*@args, :&by!) { @args.min(&by) }
-sub min(*@args, :&by = &infix:<cmp>) { @args.min(&by) }
-
-proto sub infix:<max>(|) is pure { * }
-multi sub infix:<max>(Mu:D \a, Mu:U) { a }
-multi sub infix:<max>(Mu:U, Mu:D \b) { b }
-multi sub infix:<max>(Mu:D \a, Mu:D \b) { (a cmp b) > 0 ?? a !! b }
-multi sub infix:<max>(*@args) { @args.max }
-sub max(*@args, :&by = &infix:<cmp>) { @args.max(&by) }
-
-proto sub infix:<minmax>(|) is pure { * }
-multi sub infix:<minmax>(*@args) { @args.minmax }
-sub minmax(*@args, :&by = &infix:<cmp>) { @args.minmax(&by) }
-
-proto sub map(|) {*}
-# fails integration/99problems-21-to-30, test 12/13
-#multi sub map(&code, @values) { @values.map(&code) }
-multi sub map(&code, *@values is rw) { @values.map(&code) }
-multi sub map(Whatever, \a)    { a }
-multi sub map(&code, Whatever) { (1..Inf).map(&code) }
-
-proto sub grep(|) {*}
-multi sub grep(Mu $test, @values) { @values.grep($test) }
-multi sub grep(Mu $test, *@values) { @values.grep($test) }
-multi sub grep(Bool:D $t, *@v) { fail X::Match::Bool.new( type => 'grep' ) }
-
-proto sub grep-index(|) {*}
-multi sub grep-index(Mu $test, @values) { @values.grep-index($test) }
-multi sub grep-index(Mu $test, *@values) { @values.grep-index($test) }
-multi sub grep-index(Bool:D $t, *@v) {
-    fail X::Match::Bool.new(type => 'grep-index');
-}
-
-proto sub first(|) {*}
-multi sub first(Mu $test, @values) { @values.first($test) }
-multi sub first(Mu $test, *@values) { @values.first($test) }
-multi sub first(Bool:D $t, *@v) { fail X::Match::Bool.new( type => 'first' ) }
-
-proto sub first-index(|) {*}
-multi sub first-index(Mu $test, @values) { @values.first-index($test) }
-multi sub first-index(Mu $test, *@values) { @values.first-index($test) }
-multi sub first-index(Bool:D $t,*@v) {
-    fail X::Match::Bool.new(type => 'first-index');
-}
-
-proto sub last-index(|) {*}
-multi sub last-index(Mu $test, @values) { @values.last-index($test) }
-multi sub last-index(Mu $test, *@values) { @values.last-index($test) }
-multi sub last-index(Bool:D $t, *@v) {
-    fail X::Match::Bool.new(type => 'last-index');
-}
-
-proto sub join(|) { * }
-multi sub join($sep = '', *@values) { @values.join($sep) }
-
 proto sub pick(|) { * }
 multi sub pick($n, @values) { @values.pick($n) }
 multi sub pick($n, *@values) { @values.pick($n) }
@@ -511,25 +446,6 @@ sub categorize( $test, *@items, *%named ) {
     }
 }
 
-proto sub uniq(|) { * }
-multi sub uniq(*@values, |c) {
-    DEPRECATED('unique', |<2014.12 2015.09>);
-    @values.unique(|c)
-}
-
-proto sub unique(|) { * }
-multi sub unique(*@values, |c) { @values.unique(|c) }
-
-proto sub squish(|) { * }
-multi sub squish(*@values, |c) { @values.squish(|c) }
-
-proto sub sort(|) {*}
-multi sub sort(*@values)      {
-    nqp::istype(@values.AT-POS(0), Callable)
-        ?? SEQ(my $cmp := @values.shift; @values.sort($cmp) )
-        !! @values.sort;
-}
-
 proto sub item(|) is pure { * }
 multi sub item(\x)    { my $ = x }
 multi sub item(|c)    { my $ = infix:<,>(|c) }

diff --git a/src/core/Array.pm b/src/core/Array.pm
@@ -447,4 +447,19 @@ class Array { # declared in BOOTSTRAP
 
 sub circumfix:<[ ]>(*@elems) is rw { my $ = @elems.eager }
 
+proto sub pop(@) {*}
+multi sub pop(@a) { @a.pop }
+
+proto sub shift(@) {*}
+multi sub shift(@a) { @a.shift }
+
+proto sub unshift(|) {*}
+multi sub unshift(\a, \elem) { a.unshift: elem }
+multi sub unshift(\a, *@elems) { a.unshift: @elems }
+
+proto sub push(|) {*}
+multi sub push(\a, \elem) { a.push: elem }
+multi sub push(\a, *@elems) { a.push: @elems }
+sub splice(@arr, |c)        { @arr.splice(|c) }
+
 # vim: ft=perl6 expandtab sw=4
diff --git a/src/core/List.pm b/src/core/List.pm
@@ -496,25 +496,11 @@ multi sub infix:<xx>(Mu \x, Int() $n) {
     nqp::p6parcel($rpa, Any);
 }
 
-proto sub pop(@) {*}
-multi sub pop(@a) { @a.pop }
-
-proto sub shift(@) {*}
-multi sub shift(@a) { @a.shift }
-
-proto sub unshift(|) {*}
-multi sub unshift(\a, \elem) { a.unshift: elem }
-multi sub unshift(\a, *@elems) { a.unshift: @elems }
-
-proto sub push(|) {*}
-multi sub push(\a, \elem) { a.push: elem }
-multi sub push(\a, *@elems) { a.push: @elems }
-
 sub reverse(*@a)            { @a.reverse }
 sub rotate(@a, Int $n = 1)  { @a.rotate($n) }
-sub reduce (&with, *@list)  { @list.reduce(&with) }
-sub splice(@arr, |c)        { @arr.splice(|c) }
 
-multi sub infix:<cmp>(@a, @b) { (@a Zcmp @b).first(&prefix:<?>) || @a <=> @b }
+multi sub infix:<cmp>(@a, @b) {
+    (@a Zcmp @b).first(&prefix:<?>) || @a <=> @b
+}
 
 # vim: ft=perl6 expandtab sw=4