nobu	2009-11-13 16:22:04 +0900 (Fri, 13 Nov 2009)

  New Revision: 25748

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25748

  Log:
    * thread.c (thread_start_func_2): see first_func, not first_proc,
      to decide which to use.

  Modified files:
    branches/mvm/ChangeLog
    branches/mvm/thread.c
    trunk/ChangeLog
    trunk/thread.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 25747)
+++ ChangeLog	(revision 25748)
@@ -1,5 +1,8 @@
-Fri Nov 13 11:09:31 2009  Nobuyoshi Nakada  <nobu@r...>
+Fri Nov 13 16:22:00 2009  Nobuyoshi Nakada  <nobu@r...>
 
+	* thread.c (thread_start_func_2): see first_func, not first_proc,
+	  to decide which to use.
+
 	* gc.c (vm_xrealloc): use the given object space.
 
 Fri Nov 13 00:46:24 2009  Takeyuki FUJIOKA  <xibbar@r...>
Index: thread.c
===================================================================
--- thread.c	(revision 25747)
+++ thread.c	(revision 25748)
@@ -420,7 +420,7 @@
 	TH_PUSH_TAG(th);
 	if ((state = EXEC_TAG()) == 0) {
 	    SAVE_ROOT_JMPBUF(th, {
-		if (th->first_proc) {
+		if (!th->first_func) {
 		    GetProcPtr(th->first_proc, proc);
 		    th->errinfo = Qnil;
 		    th->local_lfp = proc->block.lfp;
@@ -429,7 +429,7 @@
 						  (int)RARRAY_LEN(args), RARRAY_PTR(args), 0);
 		}
 		else {
-		    th->value = (*th->first_func)((void *)th->first_args);
+		    th->value = (*th->first_func)((void *)args);
 		}
 	    });
 	}
Index: mvm/ChangeLog
===================================================================
--- mvm/ChangeLog	(revision 25747)
+++ mvm/ChangeLog	(revision 25748)
@@ -1,5 +1,8 @@
-Fri Nov 13 11:09:31 2009  Nobuyoshi Nakada  <nobu@r...>
+Fri Nov 13 16:22:00 2009  Nobuyoshi Nakada  <nobu@r...>
 
+	* thread.c (thread_start_func_2): see first_func, not first_proc,
+	  to decide which to use.
+
 	* gc.c (vm_xrealloc): use the given object space.
 
 Fri Nov 13 10:14:11 2009  Nobuyoshi Nakada  <nobu@r...>
Index: mvm/thread.c
===================================================================
--- mvm/thread.c	(revision 25747)
+++ mvm/thread.c	(revision 25748)
@@ -443,7 +443,7 @@
 	TH_PUSH_TAG(th);
 	if ((state = EXEC_TAG()) == 0) {
 	    SAVE_ROOT_JMPBUF(th, {
-		if (th->first_proc) {
+		if (!th->first_func) {
 		    GetProcPtr(th->first_proc, proc);
 		    th->errinfo = Qnil;
 		    th->local_lfp = proc->block.lfp;
@@ -452,7 +452,7 @@
 						  (int)RARRAY_LEN(args), RARRAY_PTR(args), 0);
 		}
 		else {
-		    th->value = (*th->first_func)((void *)th->first_args);
+		    th->value = (*th->first_func)((void *)args);
 		}
 	    });
 	}

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