From 8bfcdf323f1843237140e9f119496b93557eaefd Mon Sep 17 00:00:00 2001
From: ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 25 Jun 2007 19:06:00 +0000
Subject: * insnhelper.ci (vm_yield_with_cfunc), proc.c: fix Method#to_proc  
 to return lamba Proc ([ruby-dev:31021], [ruby-dev:31037]).

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 insnhelper.ci | 44 +++++++++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 19 deletions(-)

(limited to 'insnhelper.ci')

diff --git a/insnhelper.ci b/insnhelper.ci
index 5c25a0e0bf..eb228b4295 100644
--- a/insnhelper.ci
+++ b/insnhelper.ci
@@ -562,6 +562,20 @@ vm_call_method(rb_thread_t *th, rb_control_frame_t *cfp,
 
 /* yield */
 
+static inline int
+block_proc_is_lambda(VALUE procval)
+{
+    rb_proc_t *proc;
+
+    if (procval) {
+	GetProcPtr(procval, proc);
+	return proc->is_lambda;
+    }
+    else {
+	return 0;
+    }
+}
+
 static inline VALUE
 vm_yield_with_cfunc(rb_thread_t *th, rb_block_t *block,
 		    VALUE self, int argc, VALUE *argv)
@@ -569,15 +583,21 @@ vm_yield_with_cfunc(rb_thread_t *th, rb_block_t *block,
     NODE *ifunc = (NODE *) block->iseq;
     VALUE val;
     VALUE arg;
+    int lambda = block_proc_is_lambda(block->proc);
 
-    if (argc == 1) {
-	arg = *argv;
-    }
-    else if (argc > 1) {
+    if (lambda) {
 	arg = rb_ary_new4(argc, argv);
     }
     else {
-	arg = rb_ary_new();
+	if (argc == 1) {
+	    arg = *argv;
+	}
+	else if (argc > 1) {
+	    arg = rb_ary_new4(argc, argv);
+	}
+	else {
+	    arg = rb_ary_new();
+	}
     }
 
     vm_push_frame(th, 0, FRAME_MAGIC_IFUNC,
@@ -970,20 +990,6 @@ vm_search_super_klass(VALUE klass, VALUE recv)
     return klass;
 }
 
-static inline int
-block_proc_is_lambda(VALUE procval)
-{
-    rb_proc_t *proc;
-
-    if (procval) {
-	GetProcPtr(procval, proc);
-	return proc->is_lambda;
-    }
-    else {
-	return 0;
-    }
-}
-
 static void
 call_yarv_end_proc(VALUE data)
 {
-- 
cgit v1.2.3