[ruby-dev:13067] Re: patch for ext/gdbm

新井です。

In message "[ruby-dev:13060] Re: patch for ext/gdbm"
  on 30 Apr 2001 02:17:54 +0900,
  Koji Arai <[e-mail]> wrote:

> では、その方向で修正したパッチをつけます。

すみません。GDBM#delete_if はちょっと甘かったです。
追加パッチつけます。


--- gdbm.c.bak	Mon Apr 30 01:36:15 2001
+++ gdbm.c	Mon Apr 30 23:54:30 2001
@@ -409,8 +409,8 @@ fgdbm_delete_if(obj)
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
     VALUE keystr, valstr;
-    VALUE ary = rb_ary_new();
-    int i;
+    VALUE ret, ary = rb_ary_new();
+    int i, status = 0;
 
     rb_secure(4);
     GetDBM(obj, dbmp);
@@ -423,13 +423,19 @@ fgdbm_delete_if(obj)
 
 	valstr = rb_gdbm_fetch2(dbm, keystr);
 
-	if (RTEST(rb_yield(rb_assoc_new(rb_str_dup(keystr), valstr)))) {
-            rb_ary_push(ary, keystr);
-	}
+        ret = rb_protect(rb_yield, rb_assoc_new(rb_str_dup(keystr), valstr),
+                         &status);
+        if (status != 0) {
+            dbmp->di_size -= 1;
+            goto delete;
+        }
+	if (RTEST(ret)) rb_ary_push(ary, keystr);
     }
 
+ delete:
     for (i = 0; i < RARRAY(ary)->len; i++)
         rb_gdbm_delete(obj, RARRAY(ary)->ptr[i]);
+    if (status) rb_jump_tag(status);
 
     return obj;
 }
--- testgdbm.rb.bak	Mon Apr 30 01:21:50 2001
+++ testgdbm.rb	Tue May  1 00:14:18 2001
@@ -45,6 +45,18 @@
     p Dir.glob("tmptest_gdbm*") if $DEBUG
   end
 
+  def check_size(expect, gdbm=@gdbm)
+    assert_equals(expect, gdbm.size)
+    n = 0
+    gdbm.each { n+=1 }
+    assert_equals(expect, n)
+    if expect == 0
+      assert_equals(true, gdbm.empty?)
+    else
+      assert_equals(false, gdbm.empty?)
+    end
+  end
+
   def test_version
     STDERR.print GDBM::VERSION
   end
@@ -430,11 +442,40 @@
 
     ret = @gdbm.delete_if {|key, val| key.to_i < 50}
     assert_equals(@gdbm, ret)
-    assert_equals(50, @gdbm.size)
+    check_size(50, @gdbm)
 
     ret = @gdbm.delete_if {|key, val| key.to_i >= 50}
     assert_equals(@gdbm, ret)
-    assert_equals(0, @gdbm.size)
+    check_size(0, @gdbm)
+
+    # break
+    100.times {|v| @gdbm[v] = v}
+    check_size(100, @gdbm)
+    n = 0;
+    @gdbm.delete_if {|key, val|
+      break if n > 50
+      n+=1
+      true
+    }
+    assert_equals(51, n)
+    check_size(49, @gdbm)
+
+    @gdbm.clear
+
+    # raise
+    100.times {|v| @gdbm[v] = v}
+    check_size(100, @gdbm)
+    n = 0;
+    begin
+      @gdbm.delete_if {|key, val|
+	raise "runtime error" if n > 50
+	n+=1
+	true
+      }
+    rescue
+    end
+    assert_equals(51, n)
+    check_size(49, @gdbm)
   end
 
   def test_reject