* 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

1 files changed, 7 insertions, 7 deletions

diff --git a/string.c b/string.c
index 01ee1b5e92..1c45632b7a 100644
--- a/string.c
+++ b/string.c
@@ -1139,7 +1139,7 @@ rb_str_aref_m(argc, argv, str)
 	return rb_str_substr(str, NUM2INT(argv[0]), NUM2INT(argv[1]));
     }
     if (argc != 1) {
-	rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)", argc);
+	rb_raise(rb_eArgError, "wrong number of arguments(%d for 1)", argc);
     }
     return rb_str_aref(str, argv[0]);
 }
@@ -1295,7 +1295,7 @@ rb_str_aset_m(argc, argv, str)
 	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);
     }
     return rb_str_aset(str, argv[0], argv[1]);
 }
@@ -1328,7 +1328,7 @@ rb_str_slice_bang(argc, argv, str)
     int i;
 
     if (argc < 1 || 2 < argc) {
-	rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)", argc);
+	rb_raise(rb_eArgError, "wrong number of arguments(%d for 1)", argc);
     }
     for (i=0; i<argc; i++) {
 	buf[i] = argv[i];
@@ -1379,7 +1379,7 @@ rb_str_sub_bang(argc, argv, str)
 	if (OBJ_TAINTED(repl)) tainted = 1;
     }
     else {
-	rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)", argc);
+	rb_raise(rb_eArgError, "wrong number of arguments(%d for 2)", argc);
     }
 
     pat = get_pat(argv[0]);
@@ -1453,7 +1453,7 @@ str_gsub(argc, argv, str, bang)
 	if (OBJ_TAINTED(repl)) tainted = 1;
     }
     else {
-	rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)", argc);
+	rb_raise(rb_eArgError, "wrong number of arguments(%d for 2)", argc);
     }
 
     pat = get_pat(argv[0]);
@@ -2225,7 +2225,7 @@ rb_str_delete_bang(argc, argv, str)
     int i;
 
     if (argc < 1) {
-	rb_raise(rb_eArgError, "wrong # of arguments");
+	rb_raise(rb_eArgError, "wrong number of arguments");
     }
     for (i=0; i<argc; i++) {
 	VALUE s = argv[i];
@@ -2350,7 +2350,7 @@ rb_str_count(argc, argv, str)
     int i;
 
     if (argc < 1) {
-	rb_raise(rb_eArgError, "wrong # of arguments");
+	rb_raise(rb_eArgError, "wrong number of arguments");
     }
     for (i=0; i<argc; i++) {
 	VALUE s = argv[i];