diff options
Diffstat (limited to 'error.c')
| -rw-r--r-- | error.c | 29 |
1 files changed, 19 insertions, 10 deletions
@@ -327,11 +327,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]) { @@ -342,23 +342,32 @@ rb_warn_m(int argc, VALUE *argv, VALUE exc) uplevel = Qnil; } else if (!NIL_P(uplevel)) { - uplevel = LONG2NUM((long)NUM2ULONG(uplevel) + 1); - uplevel = rb_vm_thread_backtrace_locations(1, &uplevel, GET_THREAD()->self); - if (!NIL_P(uplevel)) { - uplevel = rb_ary_entry(uplevel, 0); + VALUE args[2]; + long lev = NUM2LONG(uplevel); + if (lev < 0) { + rb_raise(rb_eArgError, "negative level (%ld)", lev); + } + args[0] = LONG2NUM(lev + 1); + args[1] = INT2FIX(1); + location = rb_vm_thread_backtrace_locations(2, args, GET_THREAD()->self); + if (!NIL_P(location)) { + 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:%li: warning: ", + 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); |