aboutsummaryrefslogtreecommitdiffstats
path: root/struct.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-19 07:31:05 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-19 07:31:05 +0000
commit7588c674d52791a15fa7631ba2628d6547ad1185 (patch)
tree46dad3625d921c06a2b28a2e11bcce506068aa33 /struct.c
parent2370556d3d8ec4138c4326208a6da7c1c485e908 (diff)
downloadruby-7588c674d52791a15fa7631ba2628d6547ad1185.tar.gz
struct.c: yield assoc in each_pair
* struct.c (rb_struct_each_pair): yield associated pairs so that an unsplat argument can get both, for consistency with Hash, OpenStruct, and etc. [ruby-dev:46533] [Bug #7382] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37721 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'struct.c')
-rw-r--r--struct.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/struct.c b/struct.c
index 17e53ab4e0..7f01acbb88 100644
--- a/struct.c
+++ b/struct.c
@@ -495,7 +495,9 @@ rb_struct_each_pair(VALUE s)
RETURN_SIZED_ENUMERATOR(s, 0, 0, rb_struct_size);
members = rb_struct_members(s);
for (i=0; i<RSTRUCT_LEN(s); i++) {
- rb_yield_values(2, rb_ary_entry(members, i), RSTRUCT_PTR(s)[i]);
+ VALUE key = rb_ary_entry(members, i);
+ VALUE value = RSTRUCT_PTR(s)[i];
+ rb_yield(rb_assoc_new(key, vlaue));
}
return s;
}