* misc/ruby-mode.el (ruby-calculate-indent): proper indentation

  inside of parentheses.  [ruby-dev:22308]

* hash.c (delete_if_i): do not use ST_DELETE for thread safety.
  [ruby-dev:21899]  (not fully solved)


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

1 files changed, 12 insertions, 6 deletions

diff --git a/hash.c b/hash.c
index 102682c0b3..48c0aba7ac 100644
--- a/hash.c
+++ b/hash.c
@@ -460,12 +460,12 @@ rb_hash_shift(hash)
 }
 
 static enum st_retval
-delete_if_i(key, value)
-    VALUE key, value;
+delete_if_i(key, value, keys)
+    VALUE key, value, keys;
 {
-    if (key == Qundef) return ST_CONTINUE;
-    if (RTEST(rb_yield_values(2, key, value)))
-	return ST_DELETE;
+    if (key != Qundef && RTEST(rb_yield_values(2, key, value))) {
+	rb_ary_push(keys, key);
+    }
     return ST_CONTINUE;
 }
 
@@ -473,8 +473,14 @@ VALUE
 rb_hash_delete_if(hash)
     VALUE hash;
 {
+    VALUE keys = rb_ary_new();
+    long i;
+
     rb_hash_modify(hash);
-    rb_hash_foreach(hash, delete_if_i, 0);
+    rb_hash_foreach(hash, delete_if_i, keys);
+    for (i=0; i<RARRAY(keys)->len; i++) {
+	st_delete(RHASH(hash)->tbl, &RARRAY(keys)->ptr[i], 0);
+    }
     return hash;
 }