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

* ext/iconv/iconv.c (iconv_create): cannot retry with given block.

Browse source 
[ruby-dev:39487]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25343 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-10-15 05:21:00 +00:00
parent 1af93d6a49
commit c7afd1aef4
5 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Oct 15 14:20:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/iconv/iconv.c (iconv_create): cannot retry with given block.
[ruby-dev:39487]
Thu Oct 15 09:25:07 2009 NAKAMURA Usaku <usa@ruby-lang.org> Thu Oct 15 09:25:07 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/socket/init.c (rsock_init_sock): mswin doesn't have S_IFSOCK * ext/socket/init.c (rsock_init_sock): mswin doesn't have S_IFSOCK

17
ext/iconv/iconv.c
View file

@ -106,6 +106,7 @@ static VALUE rb_eIconvBrokenLibrary;
static ID rb_success, rb_failed; static ID rb_success, rb_failed;
static VALUE iconv_fail _((VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg)); static VALUE iconv_fail _((VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg));
static VALUE iconv_fail_retry _((VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg));
static VALUE iconv_failure_initialize _((VALUE error, VALUE mesg, VALUE success, VALUE failed)); static VALUE iconv_failure_initialize _((VALUE error, VALUE mesg, VALUE success, VALUE failed));
static VALUE iconv_failure_success _((VALUE self)); static VALUE iconv_failure_success _((VALUE self));
static VALUE iconv_failure_failed _((VALUE self)); static VALUE iconv_failure_failed _((VALUE self));
@ -231,8 +232,8 @@ iconv_create(VALUE to, VALUE from, struct rb_iconv_opt_t *opt, int *idx)
s = RSTRING_PTR(msg); s = RSTRING_PTR(msg);
rb_str_set_len(msg, strlen(s)); rb_str_set_len(msg, strlen(s));
if (!inval) rb_sys_fail(s); if (!inval) rb_sys_fail(s);
iconv_fail(rb_eIconvInvalidEncoding, rb_exc_raise(iconv_fail(rb_eIconvInvalidEncoding, Qnil,
Qnil, rb_ary_new3(2, to, from), NULL, s); rb_ary_new3(2, to, from), NULL, s));
} }
} }
@ -372,7 +373,13 @@ iconv_fail(VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, co
args[2] = rb_ary_new4(env->argc, env->argv); args[2] = rb_ary_new4(env->argc, env->argv);
} }
} }
error = rb_class_new_instance(3, args, error); return rb_class_new_instance(3, args, error);
}
static VALUE
iconv_fail_retry(VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg)
{
error = iconv_fail(error, success, failed, env, mesg);
if (!rb_block_given_p()) rb_exc_raise(error); if (!rb_block_given_p()) rb_exc_raise(error);
rb_set_errinfo(error); rb_set_errinfo(error);
return rb_yield(failed); return rb_yield(failed);
@ -418,7 +425,7 @@ iconv_convert(iconv_t cd, VALUE str, long start, long length, int toidx, struct
error = iconv_try(cd, &inptr, &inlen, &outptr, &outlen); error = iconv_try(cd, &inptr, &inlen, &outptr, &outlen);
if (RTEST(error)) { if (RTEST(error)) {
unsigned int i; unsigned int i;
rescue = iconv_fail(error, Qnil, Qnil, env, 0); rescue = iconv_fail_retry(error, Qnil, Qnil, env, 0);
if (TYPE(rescue) == T_ARRAY) { if (TYPE(rescue) == T_ARRAY) {
str = RARRAY_LEN(rescue) > 0 ? RARRAY_PTR(rescue)[0] : Qnil; str = RARRAY_LEN(rescue) > 0 ? RARRAY_PTR(rescue)[0] : Qnil;
} }
@ -502,7 +509,7 @@ iconv_convert(iconv_t cd, VALUE str, long start, long length, int toidx, struct
rb_str_cat(ret, instart, inptr - instart); rb_str_cat(ret, instart, inptr - instart);
} }
str = rb_str_derive(str, inptr, inlen); str = rb_str_derive(str, inptr, inlen);
rescue = iconv_fail(error, ret, str, env, errmsg); rescue = iconv_fail_retry(error, ret, str, env, errmsg);
if (TYPE(rescue) == T_ARRAY) { if (TYPE(rescue) == T_ARRAY) {
if ((len = RARRAY_LEN(rescue)) > 0) if ((len = RARRAY_LEN(rescue)) > 0)
rb_str_concat(ret, RARRAY_PTR(rescue)[0]); rb_str_concat(ret, RARRAY_PTR(rescue)[0]);

5
test/iconv/test_basic.rb
View file

@ -1,4 +1,4 @@
require File.join(File.dirname(__FILE__), "utils.rb") require File.expand_path("../utils.rb", __FILE__)
class TestIconv::Basic < TestIconv class TestIconv::Basic < TestIconv
def test_euc2sjis def test_euc2sjis
@ -52,5 +52,8 @@ class TestIconv::Basic < TestIconv
def test_unknown_encoding def test_unknown_encoding
assert_raise(Iconv::InvalidEncoding) { Iconv.iconv("utf-8", "X-UKNOWN", "heh") } assert_raise(Iconv::InvalidEncoding) { Iconv.iconv("utf-8", "X-UKNOWN", "heh") }
assert_raise(Iconv::InvalidEncoding, '[ruby-dev:39487]') {
Iconv.iconv("X-UNKNOWN-1", "X-UNKNOWN-2") {break}
}
end end
end if defined?(TestIconv) end if defined?(TestIconv)

2
test/iconv/test_option.rb
View file

@ -1,4 +1,4 @@
require File.join(File.dirname(__FILE__), "utils.rb") require File.expand_path("../utils.rb", __FILE__)
class TestIconv::Option < TestIconv class TestIconv::Option < TestIconv
def test_ignore_option def test_ignore_option

2
test/iconv/test_partial.rb
View file

@ -1,4 +1,4 @@
require File.join(File.dirname(__FILE__), "utils.rb") require File.expand_path("../utils.rb", __FILE__)
class TestIconv::Partial < TestIconv class TestIconv::Partial < TestIconv
def test_partial_ascii def test_partial_ascii