diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-11-08 12:42:39 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-11-08 12:42:39 +0000 |
commit | 305376d556bb6e9ed9391e6e6040ae748b53d890 (patch) | |
tree | af3a6c7a629ffa5b4751392a33dc54def57c2bd7 /eval.c | |
parent | 2f12c07c76c38a377e98555f1af738a8aa12f112 (diff) |
* eval.c (rb_trap_eval): avoid annoying warning with signal.
[ruby-talk:23225]
* eval.c (rb_call0): adjust caller source file/line while
evaluating optional arguments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1819 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -1363,9 +1363,11 @@ rb_trap_eval(cmd, sig) VALUE val; /* OK */ PUSH_TAG(PROT_NONE); + PUSH_ITER(ITER_NOT); if ((state = EXEC_TAG()) == 0) { val = rb_eval_cmd(cmd, rb_ary_new3(1, INT2FIX(sig))); } + POP_ITER(); POP_TAG(); if (state) { rb_trap_immediate = 0; @@ -4462,7 +4464,11 @@ rb_call0(klass, recv, id, argc, argv, body, nosuper) argv++; argc--; opt = opt->nd_next; } - rb_eval(recv, opt); + if (opt) { + ruby_sourcefile = opt->nd_file; + ruby_sourceline = nd_line(opt); + rb_eval(recv, opt); + } } if (node->nd_rest >= 0) { VALUE v; |