summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--parse.y2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3020ccc1f7..d111444349 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 28 23:29:30 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * parse.y (assoc_list): odd number check only for NODE_ARRAY.
+ [ruby-dev:31082]
+
Thu Jun 28 22:24:33 2007 Koichi Sasada <ko1@atdot.net>
* win32/Makefile.sub: define FUNC_FASTCALL macro.
diff --git a/parse.y b/parse.y
index b3050d25cb..b6a3fc3388 100644
--- a/parse.y
+++ b/parse.y
@@ -4328,7 +4328,7 @@ assoc_list : none
| args trailer
{
/*%%%*/
- if ($1->nd_alen%2 != 0) {
+ if (nd_type($1) == NODE_ARRAY && $1->nd_alen%2 != 0) {
yyerror("odd number list for Hash");
}
$$ = $1;