Removed PIR of grep and replaced with P6 version.

Signed-off-by: Moritz Lenz <moritz@faui2k3.org>
rakudo · Mar 7, 2009 · 7559fc9 · 7559fc9
1 parent f6cdf9b
commit 7559fc9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 34 deletions.
diff --git a/build/Makefile.in b/build/Makefile.in
@@ -106,6 +106,7 @@ BUILTINS_PIR = \
   src/builtins/traits.pir \
 
 SETTING = \
+  src/setting/Any-list.pm \
   src/setting/Any-str.pm \
   src/setting/Array.pm \
   src/setting/Bool.pm \

diff --git a/src/builtins/any-list.pir b/src/builtins/any-list.pir
@@ -94,40 +94,6 @@ the size of that file down and to emphasize their generic,
     .return(retv)
 .end
 
-=item grep(...)
-
-=cut
-
-.namespace []
-.sub 'grep' :multi('Sub')
-    .param pmc test
-    .param pmc values          :slurpy
-    .tailcall values.'grep'(test)
-.end
-
-.namespace ['Any']
-.sub 'grep' :method :multi(_, 'Sub')
-    .param pmc test
-    .local pmc retv
-    .local pmc iter
-    .local pmc block_res
-    .local pmc block_arg
-
-    retv = new 'List'
-    iter = self.'iterator'()
-  loop:
-    unless iter goto done
-    block_arg = shift iter
-    block_res = test(block_arg)
-
-    unless block_res goto loop
-    retv.'push'(block_arg)
-    goto loop
-
-  done:
-    .return(retv)
-.end
-
 =item join
 
 =cut

diff --git a/src/setting/Any-list.pm b/src/setting/Any-list.pm
@@ -0,0 +1,11 @@
+class Any is also {
+    our List multi method grep($values: Code $test) {
+	gather {
+	    take $_ if $test($_) for $values.list;
+	}
+    }
+}
+
+our List multi grep(Code $test, *@values) {
+    @values.grep($test)
+}