diff options
author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-19 11:30:53 +0000 |
---|---|---|
committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-19 11:30:53 +0000 |
commit | 621b15ced94ebf5053bee4c0687ad88fe5b6b49e (patch) | |
tree | f492ceef09fa7b92db633a7058401e897e71cb41 /vm_eval.c | |
parent | 0aef6008919ef95df08b5a9a65fc059236241ebf (diff) |
* vm_eval.c (rb_f_caller): return [] instead of nil when the function
is called on toplevel. [ruby-dev:41348]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@27896 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_eval.c')
-rw-r--r-- | vm_eval.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -1562,7 +1562,7 @@ rb_catch_obj(VALUE tag, VALUE (*func)(), VALUE data) static VALUE rb_f_caller(int argc, VALUE *argv) { - VALUE level; + VALUE level, ary; int lev; rb_scan_args(argc, argv, "01", &level); @@ -1574,7 +1574,9 @@ rb_f_caller(int argc, VALUE *argv) if (lev < 0) rb_raise(rb_eArgError, "negative level (%d)", lev); - return vm_backtrace(GET_THREAD(), lev); + ary = vm_backtrace(GET_THREAD(), lev); + if (NIL_P(ary)) ary = rb_ary_new(); + return ary; } static int |