ruby-changes:15642
From: marcandre <ko1@a...>
Date: Fri, 30 Apr 2010 11:41:17 +0900 (JST)
Subject: [ruby-changes:15642] Ruby:r27558 (trunk): * eval.c (make_exception, rb_obj_extend): Fix error messages in case of wrong
marcandre 2010-04-30 11:40:57 +0900 (Fri, 30 Apr 2010) New Revision: 27558 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27558 Log: * eval.c (make_exception, rb_obj_extend): Fix error messages in case of wrong number of arguments * file.c (rb_f_test, rb_file_s_umask): ditto * numeric.c (int_chr, num_step): ditto * process.c (rb_f_sleep): ditto * re.c (rb_reg_initialize_m): ditto * signal.c (rb_f_kill, sig_trap): ditto * string.c (rb_str_aref_m, rb_str_aset_m, rb_str_count, rb_str_delete_bang, rb_str_slice_bang, rb_str_sub_bang, str_gsub): ditto * proc.c (curry): rdoc fix Modified files: trunk/ChangeLog trunk/eval.c trunk/file.c trunk/numeric.c trunk/proc.c trunk/process.c trunk/re.c trunk/signal.c trunk/string.c Index: ChangeLog =================================================================== --- ChangeLog (revision 27557) +++ ChangeLog (revision 27558) @@ -1,3 +1,25 @@ +Fri Apr 30 11:40:44 2010 Marc-Andre Lafortune <ruby-core@m...> + + * eval.c (make_exception, rb_obj_extend): Fix error messages in case + of wrong + number of arguments + + * file.c (rb_f_test, rb_file_s_umask): ditto + + * numeric.c (int_chr, num_step): ditto + + * process.c (rb_f_sleep): ditto + + * re.c (rb_reg_initialize_m): ditto + + * signal.c (rb_f_kill, sig_trap): ditto + + * string.c (rb_str_aref_m, rb_str_aset_m, rb_str_count, + rb_str_delete_bang, + rb_str_slice_bang, rb_str_sub_bang, str_gsub): ditto + + * proc.c (curry): rdoc fix + Fri Apr 30 04:09:30 2010 NAKAMURA Usaku <usa@r...> * time.c (TIMET_MAX): should be time_t, not unsigned_time_t. Index: re.c =================================================================== --- re.c (revision 27557) +++ re.c (revision 27558) @@ -2867,7 +2867,7 @@ long len; if (argc == 0 || argc > 3) { - rb_raise(rb_eArgError, "wrong number of arguments"); + rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..3)", argc); } if (TYPE(argv[0]) == T_REGEXP) { VALUE re = argv[0]; Index: string.c =================================================================== --- string.c (revision 27557) +++ string.c (revision 27558) @@ -3093,7 +3093,7 @@ return rb_str_substr(str, NUM2LONG(argv[0]), NUM2LONG(argv[1])); } if (argc != 1) { - rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc); + rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..2)", argc); } return rb_str_aref(str, argv[0]); } @@ -3323,7 +3323,7 @@ return argv[2]; } if (argc != 2) { - rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)", argc); + rb_raise(rb_eArgError, "wrong number of arguments (%d for 2..3)", argc); } return rb_str_aset(str, argv[0], argv[1]); } @@ -3388,7 +3388,7 @@ int i; if (argc < 1 || 2 < argc) { - rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc); + rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..2)", argc); } for (i=0; i<argc; i++) { buf[i] = argv[i]; @@ -3462,7 +3462,7 @@ if (OBJ_UNTRUSTED(repl)) untrusted = 1; } else { - rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)", argc); + rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..2)", argc); } pat = get_pat(argv[0], 1); @@ -3606,7 +3606,7 @@ if (OBJ_TAINTED(repl)) tainted = 1; break; default: - rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)", argc); + rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..2)", argc); } pat = get_pat(argv[0], 1); @@ -5066,7 +5066,7 @@ if (RSTRING_LEN(str) == 0 || !RSTRING_PTR(str)) return Qnil; if (argc < 1) { - rb_raise(rb_eArgError, "wrong number of arguments"); + rb_raise(rb_eArgError, "wrong number of arguments (at least 1)"); } for (i=0; i<argc; i++) { VALUE s = argv[i]; @@ -5312,7 +5312,7 @@ int ascompat; if (argc < 1) { - rb_raise(rb_eArgError, "wrong number of arguments"); + rb_raise(rb_eArgError, "wrong number of arguments (at least 1)"); } for (i=0; i<argc; i++) { VALUE tstr = argv[i]; Index: proc.c =================================================================== --- proc.c (revision 27557) +++ proc.c (revision 27558) @@ -1967,16 +1967,16 @@ * * b = lambda {|x, y, z| (x||0) + (y||0) + (z||0) } * p b.curry[1][2][3] #=> 6 - * p b.curry[1, 2][3, 4] #=> wrong number of arguments (4 or 3) - * p b.curry(5) #=> wrong number of arguments (5 or 3) - * p b.curry(1) #=> wrong number of arguments (1 or 3) + * p b.curry[1, 2][3, 4] #=> wrong number of arguments (4 for 3) + * p b.curry(5) #=> wrong number of arguments (5 for 3) + * p b.curry(1) #=> wrong number of arguments (1 for 3) * * b = lambda {|x, y, z, *w| (x||0) + (y||0) + (z||0) + w.inject(0, &:+) } * p b.curry[1][2][3] #=> 6 * p b.curry[1, 2][3, 4] #=> 10 * p b.curry(5)[1][2][3][4][5] #=> 15 * p b.curry(5)[1, 2][3, 4][5] #=> 15 - * p b.curry(1) #=> wrong number of arguments (1 or 3) + * p b.curry(1) #=> wrong number of arguments (1 for 3) * * b = proc { :foo } * p b.curry[] #=> :foo Index: eval.c =================================================================== --- eval.c (revision 27557) +++ eval.c (revision 27558) @@ -555,7 +555,7 @@ } break; default: - rb_raise(rb_eArgError, "wrong number of arguments"); + rb_raise(rb_eArgError, "wrong number of arguments (%d for 0..3)", argc); break; } if (argc > 0) { @@ -930,7 +930,7 @@ int i; if (argc == 0) { - rb_raise(rb_eArgError, "wrong number of arguments (0 for 1)"); + rb_raise(rb_eArgError, "wrong number of arguments (at least 1)"); } for (i = 0; i < argc; i++) Check_Type(argv[i], T_MODULE); Index: process.c =================================================================== --- process.c (revision 27557) +++ process.c (revision 27558) @@ -3262,7 +3262,7 @@ rb_thread_wait_for(rb_time_interval(argv[0])); } else { - rb_raise(rb_eArgError, "wrong number of arguments"); + rb_raise(rb_eArgError, "wrong number of arguments (%d for 0..1)", argc); } end = time(0) - beg; Index: numeric.c =================================================================== --- numeric.c (revision 27557) +++ numeric.c (revision 27558) @@ -1600,7 +1600,7 @@ step = argv[1]; } else { - rb_raise(rb_eArgError, "wrong number of arguments"); + rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..2)", argc); } if (rb_equal(step, INT2FIX(0))) { rb_raise(rb_eArgError, "step can't be 0"); @@ -2018,7 +2018,7 @@ case 1: break; default: - rb_raise(rb_eArgError, "wrong number of arguments (%d for 0 or 1)", argc); + rb_raise(rb_eArgError, "wrong number of arguments (%d for 0..1)", argc); break; } enc = rb_to_encoding(argv[0]); Index: signal.c =================================================================== --- signal.c (revision 27557) +++ signal.c (revision 27558) @@ -351,7 +351,7 @@ rb_secure(2); if (argc < 2) - rb_raise(rb_eArgError, "wrong number of arguments -- kill(sig, pid...)"); + rb_raise(rb_eArgError, "wrong number of arguments (%d for at least 2)", argc); switch (TYPE(argv[0])) { case T_FIXNUM: sig = FIX2INT(argv[0]); @@ -940,7 +940,7 @@ rb_secure(2); if (argc < 1 || argc > 2) { - rb_raise(rb_eArgError, "wrong number of arguments -- trap(sig, cmd)/trap(sig){...}"); + rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..2)", argc); } arg.sig = trap_signm(argv[0]); Index: file.c =================================================================== --- file.c (revision 27557) +++ file.c (revision 27558) @@ -2476,7 +2476,7 @@ omask = umask(NUM2INT(argv[0])); } else { - rb_raise(rb_eArgError, "wrong number of arguments"); + rb_raise(rb_eArgError, "wrong number of arguments (%d for 0..1)", argc); } return INT2FIX(omask); } @@ -3962,7 +3962,7 @@ { int cmd; - if (argc == 0) rb_raise(rb_eArgError, "wrong number of arguments"); + if (argc == 0) rb_raise(rb_eArgError, "wrong number of arguments (0 for 2..3)"); cmd = NUM2CHR(argv[0]); if (cmd == 0) goto unknown; if (strchr("bcdefgGkloOprRsSuwWxXz", cmd)) { -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/