summaryrefslogtreecommitdiff
path: root/io.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-01 10:24:12 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-01 10:24:12 +0000
commit01eb117b01576e5b8386af5b6b425655f314888c (patch)
tree02458d345d69d2f4adf0e8be339990e3d344e219 /io.c
parentaf4ceeff105003cbb124c420898121742ed66bd7 (diff)
io.c: recurse for the argument
* io.c (rb_io_puts): recurse for the argument itself, not converted array elements. [ruby-core:42444] [Bug #5986] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38120 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r--io.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/io.c b/io.c
index 63bb8a00e7..7a89654ba2 100644
--- a/io.c
+++ b/io.c
@@ -6660,13 +6660,15 @@ io_puts_ary(VALUE ary, VALUE out, int recur)
if (recur) {
tmp = rb_str_new2("[...]");
rb_io_puts(1, &tmp, out);
- return Qnil;
+ return Qtrue;
}
+ ary = rb_check_array_type(ary);
+ if (NIL_P(ary)) return Qfalse;
for (i=0; i<RARRAY_LEN(ary); i++) {
tmp = RARRAY_PTR(ary)[i];
rb_io_puts(1, &tmp, out);
}
- return Qnil;
+ return Qtrue;
}
/*
@@ -6705,9 +6707,7 @@ rb_io_puts(int argc, VALUE *argv, VALUE out)
line = argv[i];
goto string;
}
- line = rb_check_array_type(argv[i]);
- if (!NIL_P(line)) {
- rb_exec_recursive(io_puts_ary, line, out);
+ if (rb_exec_recursive(io_puts_ary, argv[i], out)) {
continue;
}
line = rb_obj_as_string(argv[i]);