summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-27 06:26:48 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-27 06:26:48 +0000
commitfbbe50ac0cdfc5c6e76ab200c986dd5d6f49c4c1 (patch)
tree018dcac6e1c19db4e7623f6ecf88616f226e60cd
parent00e9d52e7b382a0ae75ce59c929b6588f1962ede (diff)
downloadruby-fbbe50ac0cdfc5c6e76ab200c986dd5d6f49c4c1.tar.gz
ruby-fbbe50ac0cdfc5c6e76ab200c986dd5d6f49c4c1.tar.xz
ruby-fbbe50ac0cdfc5c6e76ab200c986dd5d6f49c4c1.zip
* vm_insnhelper.c (vm_yield_with_cfunc): rename parameter name
"blockptr" to "blockargptr". git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21091 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--vm_insnhelper.c10
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 4a42cc8d5..de5322faa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec 27 15:23:38 2008 Koichi Sasada <ko1@atdot.net>
+
+ * vm_insnhelper.c (vm_yield_with_cfunc): rename parameter name
+ "blockptr" to "blockargptr".
+
Sat Dec 27 15:15:56 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* common.mk (revision.h): ignores failure of file2lastrev.
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 3a13a0774..5b5e93ef3 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 {