[macruby-changes] [307] MacRuby/trunk

[source_changes at macosforge.org]

Revision: 307
          http://trac.macosforge.org/projects/ruby/changeset/307
Author:   lsansonetti at apple.com
Date:     2008-07-03 20:59:39 -0700 (Thu, 03 Jul 2008)
Log Message:
-----------
fix for #86

Modified Paths:
--------------
    MacRuby/trunk/vm.c
    MacRuby/trunk/vm_eval.c
    MacRuby/trunk/vm_insnhelper.c

Modified: MacRuby/trunk/vm.c
===================================================================
--- MacRuby/trunk/vm.c	2008-06-30 09:58:51 UTC (rev 306)
+++ MacRuby/trunk/vm.c	2008-07-04 03:59:39 UTC (rev 307)
@@ -14,6 +14,10 @@
 #include "ruby/encoding.h"
 #include "gc.h"
 
+#if WITH_OBJC
+NODE *rb_current_cfunc_node = NULL;
+#endif
+
 #include "insnhelper.h"
 #include "vm_insnhelper.c"
 #include "vm_eval.c"

Modified: MacRuby/trunk/vm_eval.c
===================================================================
--- MacRuby/trunk/vm_eval.c	2008-06-30 09:58:51 UTC (rev 306)
+++ MacRuby/trunk/vm_eval.c	2008-07-04 03:59:39 UTC (rev 307)
@@ -72,7 +72,13 @@
 	    cfp->method_id = id;
 	    cfp->method_class = klass;
 
+#if WITH_OBJC
+	    rb_current_cfunc_node = (NODE *)body;
+#endif
 	    val = call_cfunc(body->nd_cfnc, recv, body->nd_argc, argc, argv);
+#if WITH_OBJC
+	    rb_current_cfunc_node = NULL;
+#endif
 
 	    if (reg_cfp != th->cfp + 1) {
 		SDR2(reg_cfp);

Modified: MacRuby/trunk/vm_insnhelper.c
===================================================================
--- MacRuby/trunk/vm_insnhelper.c	2008-06-30 09:58:51 UTC (rev 306)
+++ MacRuby/trunk/vm_insnhelper.c	2008-07-04 03:59:39 UTC (rev 307)
@@ -353,10 +353,6 @@
     return Qnil;		/* not reached */
 }
 
-#if WITH_OBJC
-NODE *rb_current_cfunc_node = NULL;
-#endif
-
 static inline VALUE
 vm_call_cfunc(rb_thread_t *th, rb_control_frame_t *reg_cfp,
 	      int num, ID id, VALUE recv, VALUE klass,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macruby-changes/attachments/20080703/0df9c27c/attachment.html