diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-04-02 11:39:10 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-04-02 11:39:10 +0000 |
commit | bae19b5547745dbf04310ca6bcb3c4e063e5b7b2 (patch) | |
tree | d46c7c2cfbd697cf804ab9eaed0f3436c4deb1fb | |
parent | f961bad19172b86158cc4c70bd3b2b5a26cd7ea8 (diff) | |
download | ruby-bae19b5547745dbf04310ca6bcb3c4e063e5b7b2.tar.gz |
error.c: prepend "warning: " always
* error.c (rb_warn_m): prepend the string "warning: " if uplevel
keyword is given, even if caller file and line information are
not available.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63062 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | error.c | 17 | ||||
-rw-r--r-- | test/ruby/test_exception.rb | 1 |
2 files changed, 11 insertions, 7 deletions
@@ -348,11 +348,11 @@ warning_write(int argc, VALUE *argv, VALUE buf) static VALUE rb_warn_m(int argc, VALUE *argv, VALUE exc) { - VALUE opts, uplevel = Qnil; + VALUE opts, location = Qnil; if (!NIL_P(ruby_verbose) && argc > 0 && (argc = rb_scan_args(argc, argv, "*:", NULL, &opts)) > 0) { - VALUE str = argv[0]; + VALUE str = argv[0], uplevel = Qnil; if (!NIL_P(opts)) { static ID kwds[1]; if (!kwds[0]) { @@ -370,22 +370,25 @@ rb_warn_m(int argc, VALUE *argv, VALUE exc) } args[0] = LONG2NUM(lev + 1); args[1] = INT2FIX(1); - uplevel = rb_vm_thread_backtrace_locations(2, args, GET_THREAD()->self); + location = rb_vm_thread_backtrace_locations(2, args, GET_THREAD()->self); if (!NIL_P(uplevel)) { - uplevel = rb_ary_entry(uplevel, 0); + location = rb_ary_entry(location, 0); } } } if (argc > 1 || !NIL_P(uplevel) || !end_with_asciichar(str, '\n')) { + VALUE path; if (NIL_P(uplevel)) { str = rb_str_tmp_new(0); } + else if (NIL_P(location) || + NIL_P(path = rb_funcall(location, rb_intern("path"), 0))) { + str = rb_str_new_cstr("warning: "); + } else { - VALUE path; - path = rb_funcall(uplevel, rb_intern("path"), 0); str = rb_sprintf("%s:%ld: warning: ", rb_string_value_ptr(&path), - NUM2LONG(rb_funcall(uplevel, rb_intern("lineno"), 0))); + NUM2LONG(rb_funcall(location, rb_intern("lineno"), 0))); } RBASIC_SET_CLASS(str, rb_cWarningBuffer); rb_io_puts(argc, argv, str); diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb index 574ffbc537..61521cbfff 100644 --- a/test/ruby/test_exception.rb +++ b/test/ruby/test_exception.rb @@ -1121,6 +1121,7 @@ $stderr = $stdout; raise "\x82\xa0"') do |outs, errs, status| warning = capture_warning_warn {obj.w(1)} assert_equal("#{__FILE__}:#{__LINE__-1}: warning: test warning\n", warning[0]) assert_raise(ArgumentError) {warn("test warning", uplevel: -1)} + assert_in_out_err(["-e", "warn 'ok', uplevel: 1"], '', [], /warning:/) end def test_warning_warn_invalid_argument |