summaryrefslogtreecommitdiff
path: root/string.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-02 08:05:24 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-02 08:05:24 +0000
commit45ba4645614ab888fc74e66714b4fc7447e07083 (patch)
tree07f283bfd4c1bdab630bb215ec20a95c3951cabc /string.c
parentaadbcc5b8210a6d5988494957ecedc1b8b71fc97 (diff)
merges r29335 from trunk into ruby_1_9_2.
-- * string.c (sym_call), vm.c (invoke_block_from_c), vm_insnhelper.c (vm_yield_with_cfunc): pass given block. [ruby-core:32075] * vm_eval.c (rb_funcall_passing_block): new function to call method with passing given block. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30023 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r--string.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/string.c b/string.c
index c38983561b..fc4f747063 100644
--- a/string.c
+++ b/string.c
@@ -7171,6 +7171,8 @@ sym_to_sym(VALUE sym)
return sym;
}
+VALUE rb_funcall_passing_block(VALUE recv, ID mid, int argc, const VALUE *argv);
+
static VALUE
sym_call(VALUE args, VALUE sym, int argc, VALUE *argv)
{
@@ -7180,7 +7182,7 @@ sym_call(VALUE args, VALUE sym, int argc, VALUE *argv)
rb_raise(rb_eArgError, "no receiver given");
}
obj = argv[0];
- return rb_funcall3(obj, (ID)sym, argc - 1, argv + 1);
+ return rb_funcall_passing_block(obj, (ID)sym, argc - 1, argv + 1);
}
/*