admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5253 from shuujii/refine-wrong-number-of-arguments-message-in-mrb_get_args

Browse Source 
Refine "wrong number of arguments" message in `mrb_get_args`
This commit is contained in:
Yukihiro "Matz" Matsumoto
2021-01-02 19:45:09 +09:00
committed by GitHub
parent 1fbabe207d 1a9ac02d8d
commit 12cb7207ec
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/class.c
+7 -6
View File
@@ -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:");
test/t/argumenterror.rb
+16
View File
@@ -1,6 +1,13 @@
##
# ArgumentError ISO Test
def assert_argnum_error(given, expected, &block)
assert("wrong number of arguments") do
message = "wrong number of arguments (given #{given}, expected #{expected})"
assert_raise_with_message(ArgumentError, message, &block)
end
end
assert('ArgumentError', '15.2.24') do
e2 = nil
a = []
@@ -14,3 +21,12 @@ assert('ArgumentError', '15.2.24') do
assert_equal(Class, ArgumentError.class)
assert_equal(ArgumentError, e2.class)
end
assert("'wrong number of arguments' from mrb_get_args") do
assert_argnum_error(0, "1+"){__send__}
assert_argnum_error(0, 1..2){Object.const_defined?}
assert_argnum_error(3, 1..2){Object.const_defined?(:A, true, 2)}
assert_argnum_error(2, 0..1){{}.default(1, 2)}
assert_argnum_error(1, 2){Object.const_set(:B)}
assert_argnum_error(3, 2){Object.const_set(:C, 1, 2)}
end