Bring implementation (exists|delete)_key in line

rakudo · Aug 4, 2014 · 1070a89 · 1070a89
1 parent 59fee83
commit 1070a89
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/core/EnumMap.pm b/src/core/EnumMap.pm
@@ -45,10 +45,10 @@ my class EnumMap does Associative { # declared in BOOTSTRAP
             && nqp::existskey($!storage, nqp::unbox_s(key))
         )
     }
-    multi method exists_key(EnumMap:D: \key) {
+    multi method exists_key(EnumMap:D: \key as Str) {
         nqp::p6bool(
             nqp::defined($!storage)
-            && nqp::existskey($!storage, nqp::unbox_s(key.Stringy))
+            && nqp::existskey($!storage, nqp::unbox_s(key))
         )
     }
 

diff --git a/src/core/Hash.pm b/src/core/Hash.pm
@@ -136,6 +136,14 @@ my class Hash { # declared in BOOTSTRAP
 
     proto method delete_key(|) { * }
     multi method delete_key(Hash:U:) { Nil }
+    multi method delete_key(Str:D \key) {
+        my Mu $val = self.at_key(key);
+        nqp::deletekey(
+            nqp::getattr(self, EnumMap, '$!storage'),
+            nqp::unbox_s(key)
+        );
+        $val;
+    }
     multi method delete_key(\key as Str) {
         my Mu $val = self.at_key(key);
         nqp::deletekey(