1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* 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/trunk@6425 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2004-05-28 02:20:34 +00:00
parent d8cf22793b
commit e3308c5272
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
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 21:37:50 2004 Tanaka Akira <akr@m17n.org> Thu May 27 21:37:50 2004 Tanaka Akira <akr@m17n.org>
* lib/pathname.rb (Pathname#initialize): fix pathname initialization * lib/pathname.rb (Pathname#initialize): fix pathname initialization

5
eval.c
View File

@ -2931,7 +2931,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 {
@ -6043,7 +6042,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);
@ -8033,7 +8032,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;
@ -8048,7 +8046,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];