Make grep/first/last-index return Pos

rakudo · Jul 24, 2015 · f971dbd · f971dbd
1 parent 7c615ad
commit f971dbd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/src/core/Any.pm b/src/core/Any.pm
@@ -1,5 +1,6 @@
 my class MapIter                { ... }
 my class Pair                   { ... }
+my class Pos                    { ... }
 my class Range                  { ... }
 my class X::Adverb::Slice       { ... }
 my class X::Bind                { ... }
@@ -296,23 +297,23 @@ my class Any { # declared in BOOTSTRAP
         self.map: {
             $index = $index+1;
             next unless .match($test);
-            nqp::box_i($index,Int);
+            nqp::box_i($index,Pos);
         };
     }
     multi method grep-index(Callable:D $test) {
         my int $index = -1;
         self.map: {
             $index = $index + 1;
             next unless $test($_);
-            nqp::box_i($index,Int);
+            nqp::box_i($index,Pos);
         };
     }
     multi method grep-index(Mu $test) {
         my int $index = -1;
         self.map: {
             $index = $index + 1;
             next unless $_ ~~ $test;
-            nqp::box_i($index,Int);
+            nqp::box_i($index,Pos);
         };
     }
 
@@ -341,23 +342,23 @@ my class Any { # declared in BOOTSTRAP
         my int $index = -1;
         self.map: {
             $index = $index + 1;
-            return nqp::box_i($index,Int) if .match($test);
+            return nqp::box_i($index,Pos) if .match($test);
         };
         Nil;
     }
     multi method first-index(Callable:D $test) {
         my int $index = -1;
         self.map: {
             $index = $index + 1;
-            return nqp::box_i($index,Int) if $test($_);
+            return nqp::box_i($index,Pos) if $test($_);
         };
         Nil;
     }
     multi method first-index(Mu $test) {
         my int $index = -1;
         self.map: {
             $index = $index + 1;
-            return nqp::box_i($index,Int) if $_ ~~ $test;
+            return nqp::box_i($index,Pos) if $_ ~~ $test;
         };
         Nil;
     }
@@ -373,7 +374,7 @@ my class Any { # declared in BOOTSTRAP
         my int $index = $elems;
         while $index {
             $index = $index - 1;
-            return nqp::box_i($index,Int) if self.AT-POS($index).match($test);
+            return nqp::box_i($index,Pos) if self.AT-POS($index).match($test);
         }
         Nil;
     }
@@ -384,7 +385,7 @@ my class Any { # declared in BOOTSTRAP
         my int $index = $elems;
         while $index {
             $index = $index - 1;
-            return nqp::box_i($index,Int) if $test(self.AT-POS($index));
+            return nqp::box_i($index,Pos) if $test(self.AT-POS($index));
         }
         Nil;
     }
@@ -395,7 +396,7 @@ my class Any { # declared in BOOTSTRAP
         my int $index = $elems;
         while $index {
             $index = $index - 1;
-            return nqp::box_i($index,Int) if self.AT-POS($index) ~~ $test;
+            return nqp::box_i($index,Pos) if self.AT-POS($index) ~~ $test;
         }
         Nil;
     }

diff --git a/src/core/Cool.pm b/src/core/Cool.pm
@@ -9,8 +9,6 @@ my class SprintfHandler {
 
 my $sprintfHandlerInitialized = False;
 
-my class Pos { ... }
-
 my class Cool { # declared in BOOTSTRAP
     # class Cool is Any {