diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-20 07:07:35 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-20 07:07:35 +0000 |
commit | 314bef7ef149d7ce87c57fa0c95e30fc8fb9b27f (patch) | |
tree | 0d4ec9f1e50ea5fb278260d7ac8517210761df6e /proc.c | |
parent | e42fac7c061283180cbc630bd930ef16f5074d33 (diff) |
* insnhelper.ci, vm.c, vm_core.h: change interface of
vm_invoke_block() to specify block ptr. [ruby-talk:266422]
* cont.c, eval_jump.ci, insns.def, proc.c, signal.c, thread.c:
apply above change.
* bootstraptest/test_knownbug.rb: move fixed bug.
* bootstraptest/test_block.rb: ditto. and add a test.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14356 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'proc.c')
-rw-r--r-- | proc.c | 42 |
1 files changed, 20 insertions, 22 deletions
@@ -352,17 +352,6 @@ proc_lambda(void) return rb_block_lambda(); } -VALUE -proc_invoke(VALUE self, VALUE args, VALUE alt_self, VALUE alt_class) -{ - rb_proc_t *proc; - GetProcPtr(self, proc); - - /* ignore self and klass */ - return vm_invoke_proc(GET_THREAD(), proc, proc->block.self, - RARRAY_LEN(args), RARRAY_PTR(args)); -} - /* CHECKME: are the argument checking semantics correct? */ /* @@ -401,23 +390,32 @@ static VALUE proc_call(int argc, VALUE *argv, VALUE procval) { rb_proc_t *proc; + rb_block_t *blockptr = 0; GetProcPtr(procval, proc); - return vm_invoke_proc(GET_THREAD(), proc, proc->block.self, argc, argv); -} + if (BUILTIN_TYPE(proc->block.iseq) != T_NODE && + proc->block.iseq->arg_block != -1) { -static VALUE -proc_yield(int argc, VALUE *argv, VALUE procval) -{ - rb_proc_t *proc; - GetProcPtr(procval, proc); - return vm_invoke_proc(GET_THREAD(), proc, proc->block.self, argc, argv); + if (rb_block_given_p()) { + rb_proc_t *proc; + VALUE procval; + procval = rb_block_proc(); + GetProcPtr(procval, proc); + blockptr = &proc->block; + } + } + + return vm_invoke_proc(GET_THREAD(), proc, proc->block.self, + argc, argv, blockptr); } VALUE -rb_proc_call(VALUE proc, VALUE args) +rb_proc_call(VALUE self, VALUE args) { - return proc_invoke(proc, args, Qundef, 0); + rb_proc_t *proc; + GetProcPtr(self, proc); + return vm_invoke_proc(GET_THREAD(), proc, proc->block.self, + RARRAY_LEN(args), RARRAY_PTR(args), 0); } /* @@ -1489,7 +1487,7 @@ Init_Proc(void) rb_define_singleton_method(rb_cProc, "new", rb_proc_s_new, -1); rb_define_method(rb_cProc, "call", proc_call, -1); rb_define_method(rb_cProc, "[]", proc_call, -1); - rb_define_method(rb_cProc, "yield", proc_yield, -1); + rb_define_method(rb_cProc, "yield", proc_call, -1); rb_define_method(rb_cProc, "to_proc", proc_to_proc, 0); rb_define_method(rb_cProc, "arity", proc_arity, 0); rb_define_method(rb_cProc, "clone", proc_clone, 0); |