StackRduino
diff --git a/‎py/objfun.c‎
Lines changed: 5 additions & 5 deletions b/‎py/objfun.c‎
Lines changed: 5 additions & 5 deletions
@@ -229,7 +229,8 @@ STATIC mp_obj_t fun_bc_call(mp_obj_t self_in, uint n_args, uint n_kw, const mp_o
     if (n_args > self->n_args) {
         // given more than enough arguments
         if (!self->takes_var_args) {
-            goto arg_error;
+            nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,
+                "function takes %d positional arguments but %d were given", self->n_args, n_args));
         }
         // put extra arguments in varargs tuple
         *extra_args = mp_obj_new_tuple(n_args - self->n_args, args + self->n_args);
@@ -249,7 +250,9 @@ STATIC mp_obj_t fun_bc_call(mp_obj_t self_in, uint n_args, uint n_kw, const mp_o
                 extra_args -= self->n_args - n_args;
                 n_extra_args += self->n_args - n_args;
             } else {
-                goto arg_error;
+                nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,
+                    "function takes at least %d positional arguments but %d were given",
+                    self->n_args - self->n_def_args, n_args));
             }
         }
     }
@@ -344,9 +347,6 @@ continue2:;
     } else { // MP_VM_RETURN_EXCEPTION
         nlr_raise(result);
     }
-
-arg_error:
-    nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "function takes %d positional arguments but %d were given", self->n_args, n_args));
 }
 
 const mp_obj_type_t mp_type_fun_bc = {
Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,8 @@ STATIC mp_obj_t fun_bc_call(mp_obj_t self_in, uint n_args, uint n_kw, const mp_o`
`229`	`229`	`if (n_args > self->n_args) {`
`230`	`230`	`// given more than enough arguments`
`231`	`231`	`if (!self->takes_var_args) {`
`232`		`- goto arg_error;`
	`232`	`+ nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,`
	`233`	`+ "function takes %d positional arguments but %d were given", self->n_args, n_args));`
`233`	`234`	`}`
`234`	`235`	`// put extra arguments in varargs tuple`
`235`	`236`	`*extra_args = mp_obj_new_tuple(n_args - self->n_args, args + self->n_args);`
`@@ -249,7 +250,9 @@ STATIC mp_obj_t fun_bc_call(mp_obj_t self_in, uint n_args, uint n_kw, const mp_o`
`249`	`250`	`extra_args -= self->n_args - n_args;`
`250`	`251`	`n_extra_args += self->n_args - n_args;`
`251`	`252`	`} else {`
`252`		`- goto arg_error;`
	`253`	`+ nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,`
	`254`	`+ "function takes at least %d positional arguments but %d were given",`
	`255`	`+ self->n_args - self->n_def_args, n_args));`
`253`	`256`	`}`
`254`	`257`	`}`
`255`	`258`	`}`
`@@ -344,9 +347,6 @@ continue2:;`
`344`	`347`	`} else { // MP_VM_RETURN_EXCEPTION`
`345`	`348`	`nlr_raise(result);`
`346`	`349`	`}`
`347`		`-`
`348`		`-arg_error:`
`349`		`- nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "function takes %d positional arguments but %d were given", self->n_args, n_args));`
`350`	`350`	`}`
`351`	`351`
`352`	`352`	`const mp_obj_type_t mp_type_fun_bc = {`