diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-23 17:40:05 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-23 17:40:05 +0000 |
commit | f9593a4fc4a68f0a48d6182c5183b701eb583776 (patch) | |
tree | 0d3e4b9bfed72460c6e9443d2c56859b56c7ffb7 | |
parent | ebe322b1712b4b49528eb056c08dfb99af233e7c (diff) |
merge revision(s) 21423:
* hash.c (rb_hash_s_create): set nil as the value if assoc length
is not enough. [ruby-core:21249]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@22580 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | hash.c | 12 | ||||
-rw-r--r-- | version.h | 8 |
3 files changed, 18 insertions, 7 deletions
@@ -1,3 +1,8 @@ +Tue Feb 24 02:35:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * hash.c (rb_hash_s_create): set nil as the value if assoc length + is not enough. [ruby-core:21249] + Sun Feb 22 22:08:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * eval.c (stack_extend): streamlined rb_thread_restore_context() @@ -357,10 +357,16 @@ rb_hash_s_create(argc, argv, klass) hash = hash_alloc(klass); for (i = 0; i < RARRAY_LEN(tmp); ++i) { VALUE v = rb_check_array_type(RARRAY_PTR(tmp)[i]); - + VALUE key, val = Qnil; + 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]); + switch (RARRAY_LEN(v)) { + case 2: + val = RARRAY_PTR(v)[1]; + case 1: + key = RARRAY_PTR(v)[0]; + rb_hash_aset(hash, key, val); + } } return hash; } @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2009-02-22" +#define RUBY_RELEASE_DATE "2009-02-24" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20090222 -#define RUBY_PATCHLEVEL 139 +#define RUBY_RELEASE_CODE 20090224 +#define RUBY_PATCHLEVEL 140 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 22 +#define RUBY_RELEASE_DAY 24 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |