Changeset 307

Timestamp:

2008-07-03 20:59:39 (2 months ago)

Author:

lsansonetti@…

Message:

fix for #86

Location:

MacRuby/trunk

Files:

• vm.c (modified) (1 diff)
• vm_eval.c (modified) (1 diff)
• vm_insnhelper.c (modified) (1 diff)

MacRuby/trunk/vm.c

@@ -14 +14 @@
 #include "ruby/encoding.h"
 #include "gc.h"
+
+#if WITH_OBJC
+NODE *rb_current_cfunc_node = NULL;
+#endif
 
 #include "insnhelper.h"

MacRuby/trunk/vm_eval.c

@@ -73 +73 @@
             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) {

MacRuby/trunk/vm_insnhelper.c

@@ -353 +353 @@
     return Qnil;                /* not reached */
 }
-
-#if WITH_OBJC
-NODE *rb_current_cfunc_node = NULL;
-#endif
 
 static inline VALUE