Adapt grep-index tests to grep(:k) tests

S32-list/grep-k.t

@@ -1,20 +1,20 @@
 use v6;
 use Test;
 
-# L<S32::Containers/"List"/"=item grep-index">
+# L<S32::Containers/"List"/"=item grep">
 
 plan 40;
 
 my @list = (1 .. 10);
 
-is grep-index( { ($_ % 2) }, @list ).grep(Int), (0,2,4,6,8).list.item, 'do we get Ints';
-is grep-index( { ($_ % 2) }, @list ), (0,2,4,6,8).list.item,
+is grep( { ($_ % 2) }, @list, :k ).grep(Int), (0,2,4,6,8).list.item, 'do we get Ints';
+is grep( { ($_ % 2) }, @list, :k ), (0,2,4,6,8).list.item,
   'simple direct test of sub';
-is @list.grep-index( { ($_ % 2) } ), (0,2,4,6,8).list.item,
+is @list.grep( { ($_ % 2) }, :k ), (0,2,4,6,8).list.item,
   'simple direct test of method';
 
 {
-    my @result = grep-index { ($_ % 2) }, @list;
+    my @result = grep { ($_ % 2) }, @list, :k;
     is(+@result, 5, 'we got a list back');
     is(@result[0], 0, 'got the value we expected');
     is(@result[1], 2, 'got the value we expected');
@@ -26,7 +26,7 @@ is @list.grep-index( { ($_ % 2) } ), (0,2,4,6,8).list.item,
 #?rakudo skip "adverbial block RT #124759"
 #?niecza skip 'NYI'
 {
-    my @result = @list.grep-index():{ ($_ % 2) };
+    my @result = @list.grep():{ ($_ % 2) }, :k;
     is(+@result, 5, 'we got a list back');
     is(@result[0], 0, 'got the value we expected');
     is(@result[1], 2, 'got the value we expected');
@@ -38,7 +38,7 @@ is @list.grep-index( { ($_ % 2) } ), (0,2,4,6,8).list.item,
 #?rakudo skip "adverbial block RT #124760"
 #?niecza skip 'NYI'
 {
-    my @result = @list.grep-index :{ ($_ % 2) };
+    my @result = @list.grep :{ ($_ % 2) }, :k;
     is(+@result, 5, 'we got a list back');
     is(@result[0], 0, 'got the value we expected');
     is(@result[1], 2, 'got the value we expected');
@@ -50,7 +50,7 @@ is @list.grep-index( { ($_ % 2) } ), (0,2,4,6,8).list.item,
 #?rakudo todo "closure as non-final argument RT #124761"
 #?niecza skip 'Invocant handling is NYI'
 {
-    my @result = grep-index { ($_ % 2) }: @list;
+    my @result = grep { ($_ % 2) }: @list, :k;
     is(+@result, 5, 'we got a list back');
     is(@result[0], 0, 'got the value we expected');
     is(@result[1], 2, 'got the value we expected');
@@ -60,8 +60,8 @@ is @list.grep-index( { ($_ % 2) } ), (0,2,4,6,8).list.item,
 }
 
 {
-  is(   42.grep-index({ 1 }), 0, "method form of grep works on numbers");
-  is('str'.grep-index({ 1 }), 0, "method form of grep works on strings");
+  is(   42.grep({ 1 }, :k), 0, "method form of grep works on numbers");
+  is('str'.grep({ 1 }, :k), 0, "method form of grep works on strings");
 }
 
 #
@@ -70,44 +70,43 @@ is @list.grep-index( { ($_ % 2) } ), (0,2,4,6,8).list.item,
 # L<S02/Names/"$_, $!, and $/ are context<rw> by default">
 {
   my @array = <a b c d>;
-  #?rakudo 2 skip 'test error -- is $_ rw here?'
-  is @array.grep-index({ $_ ~= "c"; 1 })), [0..3],
-    'mutating $_ in grep-index works (1)';
+  is @array.grep({ $_ ~= "c"; 1 }, :k), [0..3],
+    'mutating $_ in grep works (1)';
   is @array, [<ac bc cc dc>],
-    'mutating $_ in grep-index works (2)';
+    'mutating $_ in grep works (2)';
 }
 
-# grep-index with last, next etc.
+# grep with last, next etc.
 {
-    is (1..16).grep-index({last if $_ % 5 == 0; $_ % 2 == 0}),
-       (1,3).list.item, 'last works in grep-index';
-    is (1..12).grep-index({next if $_ % 5 == 0; $_ % 2 == 0}),
-       (1,3,5,7,11).list.item, 'next works in grep-index';
+    is (1..16).grep({last if $_ % 5 == 0; $_ % 2 == 0}, :k),
+       (1,3).list.item, 'last works in grep';
+    is (1..12).grep({next if $_ % 5 == 0; $_ % 2 == 0}, :k),
+       (1,3,5,7,11).list.item, 'next works in grep';
 }
 
-# since the test argument to .grep-index is a Matcher, we can also
+# since the test argument to .grep is a Matcher, we can also
 # check type constraints:
 {
-    is (2, [], 4, [], 5).grep-index(Int),
-       (0,2,4).list.item, ".grep-index with non-Code matcher";
+    is (2, [], 4, [], 5).grep(Int, :k),
+       (0,2,4).list.item, ".grep with non-Code matcher";
 
-    is grep-index(Int, 2, [], 4, [], 5),
-       (0,2,4).list.item, "grep-index with non-Code matcher";
+    is grep(Int, 2, [], 4, [], 5, :k),
+       (0,2,4).list.item, "grep with non-Code matcher";
 }
 
 {
     my @a = <a b c>;
     my @b = <b c d>;
-    is @a.grep-index(any(@b)), (1,2).list.item, 'Junction matcher';
+    is @a.grep(any(@b), :k), (1,2).list.item, 'Junction matcher';
 
 }
 
 # Bool handling
 {
-    throws-like { grep-index $_ == 1, 1,2,3 }, X::Match::Bool;
-    throws-like { (1,2,3).grep-index: $_== 1 }, X::Match::Bool;
-    is grep-index( Bool,True,False,Int ), (0,1), 'can we match on Bool as type';
-    is (True,False,Int).grep-index(Bool), (0,1), 'can we match on Bool as type';
+    throws-like { grep $_ == 1, 1,2,3, :k }, X::Match::Bool;
+    throws-like { (1,2,3).grep: $_== 1, :k }, X::Match::Bool;
+    is grep( Bool,True,False,Int, :k ), (0,1), 'can we match on Bool as type';
+    is (True,False,Int).grep(Bool, :k), (0,1), 'can we match on Bool as type';
 }
 
 # vim: ft=perl6