зеркало из https://github.com/github/ruby.git
* 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/trunk@21424 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
b802f1bb02
Коммит
5a38751d02
|
@ -1,3 +1,8 @@
|
|||
Sun Jan 11 09:47:30 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]
|
||||
|
||||
Sat Jan 10 21:17:28 2009 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* ext/socket/mkconstants.rb: don't generate unintended newlines.
|
||||
|
|
12
hash.c
12
hash.c
|
@ -348,10 +348,16 @@ rb_hash_s_create(int argc, VALUE *argv, VALUE 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;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче