wanabe	2008-06-08 20:18:54 +0900 (Sun, 08 Jun 2008)

  New Revision: 17019

  Modified files:
    trunk/ChangeLog
    trunk/vm_insnhelper.c

  Log:
    * vm_insnhelper.c (vm_throw): regard break as return in lambda.
      [ruby-dev:34646]

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=17019&r2=17018&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/vm_insnhelper.c?r1=17019&r2=17018&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 17018)
+++ ChangeLog	(revision 17019)
@@ -1,3 +1,8 @@
+Sun Jun  8 20:12:47 2008  wanabe  <s.wanabe@g...>
+
+	* vm_insnhelper.c (vm_throw): regard break as return in lambda.
+	  [ruby-dev:34646]
+
 Sun Jun  8 19:17:59 2008  Koichi Sasada  <ko1@a...>
 
 	* gc.c: add a build option "CALC_EXACT_MALLOC_SIZE".
Index: vm_insnhelper.c
===================================================================
--- vm_insnhelper.c	(revision 17018)
+++ vm_insnhelper.c	(revision 17019)
@@ -1234,7 +1234,8 @@
 		if (VM_FRAME_TYPE(cfp) == FRAME_MAGIC_LAMBDA) {
 		    /* lambda{... break ...} */
 		    is_orphan = 0;
-		    pt = dfp;
+		    pt = GET_LFP();
+		    state = TAG_RETURN;
 		}
 		else {
 		    dfp = GC_GUARDED_PTR_REF((VALUE *) *dfp);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/