archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* eval.c (rb_eval): bad influence on frame node.

Browse source 
* eval.c (eval): reverted wrongly removed condition.  [ruby-dev:23638]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6430 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2004-06-06 08:43:56 +00:00
parent 44e45bf1dc
commit 0ed9758454
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -8,6 +8,12 @@ Wed Jun 2 12:41:53 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (rb_io_gets_m): set lastline ($_) even when read line is * io.c (rb_io_gets_m): set lastline ($_) even when read line is
nil. [ruby-dev:23663] nil. [ruby-dev:23663]
Fri May 28 11:20:31 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_eval): bad influence on frame node.
* eval.c (eval): reverted wrongly removed condition. [ruby-dev:23638]
Thu May 27 23:15:18 2004 NAKAMURA, Hiroshi <nakahiro@sarion.co.jp> Thu May 27 23:15:18 2004 NAKAMURA, Hiroshi <nakahiro@sarion.co.jp>
* lib/logger.rb: leading 0 padding of timestamp usec part. * lib/logger.rb: leading 0 padding of timestamp usec part.

5
eval.c
View file

@ -2964,7 +2964,6 @@ rb_eval(self, n)
iter_retry: iter_retry:
PUSH_ITER(ITER_PRE); PUSH_ITER(ITER_PRE);
if (nd_type(node) == NODE_ITER) { if (nd_type(node) == NODE_ITER) {
ruby_frame->node = node;
result = rb_eval(self, node->nd_iter); result = rb_eval(self, node->nd_iter);
} }
else { else {
@ -6056,7 +6055,7 @@ eval(self, src, scope, file, line)
ruby_cref = data->cref; ruby_cref = data->cref;
old_wrapper = ruby_wrapper; old_wrapper = ruby_wrapper;
ruby_wrapper = data->wrapper; ruby_wrapper = data->wrapper;
if (file == 0 || (line == 1 && strcmp(file, "(eval)") == 0)) { if ((file == 0 || (line == 1 && strcmp(file, "(eval)") == 0)) && data->frame.node) {
file = data->frame.node->nd_file; file = data->frame.node->nd_file;
if (!file) file = "__builtin__"; if (!file) file = "__builtin__";
line = nd_line(data->frame.node); line = nd_line(data->frame.node);
@ -8053,7 +8052,6 @@ proc_invoke(proc, args, self, klass)
struct BLOCK *data; struct BLOCK *data;
volatile VALUE result = Qundef; volatile VALUE result = Qundef;
int state; int state;
volatile int orphan;
volatile int safe = ruby_safe_level; volatile int safe = ruby_safe_level;
volatile VALUE old_wrapper = ruby_wrapper; volatile VALUE old_wrapper = ruby_wrapper;
struct RVarmap * volatile old_dvars = ruby_dyna_vars; struct RVarmap * volatile old_dvars = ruby_dyna_vars;
@ -8069,7 +8067,6 @@ proc_invoke(proc, args, self, klass)
Data_Get_Struct(proc, struct BLOCK, data); Data_Get_Struct(proc, struct BLOCK, data);
pcall = (data->flags & BLOCK_LAMBDA) ? YIELD_LAMBDA_CALL : 0; pcall = (data->flags & BLOCK_LAMBDA) ? YIELD_LAMBDA_CALL : 0;
// orphan = pcall ? 0 : block_orphan(data);
if (!pcall && RARRAY(args)->len == 1) { if (!pcall && RARRAY(args)->len == 1) {
avalue = Qfalse; avalue = Qfalse;
args = RARRAY(args)->ptr[0]; args = RARRAY(args)->ptr[0];