Skip to content

Commit 811d6ab

Browse files
committed
Use common error messages on incorrect argument count
1 parent 862ad62 commit 811d6ab

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

shared-bindings/_eve/__init__.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -262,13 +262,13 @@ static void _transform1(uint32_t *p, uint32_t *v, size_t n_args, const mp_obj_t
262262
if (eve->model == 0) {
263263
// Backwards-compatible case for legacy code
264264
if (n_args != 3) {
265-
mp_raise_TypeError(MP_ERROR_TEXT("2 arguments expected"));
265+
mp_raise_TypeError_varg(MP_ERROR_TEXT("function takes %d positional arguments but %d were given"), 2, n_args - 1);
266266
}
267267
*p = mp_obj_get_int_truncated(args[1]);
268268
*v = mp_obj_get_int_truncated(args[2]);
269269
} else {
270270
if (n_args != 2) {
271-
mp_raise_TypeError(MP_ERROR_TEXT("1 argument expected"));
271+
mp_raise_TypeError_varg(MP_ERROR_TEXT("function takes %d positional arguments but %d were given"), 1, n_args - 1);
272272
}
273273
a = mp_obj_get_float(args[1]);
274274
if ((eve->model > 810) && (-2.0 <= a) && (a < 2.0)) {
@@ -287,7 +287,7 @@ static mp_obj_t _bitmaptransforma(size_t n_args, const mp_obj_t *args) {
287287
common_hal__eve_BitmapTransformA(EVEHAL(args[0]), p, v);
288288
return mp_const_none;
289289
}
290-
static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitmaptransforma_obj, 1, 2, _bitmaptransforma);
290+
static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitmaptransforma_obj, 2, 3, _bitmaptransforma);
291291

292292
//| def BitmapTransformB(self, v: float) -> None:
293293
//| """Set the :math:`b` component of the bitmap transform matrix
@@ -306,7 +306,7 @@ static mp_obj_t _bitmaptransformb(size_t n_args, const mp_obj_t *args) {
306306
common_hal__eve_BitmapTransformB(EVEHAL(args[0]), p, v);
307307
return mp_const_none;
308308
}
309-
static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitmaptransformb_obj, 1, 2, _bitmaptransformb);
309+
static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitmaptransformb_obj, 2, 3, _bitmaptransformb);
310310

311311
//| def BitmapTransformC(self, v: float) -> None:
312312
//| """Set the :math:`c` component of the bitmap transform matrix
@@ -350,7 +350,7 @@ static mp_obj_t _bitmaptransformd(size_t n_args, const mp_obj_t *args) {
350350
common_hal__eve_BitmapTransformD(EVEHAL(args[0]), p, v);
351351
return mp_const_none;
352352
}
353-
static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitmaptransformd_obj, 1, 2, _bitmaptransformd);
353+
static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitmaptransformd_obj, 2, 3, _bitmaptransformd);
354354

355355
//| def BitmapTransformE(self, v: float) -> None:
356356
//| """Set the :math:`e` component of the bitmap transform matrix
@@ -369,7 +369,7 @@ static mp_obj_t _bitmaptransforme(size_t n_args, const mp_obj_t *args) {
369369
common_hal__eve_BitmapTransformE(EVEHAL(args[0]), p, v);
370370
return mp_const_none;
371371
}
372-
static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitmaptransforme_obj, 1, 2, _bitmaptransforme);
372+
static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitmaptransforme_obj, 2, 3, _bitmaptransforme);
373373

374374
//| def BitmapTransformF(self, v: int) -> None:
375375
//| """Set the :math:`f` component of the bitmap transform matrix

0 commit comments

Comments
 (0)