From 81de1f159ce97821e16a127d600bffe1aa724bde Mon Sep 17 00:00:00 2001
From: KOBAYASHI Shuji <shuujii@gmail.com>
Date: Thu, 12 Dec 2019 11:45:58 +0900
Subject: Add `mrb_num_args_error()` for "wrong number of arguments" error

To unify the style of messages.
---
 src/error.c  | 15 ++++++++++++++-
 src/hash.c   |  2 +-
 src/kernel.c |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/error.c b/src/error.c
index 43b09ec66..11129387f 100644
--- a/src/error.c
+++ b/src/error.c
@@ -530,7 +530,7 @@ exception_call:
 
       break;
     default:
-      mrb_raisef(mrb, E_ARGUMENT_ERROR, "wrong number of arguments (%i for 0..3)", argc);
+      mrb_num_args_error(mrb, argc, 0, 3);
       break;
   }
   if (argc > 0) {
@@ -586,6 +586,19 @@ mrb_frozen_error(mrb_state *mrb, void *frozen_obj)
   mrb_raisef(mrb, E_FROZEN_ERROR, "can't modify frozen %t", mrb_obj_value(frozen_obj));
 }
 
+MRB_API mrb_noreturn void
+mrb_num_args_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)
+    mrb_raisef(mrb, E_ARGUMENT_ERROR, FMT("%d"), argc, min);
+  else if (max < 0)
+    mrb_raisef(mrb, E_ARGUMENT_ERROR, FMT("%d+"), argc, min);
+  else
+    mrb_raisef(mrb, E_ARGUMENT_ERROR, FMT("%d..%d"), argc, min, max);
+#undef FMT
+}
+
 void
 mrb_init_exception(mrb_state *mrb)
 {
diff --git a/src/hash.c b/src/hash.c
index d94fc23b0..afcd3511d 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_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments");
+      mrb_num_args_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 69a7311e0..8d4f81bdd 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_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments (at least 1)");
+    mrb_num_args_error(mrb, argc, 1, -1);
   }
   for (i = 0; i < argc; i++) {
     mrb_check_type(mrb, argv[i], MRB_TT_MODULE);
-- 
cgit v1.2.3