From 012b58b121ff499a6c811a3e7498e9a50145109b Mon Sep 17 00:00:00 2001 From: matz Date: Thu, 25 Oct 2007 17:05:09 +0000 Subject: * hash.c (rb_hash_s_create): check and convert argument hash using #to_hash. * hash.c (rb_hash_s_create): Hash#[] now takes assocs as source of hash conversion. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13776 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ hash.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 652628af3e..5878a6475a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,12 @@ Fri Oct 26 01:48:28 2007 Yukihiro Matsumoto * array.c (rb_ary_assoc): check and convert inner arrays (assocs) using #to_ary. + * hash.c (rb_hash_s_create): check and convert argument hash + using #to_hash. + + * hash.c (rb_hash_s_create): Hash#[] now takes assocs as source of + hash conversion. + Thu Oct 25 14:19:33 2007 Nobuyoshi Nakada * io.c (rb_io_tell, rb_io_seek): check errno too. [ruby-dev:32093] diff --git a/hash.c b/hash.c index 1cd41bc6d4..821bfcbb8a 100644 --- a/hash.c +++ b/hash.c @@ -21,6 +21,8 @@ #include #endif +static VALUE rb_hash_s_try_convert(VALUE, VALUE); + #define HASH_DELETED FL_USER1 #define HASH_PROC_DEFAULT FL_USER2 @@ -315,18 +317,34 @@ rb_hash_initialize(int argc, VALUE *argv, VALUE hash) static VALUE rb_hash_s_create(int argc, VALUE *argv, VALUE klass) { - VALUE hash; + VALUE hash, tmp; int i; - if (argc == 1 && TYPE(argv[0]) == T_HASH) { - hash = hash_alloc(klass); - if (RHASH(argv[0])->ntbl) { - RHASH(hash)->ntbl = st_copy(RHASH(argv[0])->ntbl); - } + if (argc == 1) { + tmp = rb_hash_s_try_convert(Qnil, argv[0]); + if (!NIL_P(tmp)) { + hash = hash_alloc(klass); + if (RHASH(argv[0])->ntbl) { + RHASH(hash)->ntbl = st_copy(RHASH(argv[0])->ntbl); + } + return hash; + } - return hash; + tmp = rb_check_array_type(argv[0]); + if (!NIL_P(tmp)) { + long i; + + hash = hash_alloc(klass); + for (i = 0; i < RARRAY_LEN(tmp); ++i) { + VALUE v = rb_check_array_type(RARRAY_PTR(tmp)[i]); + + if (NIL_P(v)) continue; + if (RARRAY_LEN(v) < 1 || 2 < RARRAY_LEN(v)) continue; + rb_hash_aset(hash, RARRAY_PTR(v)[0], RARRAY_PTR(v)[1]); + } + return hash; + } } - if (argc % 2 != 0) { rb_raise(rb_eArgError, "odd number of arguments for Hash"); } -- cgit v1.2.3