summaryrefslogtreecommitdiff
path: root/array.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-11-19 14:42:45 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-11-19 14:42:45 +0000
commit04f27f5e8ddbbc06544d96df4097e0300685a1cc (patch)
treeda51f25d928d2c8825aa66b1bf6c5f7880aa8e11 /array.c
parentdf96f994f1a224070ffaa61eb2bcb969d0109246 (diff)
* eval.c (rb_mod_modfunc): should follow NODE_ZSUPER link; based
on Guy Decoux's patch in [ruby-talk:25478]. * string.c (rb_str_succ): there was buffer overrun. * parse.y (str_extend): term can be any character. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1847 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r--array.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/array.c b/array.c
index 9fae8dc..9d5dcd7 100644
--- a/array.c
+++ b/array.c
@@ -860,8 +860,10 @@ rb_ary_to_s(ary)
VALUE str, sep;
if (RARRAY(ary)->len == 0) return rb_str_new(0, 0);
- if (!NIL_P(rb_output_fs)) sep = rb_output_fs;
- else sep = rb_default_rs;
+ sep = rb_output_fs;
+#if 1
+ if (NIL_P(rb_output_fs)) sep = rb_default_rs; /* newline */
+#endif
str = rb_ary_join(ary, sep);
return str;
}