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

* string.c: Support for String#{each_byte,each_char,each_codepoint}.size

Browse source 
[Feature #6636]

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

25
string.c
View file

@ -6222,6 +6222,11 @@ rb_str_each_line(int argc, VALUE *argv, VALUE str)
return orig;
}
static VALUE
rb_str_each_byte_size(VALUE str, VALUE args)
{
return LONG2FIX(RSTRING_LEN(str));
}
/*
* call-seq:
@ -6246,13 +6251,27 @@ rb_str_each_byte(VALUE str)
{
long i;
RETURN_ENUMERATOR(str, 0, 0);
RETURN_SIZED_ENUMERATOR(str, 0, 0, rb_str_each_byte_size);
for (i=0; i<RSTRING_LEN(str); i++) {
rb_yield(INT2FIX(RSTRING_PTR(str)[i] & 0xff));
}
return str;
}
static VALUE
rb_str_each_char_size(VALUE str)
{
long len = RSTRING_LEN(str);
if (!single_byte_optimizable(str)) {
const char *ptr = RSTRING_PTR(str);
rb_encoding *enc = rb_enc_get(str);
const char *end_ptr = ptr + len;
for (len = 0; ptr < end_ptr; ++len) {
ptr += rb_enc_mbclen(ptr, end_ptr, enc);
}
}
return LONG2FIX(len);
}
/*
* call-seq:
@ -6280,7 +6299,7 @@ rb_str_each_char(VALUE str)
const char *ptr;
rb_encoding *enc;
RETURN_ENUMERATOR(str, 0, 0);
RETURN_SIZED_ENUMERATOR(str, 0, 0, rb_str_each_char_size);
str = rb_str_new4(str);
ptr = RSTRING_PTR(str);
len = RSTRING_LEN(str);
@ -6333,7 +6352,7 @@ rb_str_each_codepoint(VALUE str)
rb_encoding *enc;
if (single_byte_optimizable(str)) return rb_str_each_byte(str);
RETURN_ENUMERATOR(str, 0, 0);
RETURN_SIZED_ENUMERATOR(str, 0, 0, rb_str_each_char_size);
str = rb_str_new4(str);
ptr = RSTRING_PTR(str);
end = RSTRING_END(str);

6
test/ruby/test_enumerator.rb
View file

@ -550,5 +550,11 @@ class TestEnumerator < Test::Unit::TestCase
assert_equal 102, 1.downto(-100).size
assert_equal Float::INFINITY, 42.upto(Float::INFINITY).size
end
def test_size_for_string
assert_equal 5, 'hello'.each_byte.size
assert_equal 5, 'hello'.each_char.size
assert_equal 5, 'hello'.each_codepoint.size
end
end