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

* struct.c: Support for Struct's enumerators #size

Browse source 
[Feature #6636]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37513 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
marcandre 2012-11-06 17:14:02 +00:00
parent 17c0aff0d6
commit ce0bf9f43d
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
struct.c
View file

@ -429,6 +429,9 @@ rb_struct_new(VALUE klass, ...)
return rb_class_new_instance(size, mem, klass); return rb_class_new_instance(size, mem, klass);
} }
static VALUE
rb_struct_size(VALUE s);
/* /*
* call-seq: * call-seq:
* struct.each {|obj| block } -> struct * struct.each {|obj| block } -> struct
@ -455,7 +458,7 @@ rb_struct_each(VALUE s)
{ {
long i; long i;
RETURN_ENUMERATOR(s, 0, 0); RETURN_SIZED_ENUMERATOR(s, 0, 0, rb_struct_size);
for (i=0; i<RSTRUCT_LEN(s); i++) { for (i=0; i<RSTRUCT_LEN(s); i++) {
rb_yield(RSTRUCT_PTR(s)[i]); rb_yield(RSTRUCT_PTR(s)[i]);
} }
@ -489,7 +492,7 @@ rb_struct_each_pair(VALUE s)
VALUE members; VALUE members;
long i; long i;
RETURN_ENUMERATOR(s, 0, 0); RETURN_SIZED_ENUMERATOR(s, 0, 0, rb_struct_size);
members = rb_struct_members(s); members = rb_struct_members(s);
for (i=0; i<RSTRUCT_LEN(s); i++) { for (i=0; i<RSTRUCT_LEN(s); i++) {
rb_yield_values(2, rb_ary_entry(members, i), RSTRUCT_PTR(s)[i]); rb_yield_values(2, rb_ary_entry(members, i), RSTRUCT_PTR(s)[i]);
@ -793,7 +796,7 @@ rb_struct_select(int argc, VALUE *argv, VALUE s)
long i; long i;
rb_check_arity(argc, 0, 0); rb_check_arity(argc, 0, 0);
RETURN_ENUMERATOR(s, 0, 0); RETURN_SIZED_ENUMERATOR(s, 0, 0, rb_struct_size);
result = rb_ary_new(); result = rb_ary_new();
for (i = 0; i < RSTRUCT_LEN(s); i++) { for (i = 0; i < RSTRUCT_LEN(s); i++) {
if (RTEST(rb_yield(RSTRUCT_PTR(s)[i]))) { if (RTEST(rb_yield(RSTRUCT_PTR(s)[i]))) {

7
test/ruby/test_enumerator.rb
View file

@ -456,6 +456,13 @@ class TestEnumerator < Test::Unit::TestCase
end end
end end
def test_size_for_enum_created_from_struct
s = Struct.new(:foo, :bar, :baz).new(1, 2)
%i[each each_pair select].each do |method|
assert_equal 3, s.send(method).size
end
end
def check_consistency_for_combinatorics(method) def check_consistency_for_combinatorics(method)
[ [], [:a, :b, :c, :d, :e] ].product([-2, 0, 2, 5, 6]) do |array, arg| [ [], [:a, :b, :c, :d, :e] ].product([-2, 0, 2, 5, 6]) do |array, arg|
assert_equal array.send(method, arg).to_a.size, array.send(method, arg).size, assert_equal array.send(method, arg).to_a.size, array.send(method, arg).size,