diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | eval.c | 12 | ||||
| -rw-r--r-- | test/ruby/test_exception.rb | 17 |
3 files changed, 27 insertions, 7 deletions
@@ -1,4 +1,7 @@ -Wed Feb 26 13:26:21 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed Feb 26 14:10:44 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * eval.c (setup_exception): preserve exception class name encoding + in debug mode messages. * eval.c (setup_exception): preserve errinfo across calling #to_s method on the exception. [ruby-core:61091] [Bug #9568] @@ -518,16 +518,16 @@ setup_exception(rb_thread_t *th, int tag, volatile VALUE mesg, VALUE cause) e = rb_obj_as_string(e); th->errinfo = mesg; if (file && line) { - warn_printf("Exception `%s' at %s:%d - %"PRIsVALUE"\n", - rb_obj_classname(th->errinfo), file, line, e); + warn_printf("Exception `%"PRIsVALUE"' at %s:%d - %"PRIsVALUE"\n", + rb_obj_class(mesg), file, line, e); } else if (file) { - warn_printf("Exception `%s' at %s - %"PRIsVALUE"\n", - rb_obj_classname(th->errinfo), file, e); + warn_printf("Exception `%"PRIsVALUE"' at %s - %"PRIsVALUE"\n", + rb_obj_class(mesg), file, e); } else { - warn_printf("Exception `%s' - %"PRIsVALUE"\n", - rb_obj_classname(th->errinfo), e); + warn_printf("Exception `%"PRIsVALUE"' - %"PRIsVALUE"\n", + rb_obj_class(mesg), e); } } POP_TAG(); diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb index ffcee80ca3..aabe1464b1 100644 --- a/test/ruby/test_exception.rb +++ b/test/ruby/test_exception.rb @@ -100,6 +100,23 @@ class TestException < Test::Unit::TestCase assert_include(err, bug9568.to_s) end + def test_errinfo_encoding_in_debug + exc = Module.new {break class_eval("class C\u{30a8 30e9 30fc} < RuntimeError; self; end".encode(Encoding::EUC_JP))} + exc.inspect + + err = EnvUtil.verbose_warning do + assert_raise(exc) do + $DEBUG, debug = true, $DEBUG + begin + raise exc + ensure + $DEBUG = debug + end + end + end + assert_include(err, exc.to_s) + end + def test_break_ensure bad = true while true |