kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

error.c: prepend "warning: " always

Browse source 
* 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
This commit is contained in:
nobu 2018-04-02 11:39:10 +00:00
parent f961bad191
commit bae19b5547
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
error.c
View file

@ -348,11 +348,11 @@ warning_write(int argc, VALUE *argv, VALUE buf)
static VALUE static VALUE
rb_warn_m(int argc, VALUE *argv, VALUE exc) rb_warn_m(int argc, VALUE *argv, VALUE exc)
{ {
VALUE opts, uplevel = Qnil; VALUE opts, location = Qnil;
if (!NIL_P(ruby_verbose) && argc > 0 && if (!NIL_P(ruby_verbose) && argc > 0 &&
(argc = rb_scan_args(argc, argv, "*:", NULL, &opts)) > 0) { (argc = rb_scan_args(argc, argv, "*:", NULL, &opts)) > 0) {
VALUE str = argv[0]; VALUE str = argv[0], uplevel = Qnil;
if (!NIL_P(opts)) { if (!NIL_P(opts)) {
static ID kwds[1]; static ID kwds[1];
if (!kwds[0]) { if (!kwds[0]) {
@ -370,22 +370,25 @@ rb_warn_m(int argc, VALUE *argv, VALUE exc)
} }
args[0] = LONG2NUM(lev + 1); args[0] = LONG2NUM(lev + 1);
args[1] = INT2FIX(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)) { 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')) { if (argc > 1 || !NIL_P(uplevel) || !end_with_asciichar(str, '\n')) {
VALUE path;
if (NIL_P(uplevel)) { if (NIL_P(uplevel)) {
str = rb_str_tmp_new(0); 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 { else {
VALUE path;
path = rb_funcall(uplevel, rb_intern("path"), 0);
str = rb_sprintf("%s:%ld: warning: ", str = rb_sprintf("%s:%ld: warning: ",
rb_string_value_ptr(&path), 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); RBASIC_SET_CLASS(str, rb_cWarningBuffer);
rb_io_puts(argc, argv, str); rb_io_puts(argc, argv, str);

1
test/ruby/test_exception.rb
View file

@ -1121,6 +1121,7 @@ $stderr = $stdout; raise "\x82\xa0"') do |outs, errs, status|
warning = capture_warning_warn {obj.w(1)} warning = capture_warning_warn {obj.w(1)}
assert_equal("#{__FILE__}:#{__LINE__-1}: warning: test warning\n", warning[0]) assert_equal("#{__FILE__}:#{__LINE__-1}: warning: test warning\n", warning[0])
assert_raise(ArgumentError) {warn("test warning", uplevel: -1)} assert_raise(ArgumentError) {warn("test warning", uplevel: -1)}
assert_in_out_err(["-e", "warn 'ok', uplevel: 1"], '', [], /warning:/)
end end
def test_warning_warn_invalid_argument def test_warning_warn_invalid_argument