diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-09-21 06:37:24 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-09-21 06:37:24 +0000 |
| commit | 4326f5ebfbae23a4269273b80a01ece6d3c24608 (patch) | |
| tree | ac85733cc87fdfccc5b1e1e0b20aae1de610cf5a /eval.c | |
| parent | 48fd3fc32ba4763ecd89294eec74ac7ecd842cfc (diff) | |
| download | ruby-4326f5ebfbae23a4269273b80a01ece6d3c24608.tar.gz ruby-4326f5ebfbae23a4269273b80a01ece6d3c24608.tar.xz ruby-4326f5ebfbae23a4269273b80a01ece6d3c24608.zip | |
matz - net library bug (by me)
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@950 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
| -rw-r--r-- | eval.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1880,6 +1880,7 @@ call_trace_func(event, file, line, self, id, klass) PUSH_FRAME(); *ruby_frame = *prev; ruby_frame->prev = prev; + ruby_frame->iter = 0; /* blocks not available anyway */ if (file) { ruby_frame->line = ruby_sourceline = line; @@ -6022,7 +6023,7 @@ proc_call(proc, args) volatile int orphan; volatile int safe = ruby_safe_level; - if (rb_block_given_p()) { + if (rb_block_given_p() && ruby_frame->last_func) { rb_warning("block for %s#%s is useless", rb_class2name(CLASS_OF(proc)), rb_id2name(ruby_frame->last_func)); |