[macruby-changes] [5048] MacRuby/trunk/compiler.cpp

[source_changes at macosforge.org]

Revision: 5048
          http://trac.macosforge.org/projects/ruby/changeset/5048
Author:   lsansonetti at apple.com
Date:     2010-12-17 16:14:02 -0800 (Fri, 17 Dec 2010)
Log Message:
-----------
fix a bug in the compilation of scopes where the current_block_arg state variable wouldn't be re-entrant (this fixes the compilation of the mechanize library)

Modified Paths:
--------------
    MacRuby/trunk/compiler.cpp

Modified: MacRuby/trunk/compiler.cpp
===================================================================
--- MacRuby/trunk/compiler.cpp	2010-12-17 23:29:21 UTC (rev 5047)
+++ MacRuby/trunk/compiler.cpp	2010-12-18 00:14:02 UTC (rev 5048)
@@ -2734,6 +2734,7 @@
 	running_block = NULL;
     }
 
+    Value *old_current_block_arg = current_block_arg;
     current_block_arg = NULL;
     if (node->nd_tbl != NULL) {
 	bool has_vars_to_save = false;
@@ -2979,6 +2980,8 @@
 	}
     }
 
+    current_block_arg = old_current_block_arg;
+
     rescue_rethrow_bb = old_rescue_rethrow_bb;
     rescue_invoke_bb = old_rescue_invoke_bb;
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20101217/87aebd05/attachment.html>