Make .indices quite a bit faster

Especially the Cool variants. Mostly by making them share the same proto and getting rid of the |c signature.
rakudo · Sep 30, 2019 · 519cfde · 519cfde
1 parent 6297b0e
commit 519cfde
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/src/core.c/Cool.pm6 b/src/core.c/Cool.pm6
@@ -207,8 +207,18 @@ my class Cool { # declared in BOOTSTRAP
         self.Str.contains($needle, $pos.Int)
     }
 
-    method indices(Cool:D: |c) {
-        self.Str.indices(|c)
+    proto method indices(|) {*}
+    multi method indices(Cool:D: Cool:D $needle, :$overlap) {
+        self.Str.indices: $needle.Str, :$overlap
+    }   
+    multi method indices(Cool:D: Str:D $needle, :$overlap) {
+        self.Str.indices: $needle, :$overlap
+    }   
+    multi method indices(Cool:D: Cool:D $needle, Cool:D $start, :$overlap) {
+        self.Str.indices: $needle.Str, $start.Int, :$overlap
+    }   
+    multi method indices(Cool:D: Str:D $needle, Int:D $start, :$overlap) {
+        self.Str.indices: $needle, $start, :$overlap
     }
 
     proto method index(|) {*}

diff --git a/src/core.c/Str.pm6 b/src/core.c/Str.pm6
@@ -206,10 +206,8 @@ my class Str does Stringy { # declared in BOOTSTRAP
         self.contains($needle, $pos.Int)
     }
 
-    # TODO Use coercer in 1 candidate when RT131014
-    proto method indices(|) {*}
-    multi method indices(Str:D: Cool:D $needle, *%pars) {
-        self.indices: $needle.Str, |%pars
+    multi method indices(Str:D: Cool:D $needle, :$overlap) {
+        self.indices: $needle.Str, :$overlap
     }
     multi method indices(Str:D: Str:D $needle, :$overlap) {
         nqp::stmts(
@@ -225,11 +223,11 @@ my class Str does Stringy { # declared in BOOTSTRAP
               ($pos = nqp::add_i($i,$add))
             )
           ),
-          $indices.List
+          nqp::p6bindattrinvres(nqp::create(List),List,'$!reified',$indices)
         )
     }
-    multi method indices(Str:D: Cool:D $needle, Cool:D $start, *%pars) {
-        self.indices: $needle.Str, $start.Int, |%pars
+    multi method indices(Str:D: Cool:D $needle, Cool:D $start, :$overlap) {
+        self.indices: $needle.Str, $start.Int, :$overlap
     }
     multi method indices(Str:D: Str:D $needle, Int:D $start, :$overlap) {
         nqp::stmts(
@@ -249,7 +247,7 @@ my class Str does Stringy { # declared in BOOTSTRAP
                   ($pos = nqp::add_i($i,$add))
                 )
               ),
-              $indices.List
+              nqp::p6bindattrinvres(nqp::create(List),List,'$!reified',$indices)
             )
           )
         )