Revision

1941

Author

vincent.isambart@gmail.com

Date

2009-06-26 18:24:26 -0700 (Fri, 26 Jun 2009)

Log Message

fixed a bug in eval

Modified Paths

• MacRuby/branches/experimental/parse.y
• MacRuby/branches/experimental/test_vm/eval.rb

Diff

--- MacRuby/branches/experimental/parse.y	2009-06-26 23:10:20 UTC (rev 1940)
+++ MacRuby/branches/experimental/parse.y	2009-06-27 01:24:26 UTC (rev 1941)
@@ -8992,7 +8992,7 @@
 
 	    pprev_vars = prev_vars->prev;
 	    pprev_args = prev_args->prev;
-	    while (pprev_vars != NULL) {
+	    while ((pprev_vars != NULL) && (pprev_vars != DVARS_INHERIT)) {
 		if (vtable_included(pprev_vars, id) || vtable_included(pprev_args, id)) {
 		    vtable_add(prev_vars, id);
 		    break;

--- MacRuby/branches/experimental/test_vm/eval.rb	2009-06-26 23:10:20 UTC (rev 1940)
+++ MacRuby/branches/experimental/test_vm/eval.rb	2009-06-27 01:24:26 UTC (rev 1941)
@@ -93,3 +93,5 @@
   }
   eval "p a", b
 }
+
+assert '42', 'y = eval("proc {|x| p x}"); y.call(42)'