diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-23 21:55:46 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-23 21:55:46 +0000 |
commit | 3537afda471cb29cc07d68c46dbe0f8f7a4577a4 (patch) | |
tree | 089e877376c6268a1590761d3583ce318ff5a238 | |
parent | e441b922b983bfab59b9f7512a2dae32d9e9e555 (diff) | |
download | ruby-3537afda471cb29cc07d68c46dbe0f8f7a4577a4.tar.gz |
* io.c (rb_io_print): no special handling for nil as well as puts.
fixed: [ruby-dev:29586]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11003 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | io.c | 13 |
2 files changed, 9 insertions, 11 deletions
@@ -1,6 +1,11 @@ +Sun Sep 24 06:55:36 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * io.c (rb_io_print): no special handling for nil as well as puts. + fixed: [ruby-dev:29586] + Sun Sep 24 06:25:53 2006 why the lucky stiff <why@ruby-lang.org> - * eval.c (rb_thread_save_context, rb_thread_restore_context): + * eval.c (rb_thread_save_context, rb_thread_restore_context): sandbox hook to save and restore sandbox state. * eval.c (thread_no_ensure): added THREAD_NO_ENSURE thread flag. @@ -3689,19 +3689,12 @@ rb_io_print(int argc, VALUE *argv, VALUE out) argv = &line; } for (i=0; i<argc; i++) { - if (!NIL_P(rb_output_fs) && i>0) { + rb_io_write(out, argv[i]); + if (!NIL_P(rb_output_fs)) { rb_io_write(out, rb_output_fs); } - switch (TYPE(argv[i])) { - case T_NIL: - rb_io_write(out, rb_str_new2("nil")); - break; - default: - rb_io_write(out, argv[i]); - break; - } } - if (!NIL_P(rb_output_rs)) { + if (argc > 0 && !NIL_P(rb_output_rs)) { rb_io_write(out, rb_output_rs); } |