summaryrefslogtreecommitdiffhomepage
path: root/src/class.c
diff options
context:
space:
mode:
authorKOBAYASHI Shuji <[email protected]>2021-01-02 19:15:34 +0900
committerKOBAYASHI Shuji <[email protected]>2021-01-02 19:15:34 +0900
commit1a9ac02d8df85c282338fc63a746643e1e364f88 (patch)
tree95a1c23b95eef65c982dd7a15ad21fd4adb8930e /src/class.c
parent1fbabe207d457ce771918f560fcf1bb070f6aded (diff)
downloadmruby-1a9ac02d8df85c282338fc63a746643e1e364f88.tar.gz
mruby-1a9ac02d8df85c282338fc63a746643e1e364f88.zip
Refine "wrong number of arguments" message in `mrb_get_args`
#### Before this patch: ```ruby __send__ #=> wrong number of arguments {}.default(1,2) #=> wrong number of arguments ``` #### After this patch: ```ruby __send__ #=> wrong number of arguments (given 0, expected 1+) {}.default(1,2) #=> wrong number of arguments (given 2, expected 0..1) ```
Diffstat (limited to 'src/class.c')
-rw-r--r--src/class.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/class.c b/src/class.c
index bdf74e718..270d8885f 100644
--- a/src/class.c
+++ b/src/class.c
@@ -894,7 +894,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
mrb_bool given = TRUE;
mrb_value kdict;
mrb_bool reqkarg = FALSE;
- mrb_int needargc = 0;
+ int argc_min = 0, argc_max = 0;
if (!argv_on_stack) {
struct RArray *a = mrb_ary_ptr(*array_argv);
@@ -912,6 +912,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
break;
case '*':
opt_skip = FALSE;
+ argc_max = -1;
if (!reqkarg) reqkarg = strchr(fmt, ':') ? TRUE : FALSE;
goto check_exit;
case '!':
@@ -923,13 +924,14 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
if (opt) opt_skip = FALSE;
break;
default:
- if (!opt) needargc ++;
+ if (!opt) argc_min++;
+ argc_max++;
break;
}
}
check_exit:
- if (reqkarg && argc > needargc && mrb_hash_p(kdict = ARGV[argc - 1])) {
+ if (reqkarg && argc > argc_min && mrb_hash_p(kdict = ARGV[argc - 1])) {
mrb_hash_check_kdict(mrb, kdict);
argc --;
}
@@ -952,7 +954,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
given = FALSE;
}
else {
- mrb_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments");
+ mrb_argnum_error(mrb, argc, argc_min, argc_max);
}
}
break;
@@ -1315,7 +1317,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
#undef ARGV
if (!c && argc > i) {
- mrb_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments");
+ mrb_argnum_error(mrb, argc, argc_min, argc_max);
}
finish:
@@ -2232,7 +2234,6 @@ mrb_define_alias_id(mrb_state *mrb, struct RClass *klass, mrb_sym a, mrb_sym b)
mrb_value
mrb_mod_to_s(mrb_state *mrb, mrb_value klass)
{
-
if (mrb_sclass_p(klass)) {
mrb_value v = mrb_iv_get(mrb, klass, MRB_SYM(__attached__));
mrb_value str = mrb_str_new_lit(mrb, "#<Class:");