Hash#{reject,reject!} fix yield value

mruby · Mar 23, 2014 · d9068f0 · d9068f0
1 parent d8fc05f
commit d9068f0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/mrbgems/mruby-enumerator/test/enumerator.rb b/mrbgems/mruby-enumerator/test/enumerator.rb
@@ -508,6 +508,20 @@ def (o = Object.new).each
   assert_equal({3=>4}, h)
 end
 
+assert 'Hash#reject' do
+  h = {1=>2,3=>4,5=>6}
+  hret = h.reject.with_index {|a,b| a[1] == 4}
+  assert_equal({1=>2,5=>6}, hret)
+  assert_equal({1=>2,3=>4,5=>6}, h)
+end
+
+assert 'Hash#reject!' do
+  h = {1=>2,3=>4,5=>6}
+  hret = h.reject!.with_index {|a,b| a[1] == 4}
+  assert_equal h, hret
+  assert_equal({1=>2,5=>6}, h)
+end
+
 assert 'Range#each' do
   a = (1..5)
   b = a.each

diff --git a/mrblib/hash.rb b/mrblib/hash.rb
@@ -139,7 +139,7 @@ def reject!(&b)
     keys = []
     self.each_key{|k|
       v = self[k]
-      if b.call(k, v)
+      if b.call([k, v])
         keys.push(k)
       end
     }
@@ -157,7 +157,7 @@ def reject(&b)
     h = {}
     self.each_key{|k|
       v = self[k]
-      unless b.call(k, v)
+      unless b.call([k, v])
         h[k] = v
       end
     }