1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* ext/dbm/dbm.c (fdbm_key): Rename #index to #key. Emit a warning

when #index is called.
  (fdbm_indexes): Emit a deprecation warning.

* ext/gdbm/gdbm.c: Ditto.

* ext/sdbm/init.c: Ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@20171 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2008-11-10 09:18:23 +00:00
parent c9e97eec10
commit 54b2fa7e3d
8 changed files with 75 additions and 20 deletions

View file

@ -193,7 +193,7 @@ fsdbm_fetch_m(argc, argv, obj)
}
static VALUE
fsdbm_index(obj, valstr)
fsdbm_key(obj, valstr)
VALUE obj, valstr;
{
datum key, val;
@ -214,6 +214,14 @@ fsdbm_index(obj, valstr)
return Qnil;
}
static VALUE
fsdbm_index(hash, value)
VALUE hash, value;
{
rb_warning("SDBM#index is deprecated; use SDBM#key");
return fsdbm_key(hash, value);
}
static VALUE
fsdbm_indexes(argc, argv, obj)
int argc;
@ -223,6 +231,8 @@ fsdbm_indexes(argc, argv, obj)
VALUE new;
int i;
rb_warn("SDBM#%s is deprecated; use SDBM#values_at",
rb_id2name(rb_frame_last_func()));
new = rb_ary_new2(argc);
for (i=0; i<argc; i++) {
rb_ary_push(new, fsdbm_fetch(obj, argv[i], Qnil));
@ -753,6 +763,7 @@ Init_sdbm()
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, "key", fsdbm_key, 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);