summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-08-10 14:23:10 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-08-10 14:23:10 +0000
commit844cd0c454d66a8239833411d3fb131f801fcad9 (patch)
tree360f51b2907f282eb7354218153596f60872ef13
parenta70dfc773315f0d50ed733920007da96227c4805 (diff)
downloadruby-844cd0c454d66a8239833411d3fb131f801fcad9.tar.gz
ruby-844cd0c454d66a8239833411d3fb131f801fcad9.tar.xz
ruby-844cd0c454d66a8239833411d3fb131f801fcad9.zip
matz
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@889 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--eval.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 88f26801e..f717b0d8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 10 08:05:03 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (rb_callcc): returned current thread instaed of
+ continuation wrongly.
+
Thu Aug 10 05:40:28 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
* ext/extmk.rb.in: $CPPFLAGS should be initialized.
diff --git a/eval.c b/eval.c
index cf61825a9..eb0096327 100644
--- a/eval.c
+++ b/eval.c
@@ -8105,7 +8105,7 @@ rb_callcc(self)
return th->result;
}
else {
- return rb_yield(th->thread);
+ return rb_yield(cont);
}
}