summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-07-03 19:11:49 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-07-03 19:11:49 +0000
commit43bbe2841daf838111aa3f2687c23506191e76e7 (patch)
tree4afa1ee916597c6a307dc3bc90322792c077ec83
parent590609f255378694c085b5ee20a6a083d4eab0c3 (diff)
* compile.c (compile_array): ignore NODE_ZARRAY.
[ruby-dev:31110] * bootstraptest/test_method.rb: add a test for above. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12686 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--bootstraptest/test_method.rb15
-rw-r--r--compile.c22
3 files changed, 34 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 8d87dc9..fffc290 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jul 4 04:07:00 2007 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c (compile_array): ignore NODE_ZARRAY.
+ [ruby-dev:31110]
+
+ * bootstraptest/test_method.rb: add a test for above.
+
Wed Jul 4 04:04:02 2007 Koichi Sasada <ko1@atdot.net>
* compile.h: fix debug print level.
diff --git a/bootstraptest/test_method.rb b/bootstraptest/test_method.rb
index c95eec1..7f20bf5 100644
--- a/bootstraptest/test_method.rb
+++ b/bootstraptest/test_method.rb
@@ -336,6 +336,21 @@ assert_equal '[[:ok1, :foo], [:ok2, :foo, :bar]]',
$ary
}
+# with
+assert_equal '[:ok1, [:ok2, 11]]', %q{
+ class C
+ def []
+ $ary << :ok1
+ 10
+ end
+ def []=(a)
+ $ary << [:ok2, a]
+ end
+ end
+ $ary = []
+ C.new[]+=1
+ $ary
+}
# splat and block arguments
assert_equal %q{[[[:x, :y, :z], NilClass], [[1, :x, :y, :z], NilClass], [[1, 2, :x, :y, :z], NilClass], [[:obj], NilClass], [[1, :obj], NilClass], [[1, 2, :obj], NilClass], [[], Proc], [[1], Proc], [[1, 2], Proc], [[], Proc], [[1], Proc], [[1, 2], Proc], [[:x, :y, :z], Proc], [[1, :x, :y, :z], Proc], [[1, 2, :x, :y, :z], Proc]]}, %q{
diff --git a/compile.c b/compile.c
index 02f2214..73b761c 100644
--- a/compile.c
+++ b/compile.c
@@ -1831,18 +1831,20 @@ compile_array(rb_iseq_t *iseq,
int len = node->nd_alen, line = nd_line(node), i=0;
DECL_ANCHOR(anchor);
- while (node) {
- if (nd_type(node) != NODE_ARRAY) {
- rb_bug("compile_array: This node is not NODE_ARRAY, but %s",
- ruby_node_name(nd_type(node)));
- }
+ if (nd_type(node) != NODE_ZARRAY) {
+ while (node) {
+ if (nd_type(node) != NODE_ARRAY) {
+ rb_bug("compile_array: This node is not NODE_ARRAY, but %s",
+ ruby_node_name(nd_type(node)));
+ }
- i++;
- if (opt_p && nd_type(node->nd_head) != NODE_LIT) {
- opt_p = Qfalse;
+ i++;
+ if (opt_p && nd_type(node->nd_head) != NODE_LIT) {
+ opt_p = Qfalse;
+ }
+ COMPILE(anchor, "array element", node->nd_head);
+ node = node->nd_next;
}
- COMPILE(anchor, "array element", node->nd_head);
- node = node->nd_next;
}
if (len != i) {