matz

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@935 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 0053a47f4..c8ddb70fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
-Tue Sep 12 14:36:49 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Sep 12 15:41:13 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* stable version 1.6.0 released.
 
+Tue Sep 12 15:37:55 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_yield_0): stripped array too much, should be just for
+	  proc_call(). 
+
 Tue Sep 12 07:05:24 2000  Wakou Aoyama <wakou@fsinet.or.jp>
 
 	* lib/cgi.rb: version 2.0.0: require ruby1.5.4 or later.
diff --git a/eval.c b/eval.c
index b1b4ae5b1..e7f87051a 100644
--- a/eval.c
+++ b/eval.c
@@ -3427,7 +3427,7 @@ rb_yield_0(val, self, klass, acheck)
 	    if (nd_type(block->var) == NODE_MASGN)
 		massign(self, block->var, val, acheck);
 	    else {
-		if (val != Qundef &&
+		if (acheck && val != Qundef &&
 		    TYPE(val) == T_ARRAY && RARRAY(val)->len == 1) {
 		    val = RARRAY(val)->ptr[0];
 		}