* eval.c (localjump_destination): lambda should not interfere

  return from the yielded block.

* hash.c (delete_if_i): use st_delete_safe() (via
  rb_hash_delete()) instead of returning ST_DELETE.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5842 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 5 deletions

diff --git a/hash.c b/hash.c
index b15bd2488b..63797b84e8 100644
--- a/hash.c
+++ b/hash.c
@@ -679,12 +679,13 @@ rb_hash_shift(hash)
 }
 
 static enum st_retval
-delete_if_i(key, value)
-    VALUE key, value;
+delete_if_i(key, value, hash)
+    VALUE key, value, hash;
 {
     if (key == Qundef) return ST_CONTINUE;
-    if (RTEST(rb_yield_values(2, key, value)))
-	return ST_DELETE;
+    if (RTEST(rb_yield_values(2, key, value))) {
+	rb_hash_delete(hash, key);
+    }
     return ST_CONTINUE;
 }
 
@@ -705,7 +706,7 @@ rb_hash_delete_if(hash)
     VALUE hash;
 {
     rb_hash_modify(hash);
-    rb_hash_foreach(hash, delete_if_i, 0);
+    rb_hash_foreach(hash, delete_if_i, hash);
     return hash;
 }