diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-06-06 08:43:56 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-06-06 08:43:56 +0000 |
commit | 0ed97584549db7b9a8cc35b9765da759385ccaf1 (patch) | |
tree | f7270145e05f97fcb053793d431b535faa554dda /eval.c | |
parent | 44e45bf1dc6c3a8eeef415e0f171d64f816a439b (diff) |
* eval.c (rb_eval): bad influence on frame node.
* 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
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -2964,7 +2964,6 @@ rb_eval(self, n) iter_retry: PUSH_ITER(ITER_PRE); if (nd_type(node) == NODE_ITER) { - ruby_frame->node = node; result = rb_eval(self, node->nd_iter); } else { @@ -6056,7 +6055,7 @@ eval(self, src, scope, file, line) ruby_cref = data->cref; old_wrapper = ruby_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; if (!file) file = "__builtin__"; line = nd_line(data->frame.node); @@ -8053,7 +8052,6 @@ proc_invoke(proc, args, self, klass) struct BLOCK *data; volatile VALUE result = Qundef; int state; - volatile int orphan; volatile int safe = ruby_safe_level; volatile VALUE old_wrapper = ruby_wrapper; 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); pcall = (data->flags & BLOCK_LAMBDA) ? YIELD_LAMBDA_CALL : 0; -// orphan = pcall ? 0 : block_orphan(data); if (!pcall && RARRAY(args)->len == 1) { avalue = Qfalse; args = RARRAY(args)->ptr[0]; |