From: Koji Arai Date: 2002-02-27T03:02:26+09:00 Subject: [ruby-dev:16126] patch for gdbm, dbm and sdbm 新井です。 gdbm, dbm, sdbm のパッチを書きました。(1.7 のみ。1.6 は無視) 変更点は、 o sdbm にも SDBMError クラスを追加 o closed_dbm/gdbm/sdbm も [SG]?DBMError に o 比較のために関数の記述順をそろえた(dbm_close とかの位置) o select メソッドを 1.7 仕様にした。 o SDBM, DBM の delete を Hash 互換に(GDBM は既にそうしていた) o [GS]?DBM#delete のテストを修正 o gdbm のイテレータでキーを dup してブロックの引数に渡しているが 必要ない気がするのではずした(私が昔そうしたような気もする)。 余計な修正もしているのでパッチがちょっとでかいです。すみません。 # ChangeLog もなしです。重ね重ねすみません。 -- 新井康司 (Koji Arai) Index: ext/dbm/dbm.c =================================================================== RCS file: /usr/local/cvsup/ruby/ruby/ext/dbm/dbm.c,v retrieving revision 1.17 diff -u -p -u -r1.17 dbm.c --- ext/dbm/dbm.c 24 May 2001 06:10:36 -0000 1.17 +++ ext/dbm/dbm.c 26 Feb 2002 17:25:11 -0000 @@ -32,7 +32,7 @@ struct dbmdata { static void closed_dbm() { - rb_raise(rb_eRuntimeError, "closed DBM file"); + rb_raise(rb_eDBMError, "closed DBM file"); } #define GetDBM(obj, dbmp) {\ @@ -51,7 +51,18 @@ free_dbm(dbmp) } } -static VALUE fdbm_close _((VALUE)); +static VALUE +fdbm_close(obj) + VALUE obj; +{ + struct dbmdata *dbmp; + + GetDBM(obj, dbmp); + dbm_close(dbmp->di_dbm); + dbmp->di_dbm = 0; + + return Qnil; +} static VALUE fdbm_s_new(argc, argv, klass) @@ -130,19 +141,6 @@ fdbm_s_open(argc, argv, klass) } static VALUE -fdbm_close(obj) - VALUE obj; -{ - struct dbmdata *dbmp; - - GetDBM(obj, dbmp); - dbm_close(dbmp->di_dbm); - dbmp->di_dbm = 0; - - return Qnil; -} - -static VALUE fdbm_fetch(obj, keystr, ifnone) VALUE obj, keystr, ifnone; { @@ -230,12 +228,52 @@ fdbm_indexes(argc, argv, obj) } static VALUE +fdbm_select(argc, argv, obj) + int argc; + VALUE *argv; + VALUE obj; +{ + VALUE new = rb_ary_new2(argc); + int i; + + if (rb_block_given_p()) { + datum key, val; + DBM *dbm; + struct dbmdata *dbmp; + VALUE keystr, valstr; + + if (argc > 0) { + rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc); + } + GetDBM(obj, dbmp); + dbm = dbmp->di_dbm; + + for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) { + VALUE assoc; + val = dbm_fetch(dbm, key); + assoc = rb_assoc_new(rb_tainted_str_new(key.dptr, key.dsize), + rb_tainted_str_new(val.dptr, val.dsize)); + if (RTEST(rb_yield(assoc))) + rb_ary_push(new, assoc); + } + } + else { + for (i=0; idi_size = -1; rb_raise(rb_eDBMError, "dbm_delete failed"); @@ -258,7 +299,7 @@ fdbm_delete(obj, keystr) else if (dbmp->di_size >= 0) { dbmp->di_size--; } - return obj; + return valstr; } static VALUE @@ -691,6 +732,7 @@ Init_dbm() rb_define_method(rb_cDBM, "index", fdbm_index, 1); rb_define_method(rb_cDBM, "indexes", fdbm_indexes, -1); rb_define_method(rb_cDBM, "indices", fdbm_indexes, -1); + rb_define_method(rb_cDBM, "select", fdbm_select, -1); rb_define_method(rb_cDBM, "length", fdbm_length, 0); rb_define_method(rb_cDBM, "size", fdbm_length, 0); rb_define_method(rb_cDBM, "empty?", fdbm_empty_p, 0); Index: ext/dbm/testdbm.rb =================================================================== RCS file: /usr/local/cvsup/ruby/ruby/ext/dbm/testdbm.rb,v retrieving revision 1.1 diff -u -p -u -r1.1 testdbm.rb --- ext/dbm/testdbm.rb 6 May 2001 15:02:36 -0000 1.1 +++ ext/dbm/testdbm.rb 26 Feb 2002 17:17:14 -0000 @@ -165,7 +165,7 @@ class TestDBM < RUNIT::TestCase assert_nil(dbm.close) # closed DBM file - assert_exception(RuntimeError) { dbm.close } + assert_exception(DBMError) { dbm.close } end def test_aref @@ -245,6 +245,25 @@ class TestDBM < RUNIT::TestCase assert_equals(values.reverse, @dbm.indexes(*keys.reverse)) end + def test_select + keys = %w(foo bar baz) + values = %w(FOO BAR BAZ) + @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values + assert_equals(values.reverse, @dbm.select(*keys.reverse)) + end + + def test_select_with_block + keys = %w(foo bar baz) + values = %w(FOO BAR BAZ) + @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values + ret = @dbm.select {|k,v| + assert_equals(k.upcase, v) + k != "bar" + } + assert_equals([['baz', 'BAZ'], ['foo', 'FOO']], + ret.sort) + end + def test_length num = 10 assert_equals(0, @dbm.size) @@ -377,7 +396,7 @@ class TestDBM < RUNIT::TestCase @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values - assert_equals(@dbm, @dbm.delete(key)) + assert_equals('BAR', @dbm.delete(key)) assert_nil(@dbm[key]) assert_equals(2, @dbm.size) @@ -394,12 +413,13 @@ class TestDBM < RUNIT::TestCase def test_delete_with_block key = 'no called block' @dbm[key] = 'foo' - assert_equals(@dbm, @dbm.delete(key) {|k| k.replace 'called block'}) + assert_equals('foo', @dbm.delete(key) {|k| k.replace 'called block'}) assert_equals('no called block', key) assert_equals(0, @dbm.size) key = 'no called block' - assert_nil(@dbm.delete(key) {|k| k.replace 'called block'}) + assert_equals(:blockval, + @dbm.delete(key) {|k| k.replace 'called block'; :blockval}) assert_equals('called block', key) assert_equals(0, @dbm.size) end Index: ext/gdbm/gdbm.c =================================================================== RCS file: /usr/local/cvsup/ruby/ruby/ext/gdbm/gdbm.c,v retrieving revision 1.21 diff -u -p -u -r1.21 gdbm.c --- ext/gdbm/gdbm.c 13 Dec 2001 08:19:09 -0000 1.21 +++ ext/gdbm/gdbm.c 24 Feb 2002 20:04:14 -0000 @@ -14,11 +14,11 @@ #include #include -static VALUE cGDBM, rb_eGDBMError, rb_eGDBMFatalError; +static VALUE rb_cGDBM, rb_eGDBMError, rb_eGDBMFatalError; #define MY_BLOCK_SIZE (2048) #define MY_FATAL_FUNC rb_gdbm_fatal -void +static void rb_gdbm_fatal(msg) char *msg; { @@ -52,7 +52,18 @@ free_dbm(dbmp) } } -static VALUE fgdbm_close _((VALUE)); +static VALUE +fgdbm_close(obj) + VALUE obj; +{ + struct dbmdata *dbmp; + + GetDBM(obj, dbmp); + gdbm_close(dbmp->di_dbm); + dbmp->di_dbm = 0; + + return Qnil; +} static VALUE fgdbm_s_new(argc, argv, klass) @@ -141,19 +152,6 @@ fgdbm_s_open(argc, argv, klass) } static VALUE -fgdbm_close(obj) - VALUE obj; -{ - struct dbmdata *dbmp; - - GetDBM(obj, dbmp); - gdbm_close(dbmp->di_dbm); - dbmp->di_dbm = 0; - - return Qnil; -} - -static VALUE rb_gdbm_fetch(dbm, key) GDBM_FILE dbm; datum key; @@ -219,7 +217,7 @@ rb_gdbm_firstkey(dbm) RSTRING(str)->ptr[RSTRING(str)->len] = '\0'; OBJ_TAINT(str); - return (VALUE)str; + return str; } static VALUE @@ -243,7 +241,7 @@ rb_gdbm_nextkey(dbm, keystr) RSTRING(str)->ptr[RSTRING(str)->len] = '\0'; OBJ_TAINT(str); - return (VALUE)str; + return str; } static VALUE @@ -327,6 +325,43 @@ fgdbm_indexes(argc, argv, obj) } static VALUE +fgdbm_select(argc, argv, obj) + int argc; + VALUE *argv; + VALUE obj; +{ + VALUE new = rb_ary_new2(argc); + int i; + + if (rb_block_given_p()) { + GDBM_FILE dbm; + struct dbmdata *dbmp; + VALUE keystr; + + if (argc > 0) { + rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc); + } + GetDBM(obj, dbmp); + dbm = dbmp->di_dbm; + + for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr); + keystr = rb_gdbm_nextkey(dbm, keystr)) { + VALUE assoc = rb_assoc_new(keystr, rb_gdbm_fetch2(dbm, keystr)); + + if (RTEST(rb_yield(assoc))) + rb_ary_push(new, assoc); + } + } + else { + for (i=0; i #include -static VALUE cSDBM; +static VALUE rb_cDBM, rb_eDBMError; struct dbmdata { int di_size; @@ -26,7 +26,7 @@ struct dbmdata { static void closed_sdbm() { - rb_raise(rb_eRuntimeError, "closed SDBM file"); + rb_raise(rb_eDBMError, "closed SDBM file"); } #define GetDBM(obj, dbmp) {\ @@ -57,6 +57,17 @@ fsdbm_close(obj) } static VALUE +fsdbm_s_new(argc, argv, klass) + int argc; + VALUE *argv; + VALUE klass; +{ + VALUE obj = Data_Wrap_Struct(klass, 0, free_sdbm, 0); + rb_obj_call_init(obj, argc, argv); + return obj; +} + +static VALUE fsdbm_initialize(argc, argv, obj) int argc; VALUE *argv; @@ -100,17 +111,6 @@ fsdbm_initialize(argc, argv, obj) } static VALUE -fsdbm_s_new(argc, argv, klass) - int argc; - VALUE *argv; - VALUE klass; -{ - VALUE obj = Data_Wrap_Struct(klass, 0, free_sdbm, 0); - rb_obj_call_init(obj, argc, argv); - return obj; -} - -static VALUE fsdbm_s_open(argc, argv, klass) int argc; VALUE *argv; @@ -216,12 +216,52 @@ fsdbm_indexes(argc, argv, obj) } static VALUE +fsdbm_select(argc, argv, obj) + int argc; + VALUE *argv; + VALUE obj; +{ + VALUE new = rb_ary_new2(argc); + int i; + + if (rb_block_given_p()) { + datum key, val; + DBM *dbm; + struct dbmdata *dbmp; + VALUE keystr, valstr; + + if (argc > 0) { + rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc); + } + GetDBM(obj, dbmp); + dbm = dbmp->di_dbm; + + for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) { + VALUE assoc; + val = sdbm_fetch(dbm, key); + assoc = rb_assoc_new(rb_tainted_str_new(key.dptr, key.dsize), + rb_tainted_str_new(val.dptr, val.dsize)); + if (RTEST(rb_yield(assoc))) + rb_ary_push(new, assoc); + } + } + else { + for (i=0; idi_size = -1; - rb_raise(rb_eRuntimeError, "dbm_delete failed"); + rb_raise(rb_eDBMError, "dbm_delete failed"); } else if (dbmp->di_size >= 0) { dbmp->di_size--; } - return obj; + return valstr; } static VALUE @@ -304,7 +347,7 @@ fsdbm_delete_if(obj) key.dptr = RSTRING(keystr)->ptr; key.dsize = RSTRING(keystr)->len; if (sdbm_delete(dbm, key)) { - rb_raise(rb_eRuntimeError, "sdbm_delete failed"); + rb_raise(rb_eDBMError, "sdbm_delete failed"); } } if (status) rb_jump_tag(status); @@ -327,7 +370,7 @@ fsdbm_clear(obj) dbmp->di_size = -1; while (key = sdbm_firstkey(dbm), key.dptr) { if (sdbm_delete(dbm, key)) { - rb_raise(rb_eRuntimeError, "sdbm_delete failed"); + rb_raise(rb_eDBMError, "sdbm_delete failed"); } } dbmp->di_size = 0; @@ -381,7 +424,7 @@ static VALUE fsdbm_update(obj, other) VALUE obj, other; { - rb_iterate((VALUE(*)_((VALUE)))each_pair, other, update_i, obj); + rb_iterate(each_pair, other, update_i, obj); return obj; } @@ -390,7 +433,7 @@ fsdbm_replace(obj, other) VALUE obj, other; { fsdbm_clear(obj); - rb_iterate((VALUE(*)_((VALUE)))each_pair, other, update_i, obj); + rb_iterate(each_pair, other, update_i, obj); return obj; } @@ -427,7 +470,7 @@ fsdbm_store(obj, keystr, valstr) sdbm_clearerr(dbm); #endif if (errno == EPERM) rb_sys_fail(0); - rb_raise(rb_eRuntimeError, "sdbm_store failed"); + rb_raise(rb_eDBMError, "sdbm_store failed"); } return valstr; @@ -670,46 +713,49 @@ fsdbm_reject(obj) void Init_sdbm() { - cSDBM = rb_define_class("SDBM", rb_cObject); - rb_include_module(cSDBM, rb_mEnumerable); - - rb_define_singleton_method(cSDBM, "open", fsdbm_s_open, -1); - rb_define_singleton_method(cSDBM, "new", fsdbm_s_new, -1); - rb_define_method(cSDBM, "initialize", fsdbm_initialize, -1); - rb_define_method(cSDBM, "close", fsdbm_close, 0); - rb_define_method(cSDBM, "[]", fsdbm_aref, 1); - rb_define_method(cSDBM, "fetch", fsdbm_fetch_m, -1); - rb_define_method(cSDBM, "[]=", fsdbm_store, 2); - rb_define_method(cSDBM, "store", fsdbm_store, 2); - rb_define_method(cSDBM, "index", fsdbm_index, 1); - rb_define_method(cSDBM, "indexes", fsdbm_indexes, -1); - rb_define_method(cSDBM, "indices", fsdbm_indexes, -1); - rb_define_method(cSDBM, "length", fsdbm_length, 0); - rb_define_alias(cSDBM, "size", "length"); - rb_define_method(cSDBM, "empty?", fsdbm_empty_p, 0); - rb_define_method(cSDBM, "each", fsdbm_each_pair, 0); - rb_define_method(cSDBM, "each_value", fsdbm_each_value, 0); - rb_define_method(cSDBM, "each_key", fsdbm_each_key, 0); - rb_define_method(cSDBM, "each_pair", fsdbm_each_pair, 0); - rb_define_method(cSDBM, "keys", fsdbm_keys, 0); - rb_define_method(cSDBM, "values", fsdbm_values, 0); - rb_define_method(cSDBM, "shift", fsdbm_shift, 0); - rb_define_method(cSDBM, "delete", fsdbm_delete, 1); - rb_define_method(cSDBM, "delete_if", fsdbm_delete_if, 0); - rb_define_method(cSDBM, "reject!", fsdbm_delete_if, 0); - rb_define_method(cSDBM, "reject", fsdbm_reject, 0); - rb_define_method(cSDBM, "clear", fsdbm_clear, 0); - rb_define_method(cSDBM,"invert", fsdbm_invert, 0); - rb_define_method(cSDBM,"update", fsdbm_update, 1); - rb_define_method(cSDBM,"replace", fsdbm_replace, 1); - - rb_define_method(cSDBM, "include?", fsdbm_has_key, 1); - rb_define_method(cSDBM, "has_key?", fsdbm_has_key, 1); - rb_define_method(cSDBM, "member?", fsdbm_has_key, 1); - rb_define_method(cSDBM, "has_value?", fsdbm_has_value, 1); - rb_define_method(cSDBM, "key?", fsdbm_has_key, 1); - rb_define_method(cSDBM, "value?", fsdbm_has_value, 1); + rb_cDBM = rb_define_class("SDBM", rb_cObject); + rb_eDBMError = rb_define_class("SDBMError", rb_eStandardError); + rb_include_module(rb_cDBM, rb_mEnumerable); + + rb_define_singleton_method(rb_cDBM, "new", fsdbm_s_new, -1); + rb_define_singleton_method(rb_cDBM, "open", fsdbm_s_open, -1); + + rb_define_method(rb_cDBM, "initialize", fsdbm_initialize, -1); + rb_define_method(rb_cDBM, "close", fsdbm_close, 0); + rb_define_method(rb_cDBM, "[]", fsdbm_aref, 1); + rb_define_method(rb_cDBM, "fetch", fsdbm_fetch_m, -1); + rb_define_method(rb_cDBM, "[]=", fsdbm_store, 2); + rb_define_method(rb_cDBM, "store", fsdbm_store, 2); + rb_define_method(rb_cDBM, "index", fsdbm_index, 1); + rb_define_method(rb_cDBM, "indexes", fsdbm_indexes, -1); + rb_define_method(rb_cDBM, "indices", fsdbm_indexes, -1); + rb_define_method(rb_cDBM, "select", fsdbm_select, -1); + rb_define_method(rb_cDBM, "length", fsdbm_length, 0); + rb_define_method(rb_cDBM, "size", fsdbm_length, 0); + rb_define_method(rb_cDBM, "empty?", fsdbm_empty_p, 0); + rb_define_method(rb_cDBM, "each", fsdbm_each_pair, 0); + rb_define_method(rb_cDBM, "each_value", fsdbm_each_value, 0); + rb_define_method(rb_cDBM, "each_key", fsdbm_each_key, 0); + rb_define_method(rb_cDBM, "each_pair", fsdbm_each_pair, 0); + rb_define_method(rb_cDBM, "keys", fsdbm_keys, 0); + rb_define_method(rb_cDBM, "values", fsdbm_values, 0); + rb_define_method(rb_cDBM, "shift", fsdbm_shift, 0); + rb_define_method(rb_cDBM, "delete", fsdbm_delete, 1); + rb_define_method(rb_cDBM, "delete_if", fsdbm_delete_if, 0); + rb_define_method(rb_cDBM, "reject!", fsdbm_delete_if, 0); + rb_define_method(rb_cDBM, "reject", fsdbm_reject, 0); + rb_define_method(rb_cDBM, "clear", fsdbm_clear, 0); + rb_define_method(rb_cDBM,"invert", fsdbm_invert, 0); + rb_define_method(rb_cDBM,"update", fsdbm_update, 1); + rb_define_method(rb_cDBM,"replace", fsdbm_replace, 1); + + rb_define_method(rb_cDBM, "include?", fsdbm_has_key, 1); + rb_define_method(rb_cDBM, "has_key?", fsdbm_has_key, 1); + rb_define_method(rb_cDBM, "member?", fsdbm_has_key, 1); + rb_define_method(rb_cDBM, "has_value?", fsdbm_has_value, 1); + rb_define_method(rb_cDBM, "key?", fsdbm_has_key, 1); + rb_define_method(rb_cDBM, "value?", fsdbm_has_value, 1); - rb_define_method(cSDBM, "to_a", fsdbm_to_a, 0); - rb_define_method(cSDBM, "to_hash", fsdbm_to_hash, 0); + rb_define_method(rb_cDBM, "to_a", fsdbm_to_a, 0); + rb_define_method(rb_cDBM, "to_hash", fsdbm_to_hash, 0); } Index: ext/sdbm/testsdbm.rb =================================================================== RCS file: /usr/local/cvsup/ruby/ruby/ext/sdbm/testsdbm.rb,v retrieving revision 1.1 diff -u -p -u -r1.1 testsdbm.rb --- ext/sdbm/testsdbm.rb 6 May 2001 15:03:35 -0000 1.1 +++ ext/sdbm/testsdbm.rb 26 Feb 2002 17:22:07 -0000 @@ -139,7 +139,7 @@ class TestSDBM < RUNIT::TestCase assert_nil(sdbm.close) # closed SDBM file - assert_exception(RuntimeError) { sdbm.close } + assert_exception(SDBMError) { sdbm.close } end def test_aref @@ -219,6 +219,25 @@ class TestSDBM < RUNIT::TestCase assert_equals(values.reverse, @sdbm.indexes(*keys.reverse)) end + def test_select + keys = %w(foo bar baz) + values = %w(FOO BAR BAZ) + @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values + assert_equals(values.reverse, @sdbm.select(*keys.reverse)) + end + + def test_select_with_block + keys = %w(foo bar baz) + values = %w(FOO BAR BAZ) + @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values + ret = @sdbm.select {|k,v| + assert_equals(k.upcase, v) + k != "bar" + } + assert_equals([['baz', 'BAZ'], ['foo', 'FOO']], + ret.sort) + end + def test_length num = 10 assert_equals(0, @sdbm.size) @@ -351,7 +370,7 @@ class TestSDBM < RUNIT::TestCase @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values - assert_equals(@sdbm, @sdbm.delete(key)) + assert_equals('BAR', @sdbm.delete(key)) assert_nil(@sdbm[key]) assert_equals(2, @sdbm.size) @@ -360,12 +379,13 @@ class TestSDBM < RUNIT::TestCase def test_delete_with_block key = 'no called block' @sdbm[key] = 'foo' - assert_equals(@sdbm, @sdbm.delete(key) {|k| k.replace 'called block'}) + assert_equals('foo', @sdbm.delete(key) {|k| k.replace 'called block'}) assert_equals('no called block', key) assert_equals(0, @sdbm.size) key = 'no called block' - assert_nil(@sdbm.delete(key) {|k| k.replace 'called block'}) + assert_equals(:blockval, + @sdbm.delete(key) {|k| k.replace 'called block'; :blockval}) assert_equals('called block', key) assert_equals(0, @sdbm.size) end