* eval.c (rb_yield_0): push yielded node instead of yielding.

  fixed: [yarv-dev:549]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8864 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 18 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 71ee8ec1c4..a89f82f800 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,33 +1,38 @@
+Fri Jul 29 09:59:38 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_yield_0): push yielded node instead of yielding.
+	  fixed: [yarv-dev:549]
+
 Thu Jul 28 18:09:55 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/stubs.c: When --enable-tcltk-stubs, the initialize
-	  routine creates a Tcl/Tk interpreter and deletes it. However, 
-	  init cost of Tk's MainWindow is not so small. And that makes it 
-	  impossible to use libraries written with Tcl functions only on 
+	  routine creates a Tcl/Tk interpreter and deletes it. However,
+	  init cost of Tk's MainWindow is not so small. And that makes it
+	  impossible to use libraries written with Tcl functions only on
 	  an environment without a graphical display. This changes support
 	  delaying initalization of Tk_Stubs until the script needs Tk.
 
-	* ext/tcltklib/stubs.h: New file. Define prototypes and return 
+	* ext/tcltklib/stubs.h: New file. Define prototypes and return
 	  codes of functions on stubs.c.
 
-	* ext/tcltklib/tcltklib.c: Support delaying initalization of 
+	* ext/tcltklib/tcltklib.c: Support delaying initalization of
 	  Tk_Stubs until the script needs Tk.
 
-	* ext/tcltklib/tcltklib.c: Show friendly error messages for errors 
+	* ext/tcltklib/tcltklib.c: Show friendly error messages for errors
 	  on initialization.
 
-	* ext/tcltklib/tcltklib.c: Avoid SEGV on ip_finalize() when ruby is 
-	  exiting and $DEBUG is true. (Not fix. If you know the reason of 
+	* ext/tcltklib/tcltklib.c: Avoid SEGV on ip_finalize() when ruby is
+	  exiting and $DEBUG is true. (Not fix. If you know the reason of
 	  why, please fix it.)
 
-	* ext/tk/tkutil.c (ary2list, ary2list2): bug fix on handling of 
+	* ext/tk/tkutil.c (ary2list, ary2list2): bug fix on handling of
 	  encoding.
 
 	* ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string and bg_eval_string
-	  don't work propery. 
+	  don't work propery.
 
 	* ext/tk/lib/tk.rb: Forget extending Tk::Encoding module to Tk.
-	* ext/tk/lib/tk/variable.rb: TkVarAccess fails to initialize the 
+	* ext/tk/lib/tk/variable.rb: TkVarAccess fails to initialize the
 	  object for an element of a Tcl's array variable.
 
 Wed Jul 27 23:23:54 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
@@ -47,7 +52,7 @@ Wed Jul 27 10:59:02 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Tue Jul 26 12:57:49 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* ext/openssl/openssl_missin.c: include <openssl/engine.h> before  
+	* ext/openssl/openssl_missin.c: include <openssl/engine.h> before
 	  <openssl/x509_vfy.h> to avoid compilation error of mswin32.
 	  suggested by NAKAMURA Usaku.
 
diff --git a/eval.c b/eval.c
index 3ac7d07e2a..69357dfcb2 100644
--- a/eval.c
+++ b/eval.c
@@ -4764,6 +4764,7 @@ rb_yield_0(val, self, klass, flags, avalue)
     block = ruby_block;
     frame = block->frame;
     frame.prev = ruby_frame;
+    frame.node = cnode;
     ruby_frame = &(frame);
     old_cref = (VALUE)ruby_cref;
     ruby_cref = block->cref;