Skip to content

Commit 478c3e0

Browse files
marcandremarcandre
committed
* 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 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27558 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent f6a5c0f commit 478c3e0

File tree

9 files changed

+43
-21
lines changed

9 files changed

+43
-21
lines changed

‎ChangeLog‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
Fri Apr 30 11:40:44 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
2+
3+
* eval.c (make_exception, rb_obj_extend): Fix error messages in case
4+
of wrong
5+
number of arguments
6+
7+
* file.c (rb_f_test, rb_file_s_umask): ditto
8+
9+
* numeric.c (int_chr, num_step): ditto
10+
11+
* process.c (rb_f_sleep): ditto
12+
13+
* re.c (rb_reg_initialize_m): ditto
14+
15+
* signal.c (rb_f_kill, sig_trap): ditto
16+
17+
* string.c (rb_str_aref_m, rb_str_aset_m, rb_str_count,
18+
rb_str_delete_bang,
19+
rb_str_slice_bang, rb_str_sub_bang, str_gsub): ditto
20+
21+
* proc.c (curry): rdoc fix
22+
123
Fri Apr 30 04:09:30 2010 NAKAMURA Usaku <usa@ruby-lang.org>
224

325
* time.c (TIMET_MAX): should be time_t, not unsigned_time_t.

‎eval.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ make_exception(int argc, VALUE *argv, int isstr)
555555
}
556556
break;
557557
default:
558-
rb_raise(rb_eArgError, "wrong number of arguments");
558+
rb_raise(rb_eArgError, "wrong number of arguments (%d for 0..3)", argc);
559559
break;
560560
}
561561
if (argc > 0) {
@@ -930,7 +930,7 @@ rb_obj_extend(int argc, VALUE *argv, VALUE obj)
930930
int i;
931931

932932
if (argc == 0) {
933-
rb_raise(rb_eArgError, "wrong number of arguments (0 for 1)");
933+
rb_raise(rb_eArgError, "wrong number of arguments (at least 1)");
934934
}
935935
for (i = 0; i < argc; i++)
936936
Check_Type(argv[i], T_MODULE);

‎file.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2476,7 +2476,7 @@ rb_file_s_umask(int argc, VALUE *argv)
24762476
omask = umask(NUM2INT(argv[0]));
24772477
}
24782478
else {
2479-
rb_raise(rb_eArgError, "wrong number of arguments");
2479+
rb_raise(rb_eArgError, "wrong number of arguments (%d for 0..1)", argc);
24802480
}
24812481
return INT2FIX(omask);
24822482
}
@@ -3962,7 +3962,7 @@ rb_f_test(int argc, VALUE *argv)
39623962
{
39633963
int cmd;
39643964

3965-
if (argc == 0) rb_raise(rb_eArgError, "wrong number of arguments");
3965+
if (argc == 0) rb_raise(rb_eArgError, "wrong number of arguments (0 for 2..3)");
39663966
cmd = NUM2CHR(argv[0]);
39673967
if (cmd == 0) goto unknown;
39683968
if (strchr("bcdefgGkloOprRsSuwWxXz", cmd)) {

‎numeric.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1600,7 +1600,7 @@ num_step(int argc, VALUE *argv, VALUE from)
16001600
step = argv[1];
16011601
}
16021602
else {
1603-
rb_raise(rb_eArgError, "wrong number of arguments");
1603+
rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..2)", argc);
16041604
}
16051605
if (rb_equal(step, INT2FIX(0))) {
16061606
rb_raise(rb_eArgError, "step can't be 0");
@@ -2018,7 +2018,7 @@ int_chr(int argc, VALUE *argv, VALUE num)
20182018
case 1:
20192019
break;
20202020
default:
2021-
rb_raise(rb_eArgError, "wrong number of arguments (%d for 0 or 1)", argc);
2021+
rb_raise(rb_eArgError, "wrong number of arguments (%d for 0..1)", argc);
20222022
break;
20232023
}
20242024
enc = rb_to_encoding(argv[0]);

‎proc.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1967,16 +1967,16 @@ curry(VALUE dummy, VALUE args, int argc, VALUE *argv, VALUE passed_proc)
19671967
*
19681968
* b = lambda {|x, y, z| (x||0) + (y||0) + (z||0) }
19691969
* p b.curry[1][2][3] #=> 6
1970-
* p b.curry[1, 2][3, 4] #=> wrong number of arguments (4 or 3)
1971-
* p b.curry(5) #=> wrong number of arguments (5 or 3)
1972-
* p b.curry(1) #=> wrong number of arguments (1 or 3)
1970+
* p b.curry[1, 2][3, 4] #=> wrong number of arguments (4 for 3)
1971+
* p b.curry(5) #=> wrong number of arguments (5 for 3)
1972+
* p b.curry(1) #=> wrong number of arguments (1 for 3)
19731973
*
19741974
* b = lambda {|x, y, z, *w| (x||0) + (y||0) + (z||0) + w.inject(0, &:+) }
19751975
* p b.curry[1][2][3] #=> 6
19761976
* p b.curry[1, 2][3, 4] #=> 10
19771977
* p b.curry(5)[1][2][3][4][5] #=> 15
19781978
* p b.curry(5)[1, 2][3, 4][5] #=> 15
1979-
* p b.curry(1) #=> wrong number of arguments (1 or 3)
1979+
* p b.curry(1) #=> wrong number of arguments (1 for 3)
19801980
*
19811981
* b = proc { :foo }
19821982
* p b.curry[] #=> :foo

‎process.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3262,7 +3262,7 @@ rb_f_sleep(int argc, VALUE *argv)
32623262
rb_thread_wait_for(rb_time_interval(argv[0]));
32633263
}
32643264
else {
3265-
rb_raise(rb_eArgError, "wrong number of arguments");
3265+
rb_raise(rb_eArgError, "wrong number of arguments (%d for 0..1)", argc);
32663266
}
32673267

32683268
end = time(0) - beg;

‎re.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2867,7 +2867,7 @@ rb_reg_initialize_m(int argc, VALUE *argv, VALUE self)
28672867
long len;
28682868

28692869
if (argc == 0 || argc > 3) {
2870-
rb_raise(rb_eArgError, "wrong number of arguments");
2870+
rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..3)", argc);
28712871
}
28722872
if (TYPE(argv[0]) == T_REGEXP) {
28732873
VALUE re = argv[0];

‎signal.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ rb_f_kill(int argc, VALUE *argv)
351351

352352
rb_secure(2);
353353
if (argc < 2)
354-
rb_raise(rb_eArgError, "wrong number of arguments -- kill(sig, pid...)");
354+
rb_raise(rb_eArgError, "wrong number of arguments (%d for at least 2)", argc);
355355
switch (TYPE(argv[0])) {
356356
case T_FIXNUM:
357357
sig = FIX2INT(argv[0]);
@@ -940,7 +940,7 @@ sig_trap(int argc, VALUE *argv)
940940

941941
rb_secure(2);
942942
if (argc < 1 || argc > 2) {
943-
rb_raise(rb_eArgError, "wrong number of arguments -- trap(sig, cmd)/trap(sig){...}");
943+
rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..2)", argc);
944944
}
945945

946946
arg.sig = trap_signm(argv[0]);

‎string.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3093,7 +3093,7 @@ rb_str_aref_m(int argc, VALUE *argv, VALUE str)
30933093
return rb_str_substr(str, NUM2LONG(argv[0]), NUM2LONG(argv[1]));
30943094
}
30953095
if (argc != 1) {
3096-
rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
3096+
rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..2)", argc);
30973097
}
30983098
return rb_str_aref(str, argv[0]);
30993099
}
@@ -3323,7 +3323,7 @@ rb_str_aset_m(int argc, VALUE *argv, VALUE str)
33233323
return argv[2];
33243324
}
33253325
if (argc != 2) {
3326-
rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)", argc);
3326+
rb_raise(rb_eArgError, "wrong number of arguments (%d for 2..3)", argc);
33273327
}
33283328
return rb_str_aset(str, argv[0], argv[1]);
33293329
}
@@ -3388,7 +3388,7 @@ rb_str_slice_bang(int argc, VALUE *argv, VALUE str)
33883388
int i;
33893389

33903390
if (argc < 1 || 2 < argc) {
3391-
rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
3391+
rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..2)", argc);
33923392
}
33933393
for (i=0; i<argc; i++) {
33943394
buf[i] = argv[i];
@@ -3462,7 +3462,7 @@ rb_str_sub_bang(int argc, VALUE *argv, VALUE str)
34623462
if (OBJ_UNTRUSTED(repl)) untrusted = 1;
34633463
}
34643464
else {
3465-
rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)", argc);
3465+
rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..2)", argc);
34663466
}
34673467

34683468
pat = get_pat(argv[0], 1);
@@ -3606,7 +3606,7 @@ str_gsub(int argc, VALUE *argv, VALUE str, int bang)
36063606
if (OBJ_TAINTED(repl)) tainted = 1;
36073607
break;
36083608
default:
3609-
rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)", argc);
3609+
rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..2)", argc);
36103610
}
36113611

36123612
pat = get_pat(argv[0], 1);
@@ -5066,7 +5066,7 @@ rb_str_delete_bang(int argc, VALUE *argv, VALUE str)
50665066

50675067
if (RSTRING_LEN(str) == 0 || !RSTRING_PTR(str)) return Qnil;
50685068
if (argc < 1) {
5069-
rb_raise(rb_eArgError, "wrong number of arguments");
5069+
rb_raise(rb_eArgError, "wrong number of arguments (at least 1)");
50705070
}
50715071
for (i=0; i<argc; i++) {
50725072
VALUE s = argv[i];
@@ -5312,7 +5312,7 @@ rb_str_count(int argc, VALUE *argv, VALUE str)
53125312
int ascompat;
53135313

53145314
if (argc < 1) {
5315-
rb_raise(rb_eArgError, "wrong number of arguments");
5315+
rb_raise(rb_eArgError, "wrong number of arguments (at least 1)");
53165316
}
53175317
for (i=0; i<argc; i++) {
53185318
VALUE tstr = argv[i];

0 commit comments

Comments
 (0)