summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-10-05 15:46:24 +0000
committeraamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-10-05 15:46:24 +0000
commit79d646b101ea0ea741ead37729cb6f7a6c9835ac (patch)
tree5b2371e1de71021dff8af02ecea6824511723691
parent0aac4795f3664e4c5d887c847551cbf2f0257a7b (diff)
downloadruby-79d646b101ea0ea741ead37729cb6f7a6c9835ac.tar.gz
ruby-79d646b101ea0ea741ead37729cb6f7a6c9835ac.tar.xz
ruby-79d646b101ea0ea741ead37729cb6f7a6c9835ac.zip
* eval.c (rb_load): should not pass block to the loaded file.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2937 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--eval.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7024132e8..d099b1fa8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Oct 6 00:49:15 2002 Minero Aoki <aamine@loveruby.net>
+
+ * eval.c (rb_load): should not pass blocks to the loaded file.
+ [ruby-dev:18458]
+
Fri Oct 4 20:25:38 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* eval.c (rb_thread_interrupt, rb_thread_signal_raise): no need to
diff --git a/eval.c b/eval.c
index b5a09f5c4..31a7cae5d 100644
--- a/eval.c
+++ b/eval.c
@@ -5346,6 +5346,7 @@ rb_load(fname, wrap)
rb_extend_object(self, ruby_class);
PUSH_CREF(ruby_wrapper);
}
+ PUSH_ITER(ITER_NOT);
PUSH_FRAME();
ruby_frame->last_func = 0;
ruby_frame->last_class = 0;
@@ -5380,6 +5381,7 @@ rb_load(fname, wrap)
ruby_cref = saved_cref;
POP_SCOPE();
POP_FRAME();
+ POP_ITER();
POP_CLASS();
POP_VARS();
ruby_wrapper = wrapper;