diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-28 09:41:15 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-28 09:41:15 +0000 |
| commit | 678097c6e3f64d9ef21584442957858c78845082 (patch) | |
| tree | 2bbfa13c916d442360cbee86c16abf49ff8e65a1 /vm_insnhelper.c | |
| parent | 6a1420c308d66780cbf698e7859cdd026a40ff90 (diff) | |
merges r21091 from trunk into ruby_1_9_1.
* vm_insnhelper.c (vm_yield_with_cfunc): rename parameter name
"blockptr" to "blockargptr".
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21121 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 3a13a0774e..5b5e93ef38 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -644,7 +644,7 @@ block_proc_is_lambda(const VALUE procval) static inline VALUE vm_yield_with_cfunc(rb_thread_t *th, const rb_block_t *block, VALUE self, int argc, const VALUE *argv, - const rb_block_t *blockptr) + const rb_block_t *blockargptr) { NODE *ifunc = (NODE *) block->iseq; VALUE val, arg, blockarg; @@ -660,12 +660,12 @@ vm_yield_with_cfunc(rb_thread_t *th, const rb_block_t *block, arg = argv[0]; } - if (blockptr) { - if (blockptr->proc) { - blockarg = blockptr->proc; + if (blockargptr) { + if (blockargptr->proc) { + blockarg = blockargptr->proc; } else { - blockarg = vm_make_proc(th, blockptr, rb_cProc); + blockarg = vm_make_proc(th, blockargptr, rb_cProc); } } else { |