diff options
-rw-r--r-- | cont.c | 9 | ||||
-rw-r--r-- | test/ruby/test_fiber.rb | 1 |
2 files changed, 9 insertions, 1 deletions
@@ -1753,8 +1753,15 @@ fiber_to_s(VALUE fibval) char status_info[0x10]; GetFiberPtr(fibval, fib); - GetProcPtr(fib->first_proc, proc); snprintf(status_info, 0x10, " (%s)", fiber_status_name(fib->status)); + if (!rb_obj_is_proc(fib->first_proc)) { + VALUE str = rb_any_to_s(fibval); + strlcat(status_info, ">", sizeof(status_info)); + rb_str_set_len(str, RSTRING_LEN(str)-1); + rb_str_cat_cstr(str, status_info); + return str; + } + GetProcPtr(fib->first_proc, proc); return rb_block_to_s(fibval, &proc->block, status_info); } diff --git a/test/ruby/test_fiber.rb b/test/ruby/test_fiber.rb index 8fe2cf5be8..59290545f6 100644 --- a/test/ruby/test_fiber.rb +++ b/test/ruby/test_fiber.rb @@ -363,6 +363,7 @@ class TestFiber < Test::Unit::TestCase assert_match(/suspended/, f.to_s) f.resume assert_match(/terminated/, f.to_s) + assert_match(/resumed/, Fiber.current.to_s) end end |