summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-28 04:51:27 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-28 04:51:27 +0000
commitab15a714f875b44f95d18a5e7cc0f67b1c518276 (patch)
treeed72b6199f2d32a57511f729ee6d861d8e622634
parentb6630a375d9c79de6b7ec0d684f7053292be0df5 (diff)
* eval.c (when_check): arbitrary values are allowed after splats.
fixed: [ruby-dev:28879] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10419 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--eval.c3
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f07e985e93..ca67dc48c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 28 13:51:21 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (when_check): arbitrary values are allowed after splats.
+ fixed: [ruby-dev:28879]
+
Wed Jun 28 09:16:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (primary): remove meaningless else-only case statement
@@ -32,7 +37,7 @@ Tue Jun 27 22:47:18 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/tcltklib.c: forgot to update TCLTKLIB_RELEASE_DATE.
- * ext/tk/lib/tk.rb (tk_tcl2ruby): [bug fix] somtimes fail to convert
+ * ext/tk/lib/tk.rb (tk_tcl2ruby): [bug fix] somtimes fail to convert
a tcl string to a ruby object if the tcl string includes "\n".
Tue Jun 27 20:05:14 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
diff --git a/eval.c b/eval.c
index 94f38ee99f..3b6833419a 100644
--- a/eval.c
+++ b/eval.c
@@ -2711,7 +2711,8 @@ when_check(NODE *tag, VALUE val, VALUE self)
if (when_check(tag->nd_head, val, self)) return Qtrue;
return when_check(tag->nd_body, val, self);
default:
- unknown_node(tag);
+ if (when_cond(val, rb_eval(self, tag))) return Qtrue;
+ break;
}
return Qfalse;
}