mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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/trunk@1819 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
a3d0d99530
commit
76204d7a52
2 changed files with 15 additions and 1 deletions
|
@ -1,3 +1,11 @@
|
||||||
|
Thu Nov 8 20:20:37 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
|
||||||
|
|
||||||
|
* 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.
|
||||||
|
|
||||||
Thu Nov 8 18:21:02 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
|
Thu Nov 8 18:21:02 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||||
|
|
||||||
* file.c (path_check_1): forgot to initialize 'p'.
|
* file.c (path_check_1): forgot to initialize 'p'.
|
||||||
|
|
8
eval.c
8
eval.c
|
@ -1394,9 +1394,11 @@ rb_trap_eval(cmd, sig)
|
||||||
VALUE val; /* OK */
|
VALUE val; /* OK */
|
||||||
|
|
||||||
PUSH_TAG(PROT_NONE);
|
PUSH_TAG(PROT_NONE);
|
||||||
|
PUSH_ITER(ITER_NOT);
|
||||||
if ((state = EXEC_TAG()) == 0) {
|
if ((state = EXEC_TAG()) == 0) {
|
||||||
val = rb_eval_cmd(cmd, rb_ary_new3(1, INT2FIX(sig)));
|
val = rb_eval_cmd(cmd, rb_ary_new3(1, INT2FIX(sig)));
|
||||||
}
|
}
|
||||||
|
POP_ITER();
|
||||||
POP_TAG();
|
POP_TAG();
|
||||||
if (state) {
|
if (state) {
|
||||||
rb_trap_immediate = 0;
|
rb_trap_immediate = 0;
|
||||||
|
@ -4559,7 +4561,11 @@ rb_call0(klass, recv, id, argc, argv, body, nosuper)
|
||||||
argv++; argc--;
|
argv++; argc--;
|
||||||
opt = opt->nd_next;
|
opt = opt->nd_next;
|
||||||
}
|
}
|
||||||
rb_eval(recv, opt);
|
if (opt) {
|
||||||
|
ruby_sourcefile = opt->nd_file;
|
||||||
|
ruby_sourceline = nd_line(opt);
|
||||||
|
rb_eval(recv, opt);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
local_vars = ruby_scope->local_vars;
|
local_vars = ruby_scope->local_vars;
|
||||||
if (node->nd_rest >= 0) {
|
if (node->nd_rest >= 0) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue