From a185b734fea2408a99c81384e8d2eb2bc3d429ef Mon Sep 17 00:00:00 2001 From: shyouhei Date: Tue, 24 Nov 2009 07:18:40 +0000 Subject: merge revision(s) 25343: * ext/iconv/iconv.c (iconv_create): cannot retry with given block. [ruby-dev:39487] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@25902 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/iconv/iconv.c | 17 ++++++++++++----- test/iconv/test_basic.rb | 5 ++++- test/iconv/test_option.rb | 2 +- test/iconv/test_partial.rb | 2 +- version.h | 2 +- 6 files changed, 24 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index c98062dd9a..44ed049663 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Nov 24 16:15:18 2009 Nobuyoshi Nakada + + * ext/iconv/iconv.c (iconv_create): cannot retry with given block. + [ruby-dev:39487] + Tue Nov 24 16:12:33 2009 Shugo Maeda * lib/net/imap.rb (resp_text_code): accepts response codes without diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index d989b97df2..09e3b393ef 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -92,6 +92,7 @@ static VALUE rb_eIconvBrokenLibrary; 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_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_success _((VALUE self)); static VALUE iconv_failure_failed _((VALUE self)); @@ -179,8 +180,8 @@ iconv_create s = RSTRING(msg)->ptr; RSTRING(msg)->len = strlen(s); if (!inval) rb_sys_fail(s); - iconv_fail(rb_eIconvInvalidEncoding, - Qnil, rb_ary_new3(2, to, from), NULL, s); + rb_exc_raise(iconv_fail(rb_eIconvInvalidEncoding, Qnil, + rb_ary_new3(2, to, from), NULL, s)); } } @@ -328,7 +329,13 @@ iconv_fail 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); ruby_errinfo = error; return rb_yield(failed); @@ -394,7 +401,7 @@ iconv_convert error = iconv_try(cd, &inptr, &inlen, &outptr, &outlen); if (RTEST(error)) { 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) { str = RARRAY(rescue)->len > 0 ? RARRAY(rescue)->ptr[0] : Qnil; } @@ -473,7 +480,7 @@ iconv_convert else if (inptr > instart) rb_str_cat(ret, instart, inptr - instart); 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 ((len = RARRAY(rescue)->len) > 0) rb_str_concat(ret, RARRAY(rescue)->ptr[0]); diff --git a/test/iconv/test_basic.rb b/test/iconv/test_basic.rb index ea564e91f1..6640fab8e9 100644 --- a/test/iconv/test_basic.rb +++ b/test/iconv/test_basic.rb @@ -1,4 +1,4 @@ -require File.join(File.dirname(__FILE__), "utils.rb") +require File.expand_path("../utils.rb", __FILE__) class TestIconv::Basic < TestIconv def test_euc2sjis @@ -45,5 +45,8 @@ class TestIconv::Basic < TestIconv def test_unknown_encoding 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 if defined?(TestIconv) diff --git a/test/iconv/test_option.rb b/test/iconv/test_option.rb index a1f3457c31..8138e130fa 100644 --- a/test/iconv/test_option.rb +++ b/test/iconv/test_option.rb @@ -1,4 +1,4 @@ -require File.join(File.dirname(__FILE__), "utils.rb") +require File.expand_path("../utils.rb", __FILE__) class TestIconv::Option < TestIconv def test_ignore_option diff --git a/test/iconv/test_partial.rb b/test/iconv/test_partial.rb index aa4d0ba250..a98960b070 100644 --- a/test/iconv/test_partial.rb +++ b/test/iconv/test_partial.rb @@ -1,4 +1,4 @@ -require File.join(File.dirname(__FILE__), "utils.rb") +require File.expand_path("../utils.rb", __FILE__) class TestIconv::Partial < TestIconv def test_partial_ascii diff --git a/version.h b/version.h index 812020db76..cc3598c3c7 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-11-24" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20091124 -#define RUBY_PATCHLEVEL 219 +#define RUBY_PATCHLEVEL 220 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3