Further work on optimizing :delete in sink context

rakudo · Aug 4, 2014 · f48e207 · f48e207
1 parent f8b669c
commit f48e207
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/src/core/Any.pm b/src/core/Any.pm
@@ -531,8 +531,7 @@ sub SLICE_ONE ( \SELF, $one, $array, *%adv ) is hidden_from_backtrace {
         if %a.delete_key('delete') {          # :delete:*
             my $de = SELF.can( $array ?? 'delete_pos' !! 'delete_key' )[0];
             if %a.delete_key('SINK') {          # :delete:SINK
-                $de(SELF,$one);
-                Nil;
+                $de(SELF,$one,:SINK);
             }
             elsif !%a {                         # :delete
                 $de(SELF,$one);
@@ -718,7 +717,7 @@ sub SLICE_MORE ( \SELF, $more, $array, *%adv ) is hidden_from_backtrace {
         if %a.delete_key('delete') {       # :delete:*
             my $de = SELF.can( $array ?? 'delete_pos' !! 'delete_key' )[0];
             if %a.delete_key('SINK') {       # :delete:SINK
-                $de(SELF,$_) for $more;
+                $de(SELF,$_,:SINK) for $more;
                 Nil;
             }
             elsif !%a {                      # :delete

diff --git a/src/core/Array.pm b/src/core/Array.pm
@@ -92,7 +92,7 @@ class Array { # declared in BOOTSTRAP
         DEPRECATED("the :delete adverb with postcircumfix:<[ ]>");
         self.delete_pos(pos);
     }
-    method delete_pos(\pos) {
+    method delete_pos(\pos, :$SINK) {
         fail X::Subscript::FromEnd.new(index => pos, type => self.WHAT) if pos < 0;
 
         my $value := self.at_pos(pos); # needed for reification

diff --git a/src/core/Hash.pm b/src/core/Hash.pm
@@ -144,6 +144,13 @@ my class Hash { # declared in BOOTSTRAP
         );
         $val;
     }
+    multi method delete_key(Str:D \key, :$SINK!) {
+        nqp::deletekey(
+            nqp::getattr(self, EnumMap, '$!storage'),
+            nqp::unbox_s(key)
+        );
+        Nil;
+    }
     multi method delete_key(\key as Str) {
         my Mu $val = self.at_key(key);
         nqp::deletekey(
@@ -152,6 +159,13 @@ my class Hash { # declared in BOOTSTRAP
         );
         $val;
     }
+    multi method delete_key(\key as Str, :$SINK!) {
+        nqp::deletekey(
+            nqp::getattr(self, EnumMap, '$!storage'),
+            nqp::unbox_s(key)
+        );
+        Nil;
+    }
 
     method push(*@values) {
         my $previous;