summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2020-01-01 22:37:14 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2020-01-01 22:37:14 +0900
commit9174b18f34cdee25fdf8433ee33642932b06a445 (patch)
treea477a4a274b51302331c22a3d8ba538587203363
parentb9c78c3fccf0917a8f4b05e02b79d80eeb83982d (diff)
downloadmruby-9174b18f34cdee25fdf8433ee33642932b06a445.tar.gz
mruby-9174b18f34cdee25fdf8433ee33642932b06a445.zip
Rename `mrb_num_args_error` to `mrb_argnum_error`; ref #4863
-rw-r--r--include/mruby.h2
-rw-r--r--mrbgems/mruby-io/src/io.c2
-rw-r--r--mrbgems/mruby-socket/src/socket.c2
-rw-r--r--mrbgems/mruby-struct/src/struct.c2
-rw-r--r--src/error.c4
-rw-r--r--src/hash.c2
-rw-r--r--src/kernel.c2
7 files changed, 8 insertions, 8 deletions
diff --git a/include/mruby.h b/include/mruby.h
index 6dd843559..671053ff9 100644
--- a/include/mruby.h
+++ b/include/mruby.h
@@ -1232,7 +1232,7 @@ MRB_API mrb_noreturn void mrb_raise(mrb_state *mrb, struct RClass *c, const char
MRB_API mrb_noreturn void mrb_raisef(mrb_state *mrb, struct RClass *c, const char *fmt, ...);
MRB_API mrb_noreturn void mrb_name_error(mrb_state *mrb, mrb_sym id, const char *fmt, ...);
MRB_API mrb_noreturn void mrb_frozen_error(mrb_state *mrb, void *frozen_obj);
-MRB_API mrb_noreturn void mrb_num_args_error(mrb_state *mrb, mrb_int argc, int min, int max);
+MRB_API mrb_noreturn void mrb_argnum_error(mrb_state *mrb, mrb_int argc, int min, int max);
MRB_API void mrb_warn(mrb_state *mrb, const char *fmt, ...);
MRB_API mrb_noreturn void mrb_bug(mrb_state *mrb, const char *fmt, ...);
MRB_API void mrb_print_backtrace(mrb_state *mrb);
diff --git a/mrbgems/mruby-io/src/io.c b/mrbgems/mruby-io/src/io.c
index 6d76dc196..df5bd007b 100644
--- a/mrbgems/mruby-io/src/io.c
+++ b/mrbgems/mruby-io/src/io.c
@@ -1047,7 +1047,7 @@ mrb_io_s_select(mrb_state *mrb, mrb_value klass)
mrb_get_args(mrb, "*", &argv, &argc);
if (argc < 1 || argc > 4) {
- mrb_num_args_error(mrb, argc, 1, 4);
+ mrb_argnum_error(mrb, argc, 1, 4);
}
timeout = mrb_nil_value();
diff --git a/mrbgems/mruby-socket/src/socket.c b/mrbgems/mruby-socket/src/socket.c
index 3008b1d83..8a0d9df6b 100644
--- a/mrbgems/mruby-socket/src/socket.c
+++ b/mrbgems/mruby-socket/src/socket.c
@@ -476,7 +476,7 @@ mrb_basicsocket_setsockopt(mrb_state *mrb, mrb_value self)
optname = mrb_fixnum(mrb_funcall(mrb, so, "optname", 0));
optval = mrb_funcall(mrb, so, "data", 0);
} else {
- mrb_num_args_error(mrb, argc, 3, 3);
+ mrb_argnum_error(mrb, argc, 3, 3);
}
s = socket_fd(mrb, self);
diff --git a/mrbgems/mruby-struct/src/struct.c b/mrbgems/mruby-struct/src/struct.c
index 726b66f96..f42a5f1ea 100644
--- a/mrbgems/mruby-struct/src/struct.c
+++ b/mrbgems/mruby-struct/src/struct.c
@@ -274,7 +274,7 @@ mrb_struct_s_def(mrb_state *mrb, mrb_value klass)
name = mrb_nil_value();
mrb_get_args(mrb, "*&", &argv, &argc, &b);
if (argc == 0) { /* special case to avoid crash */
- mrb_num_args_error(mrb, argc, 1, -1);
+ mrb_argnum_error(mrb, argc, 1, -1);
}
else {
pargv = argv;
diff --git a/src/error.c b/src/error.c
index 045931c50..260ca7a3d 100644
--- a/src/error.c
+++ b/src/error.c
@@ -481,7 +481,7 @@ exception_call:
break;
default:
- mrb_num_args_error(mrb, argc, 0, 3);
+ mrb_argnum_error(mrb, argc, 0, 3);
break;
}
if (argc > 0) {
@@ -538,7 +538,7 @@ mrb_frozen_error(mrb_state *mrb, void *frozen_obj)
}
MRB_API mrb_noreturn void
-mrb_num_args_error(mrb_state *mrb, mrb_int argc, int min, int max)
+mrb_argnum_error(mrb_state *mrb, mrb_int argc, int min, int max)
{
#define FMT(exp) "wrong number of arguments (given %i, expected " exp ")"
if (min == max)
diff --git a/src/hash.c b/src/hash.c
index afcd3511d..70f437358 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -800,7 +800,7 @@ mrb_hash_init(mrb_state *mrb, mrb_value hash)
mrb_hash_modify(mrb, hash);
if (!mrb_nil_p(block)) {
if (ifnone_p) {
- mrb_num_args_error(mrb, 1, 0, 0);
+ mrb_argnum_error(mrb, 1, 0, 0);
}
RHASH(hash)->flags |= MRB_HASH_PROC_DEFAULT;
ifnone = block;
diff --git a/src/kernel.c b/src/kernel.c
index 8d4f81bdd..8bb837eca 100644
--- a/src/kernel.c
+++ b/src/kernel.c
@@ -384,7 +384,7 @@ mrb_obj_extend(mrb_state *mrb, mrb_int argc, mrb_value *argv, mrb_value obj)
mrb_int i;
if (argc == 0) {
- mrb_num_args_error(mrb, argc, 1, -1);
+ mrb_argnum_error(mrb, argc, 1, -1);
}
for (i = 0; i < argc; i++) {
mrb_check_type(mrb, argv[i], MRB_TT_MODULE);