aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-06 11:24:42 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-06 11:24:42 +0000
commit6c5a50ff3357c7ca913f9772a8f98a7edcecfcfd (patch)
tree3edaad10ab0f162c9f1de213f94b91a597307bf4
parent7e5b2304c593371958fac489e596988a7ec95b0d (diff)
downloadruby-6c5a50ff3357c7ca913f9772a8f98a7edcecfcfd.tar.gz
* insns.def (invokeblock): fix of splat argument.
(splat same as normal method dispatch) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12452 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--insns.def4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e1bf1367b4..efd21d93ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 6 20:23:46 2007 Koichi Sasada <ko1@atdot.net>
+
+ * insns.def (invokeblock): fix of splat argument.
+ (splat same as normal method dispatch)
+
Wed Jun 6 16:27:25 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* insns.def: fixed indentation.
diff --git a/insns.def b/insns.def
index 1ad6490f15..02ffe11673 100644
--- a/insns.def
+++ b/insns.def
@@ -1328,7 +1328,9 @@ invokeblock
if (BUILTIN_TYPE(iseq) != T_NODE) {
if (flag & VM_CALL_ARGS_SPLAT_BIT) {
VALUE ary = TOPN(0);
- if (CLASS_OF(ary) != rb_cArray) {
+ ary = rb_check_convert_type(ary, T_ARRAY, "Array", "to_splat");
+
+ if (NIL_P(ary)) {
/* not a [BUG] */
}
else {