summaryrefslogtreecommitdiff
path: root/error.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-17 06:30:10 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-17 06:30:10 +0000
commit18f0a65018dd357a1815941618d3cf9f274e6239 (patch)
tree516421b610a5d61351fe5733c8538a1fcc70c256 /error.c
parent1297cc615c5ddbe70451e94568798dbd40dbd414 (diff)
* error.c (rb_warn_m): accept multiple args in like puts. rdoc
patch by Erik Price at [ruby-core:38119]. [Feature #5029] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'error.c')
-rw-r--r--error.c23
1 files changed, 15 insertions, 8 deletions
diff --git a/error.c b/error.c
index ce959fc221..53f5472efc 100644
--- a/error.c
+++ b/error.c
@@ -225,18 +225,25 @@ rb_warning(const char *fmt, ...)
/*
* call-seq:
- * warn(msg) -> nil
+ * warn(msg, ...) -> nil
*
- * Display the given message (followed by a newline) on STDERR unless
- * warnings are disabled (for example with the <code>-W0</code> flag).
+ * Displays each of the given messages followed by a record separator on
+ * STDERR unless warnings have been disabled (for example with the
+ * <code>-W0</code> flag).
+ *
+ * warn("warning 1", "warning 2")
+ *
+ * <em>produces:</em>
+ *
+ * warning 1
+ * warning 2
*/
static VALUE
-rb_warn_m(VALUE self, VALUE mesg)
+rb_warn_m(int argc, VALUE *argv, VALUE exc)
{
- if (!NIL_P(ruby_verbose)) {
- rb_io_write(rb_stderr, mesg);
- rb_io_write(rb_stderr, rb_default_rs);
+ if (!NIL_P(ruby_verbose) && argc > 0) {
+ rb_io_puts(argc, argv, rb_stderr);
}
return Qnil;
}
@@ -1572,7 +1579,7 @@ Init_Exception(void)
rb_mErrno = rb_define_module("Errno");
- rb_define_global_function("warn", rb_warn_m, 1);
+ rb_define_global_function("warn", rb_warn_m, -1);
}
void