summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-29 03:48:19 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-29 03:48:19 +0000
commit2656b0545eaa3a5d8d2b96788adc2c1f4e78a1e0 (patch)
treed73404749f21a13e4dbbc648824070c2f3ce1c98
parent69099d3e69cda873114981b131bc45b1490bcbf7 (diff)
* parse.y (aref_args): args may not be a list. [ruby-dev:31592]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13301 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--bootstraptest/test_knownbug.rb30
-rw-r--r--bootstraptest/test_literal.rb2
-rw-r--r--parse.y2
4 files changed, 21 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index b509501..3fd370d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Aug 29 12:48:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (aref_args): args may not be a list. [ruby-dev:31592]
+
Wed Aug 29 11:30:10 2007 Tanaka Akira <akr@fsij.org>
* include/ruby/st.h (struct st_table): add entries_packed 1-bit
diff --git a/bootstraptest/test_knownbug.rb b/bootstraptest/test_knownbug.rb
index 94b9281..80de543 100644
--- a/bootstraptest/test_knownbug.rb
+++ b/bootstraptest/test_knownbug.rb
@@ -1,16 +1,14 @@
-#
-# This test file concludes tests which point out known bugs.
-# So all tests will cause failure.
-#
-
-# massign
-assert_equal '[0,1,{2=>3}]', '[0,*[1],2=>3]', "[ruby-dev:31592]"
-
-assert_equal 'ok', %q{
- def m()
- yield :ng
- end
- r = :ok
- m {|(r)|}
- r
-}, '[ruby-dev:31507]'
+#
+# This test file concludes tests which point out known bugs.
+# So all tests will cause failure.
+#
+
+# massign
+assert_equal 'ok', %q{
+ def m()
+ yield :ng
+ end
+ r = :ok
+ m {|(r)|}
+ r
+}, '[ruby-dev:31507]'
diff --git a/bootstraptest/test_literal.rb b/bootstraptest/test_literal.rb
index 7696396..2efd415 100644
--- a/bootstraptest/test_literal.rb
+++ b/bootstraptest/test_literal.rb
@@ -115,6 +115,8 @@ assert_equal '5', 'a = [1,2,3]; a[1] = 5; a[1]'
assert_equal 'bar', '[*:foo];:bar'
assert_equal '[1, 2]', 'def nil.to_splat; [2]; end; [1, *nil]'
assert_equal '[1, 2]', 'def nil.to_splat; [1, 2]; end; [*nil]'
+assert_equal '[0, 1, {2=>3}]', '[0, *[1], 2=>3]', "[ruby-dev:31592]"
+
# hash
assert_equal 'Hash', '{}.class'
diff --git a/parse.y b/parse.y
index 14d7b27..08c4268 100644
--- a/parse.y
+++ b/parse.y
@@ -2239,7 +2239,7 @@ aref_args : none
| args ',' assocs trailer
{
/*%%%*/
- $$ = list_append($1, NEW_HASH($3));
+ $$ = arg_append($1, NEW_HASH($3));
/*%
$$ = arg_add_assocs($1, $3);
%*/