diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-11-19 05:03:03 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-11-19 05:03:03 +0000 |
commit | df96f994f1a224070ffaa61eb2bcb969d0109246 (patch) | |
tree | 2e4bd7b58a1bc0a2b8d0e136f79a2997323e54d6 /array.c | |
parent | d550569264a16e96121d05423f7516ce726d96c9 (diff) |
* parse.y (parse_regx): should raise error on untermitated
expression interpolation.
* pack.c (pack_unpack): should give length to utf8_to_uv().
* pack.c (utf8_to_uv): add length check.
* massages: replace "wrong #" by "wrong number".
* marshal.c (w_float): output Infinity and NaN explicitly.
* marshal.c (r_object): support new explicit float format.
* eval.c (rb_thread_wait_for): select may cause ERESTART on
Solaris.
* eval.c (rb_thread_select): ditto.
* array.c (rb_ary_join): dumped core if sep is not T_STRING nor T_NIL.
* array.c (rb_ary_join): buffer size calculattion was wrong.
* array.c (rb_ary_to_s): if rb_output_fs is nil, insert newlines
between array elements (use rb_default_rs as newline litral)
[experimental].
* gc.c (init_mark_stack): no need to clear mark_stack.
* gc.c (gc_mark_all): need to handle finalizer mark.
* gc.c (gc_mark_rest): use MEMCPY instead of memcpy.
* gc.c (rb_gc_mark): earlier const check to avoid pusing special
constants into mark stack.
* numeric.c (fix_to_s): 'to_s' now takes optional argument to
specify radix. [new]
* bignum.c (rb_big_to_s): ditto. [new]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1842 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r-- | array.c | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -305,7 +305,7 @@ rb_ary_push_m(argc, argv, ary) VALUE ary; { if (argc == 0) { - rb_raise(rb_eArgError, "wrong # of arguments(at least 1)"); + rb_raise(rb_eArgError, "wrong number arguments(at least 1)"); } if (argc > 0) { while (argc--) { @@ -380,7 +380,7 @@ rb_ary_unshift_m(argc, argv, ary) VALUE ary; { if (argc == 0) { - rb_raise(rb_eArgError, "wrong # of arguments(at least 1)"); + rb_raise(rb_eArgError, "wrong number of arguments(at least 1)"); } if (argc > 0) { long len = RARRAY(ary)->len; @@ -652,7 +652,7 @@ rb_ary_aset(argc, argv, ary) return argv[2]; } if (argc != 2) { - rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)", argc); + rb_raise(rb_eArgError, "wrong number of arguments(%d for 2)", argc); } if (FIXNUM_P(argv[0])) { offset = FIX2LONG(argv[0]); @@ -682,7 +682,7 @@ rb_ary_insert(argc, argv, ary) long pos; if (argc < 2) { - rb_raise(rb_eArgError, "wrong # of arguments(at least 2)"); + rb_raise(rb_eArgError, "wrong number of arguments(at least 2)"); } pos = NUM2LONG(argv[0]); if (pos == -1) { @@ -774,6 +774,7 @@ rb_ary_dup(ary) } extern VALUE rb_output_fs; +extern VALUE rb_default_rs; static VALUE inspect_join(ary, arg) @@ -856,11 +857,12 @@ VALUE rb_ary_to_s(ary) VALUE ary; { - VALUE str; + VALUE str, sep; if (RARRAY(ary)->len == 0) return rb_str_new(0, 0); - str = rb_ary_join(ary, rb_output_fs); - if (NIL_P(str)) return rb_str_new(0, 0); + if (!NIL_P(rb_output_fs)) sep = rb_output_fs; + else sep = rb_default_rs; + str = rb_ary_join(ary, sep); return str; } |