Use the dedicated function to check arity

nobu · nobu · commit 56f2fd3bc9bb · 2022-10-01T16:24:36.000+09:00
diff --git a/struct.c b/struct.c
@@ -742,7 +742,7 @@ rb_struct_initialize_m(int argc, const VALUE *argv, VALUE self)
     switch (rb_struct_s_keyword_init(klass)) {
       default:
         if (argc > 1 || !RB_TYPE_P(argv[0], T_HASH)) {
-            rb_raise(rb_eArgError, "wrong number of arguments (given %d, expected 0)", argc);
+            rb_error_arity(argc, 0, 0);
         }
         keyword_init = true;
         break;
@@ -1800,7 +1800,7 @@ rb_data_initialize_m(int argc, const VALUE *argv, VALUE self)
         return Qnil;
     }
     if (argc > 1 || !RB_TYPE_P(argv[0], T_HASH)) {
-        rb_raise(rb_eArgError, "wrong number of arguments (given %d, expected 0)", argc);
+        rb_error_arity(argc, 0, 0);
     }
 
     if (RHASH_SIZE(argv[0]) < num_members) {
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
@@ -428,16 +428,17 @@ rb_vm_pop_frame(rb_execution_context_t *ec)
 static inline VALUE
 rb_arity_error_new(int argc, int min, int max)
 {
-    VALUE err_mess = 0;
+    VALUE err_mess = rb_sprintf("wrong number of arguments (given %d, expected %d", argc, min);
     if (min == max) {
-        err_mess = rb_sprintf("wrong number of arguments (given %d, expected %d)", argc, min);
+        /* max is not needed */
     }
     else if (max == UNLIMITED_ARGUMENTS) {
-        err_mess = rb_sprintf("wrong number of arguments (given %d, expected %d+)", argc, min);
+        rb_str_cat_cstr(err_mess, "+");
     }
     else {
-        err_mess = rb_sprintf("wrong number of arguments (given %d, expected %d..%d)", argc, min, max);
+        rb_str_catf(err_mess, "..%d", max);
     }
+    rb_str_cat_cstr(err_mess, ")");
     return rb_exc_new3(rb_eArgError, err_mess);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -742,7 +742,7 @@ rb_struct_initialize_m(int argc, const VALUE *argv, VALUE self)`
`742`	`742`	`switch (rb_struct_s_keyword_init(klass)) {`
`743`	`743`	`default:`
`744`	`744`	`if (argc > 1 \|\| !RB_TYPE_P(argv[0], T_HASH)) {`
`745`		`- rb_raise(rb_eArgError, "wrong number of arguments (given %d, expected 0)", argc);`
	`745`	`+ rb_error_arity(argc, 0, 0);`
`746`	`746`	`}`
`747`	`747`	`keyword_init = true;`
`748`	`748`	`break;`
`@@ -1800,7 +1800,7 @@ rb_data_initialize_m(int argc, const VALUE *argv, VALUE self)`
`1800`	`1800`	`return Qnil;`
`1801`	`1801`	`}`
`1802`	`1802`	`if (argc > 1 \|\| !RB_TYPE_P(argv[0], T_HASH)) {`
`1803`		`- rb_raise(rb_eArgError, "wrong number of arguments (given %d, expected 0)", argc);`
	`1803`	`+ rb_error_arity(argc, 0, 0);`
`1804`	`1804`	`}`
`1805`	`1805`
`1806`	`1806`	`if (RHASH_SIZE(argv[0]) < num_members) {`
Original file line number	Diff line number	Diff line change
`@@ -428,16 +428,17 @@ rb_vm_pop_frame(rb_execution_context_t *ec)`
`428`	`428`	`static inline VALUE`
`429`	`429`	`rb_arity_error_new(int argc, int min, int max)`
`430`	`430`	`{`
`431`		`- VALUE err_mess = 0;`
	`431`	`+ VALUE err_mess = rb_sprintf("wrong number of arguments (given %d, expected %d", argc, min);`
`432`	`432`	`if (min == max) {`
`433`		`- err_mess = rb_sprintf("wrong number of arguments (given %d, expected %d)", argc, min);`
	`433`	`+ /* max is not needed */`
`434`	`434`	`}`
`435`	`435`	`else if (max == UNLIMITED_ARGUMENTS) {`
`436`		`- err_mess = rb_sprintf("wrong number of arguments (given %d, expected %d+)", argc, min);`
	`436`	`+ rb_str_cat_cstr(err_mess, "+");`
`437`	`437`	`}`
`438`	`438`	`else {`
`439`		`- err_mess = rb_sprintf("wrong number of arguments (given %d, expected %d..%d)", argc, min, max);`
	`439`	`+ rb_str_catf(err_mess, "..%d", max);`
`440`	`440`	`}`
	`441`	`+ rb_str_cat_cstr(err_mess, ")");`
`441`	`442`	`return rb_exc_new3(rb_eArgError, err_mess);`
`442`	`443`	`}`
`443`	`444`