summaryrefslogtreecommitdiff
path: root/py/obj.c
diff options
context:
space:
mode:
Diffstat (limited to 'py/obj.c')
-rw-r--r--py/obj.c120
1 files changed, 60 insertions, 60 deletions
diff --git a/py/obj.c b/py/obj.c
index 6e68180ca..8bdafb7e6 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -359,12 +359,12 @@ mp_float_t mp_obj_get_float(mp_obj_t arg) {
mp_float_t val;
if (!mp_obj_get_float_maybe(arg, &val)) {
- if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
- mp_raise_TypeError("can't convert to float");
- } else {
- mp_raise_msg_varg(&mp_type_TypeError,
- "can't convert %s to float", mp_obj_get_type_str(arg));
- }
+ #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+ mp_raise_TypeError("can't convert to float");
+ #else
+ mp_raise_msg_varg(&mp_type_TypeError,
+ "can't convert %s to float", mp_obj_get_type_str(arg));
+ #endif
}
return val;
@@ -392,12 +392,12 @@ void mp_obj_get_complex(mp_obj_t arg, mp_float_t *real, mp_float_t *imag) {
} else if (mp_obj_is_type(arg, &mp_type_complex)) {
mp_obj_complex_get(arg, real, imag);
} else {
- if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
- mp_raise_TypeError("can't convert to complex");
- } else {
- mp_raise_msg_varg(&mp_type_TypeError,
- "can't convert %s to complex", mp_obj_get_type_str(arg));
- }
+ #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+ mp_raise_TypeError("can't convert to complex");
+ #else
+ mp_raise_msg_varg(&mp_type_TypeError,
+ "can't convert %s to complex", mp_obj_get_type_str(arg));
+ #endif
}
}
#endif
@@ -410,12 +410,12 @@ void mp_obj_get_array(mp_obj_t o, size_t *len, mp_obj_t **items) {
} else if (mp_obj_is_type(o, &mp_type_list)) {
mp_obj_list_get(o, len, items);
} else {
- if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
- mp_raise_TypeError("expected tuple/list");
- } else {
- mp_raise_msg_varg(&mp_type_TypeError,
- "object '%s' isn't a tuple or list", mp_obj_get_type_str(o));
- }
+ #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+ mp_raise_TypeError("expected tuple/list");
+ #else
+ mp_raise_msg_varg(&mp_type_TypeError,
+ "object '%s' isn't a tuple or list", mp_obj_get_type_str(o));
+ #endif
}
}
@@ -424,12 +424,12 @@ void mp_obj_get_array_fixed_n(mp_obj_t o, size_t len, mp_obj_t **items) {
size_t seq_len;
mp_obj_get_array(o, &seq_len, items);
if (seq_len != len) {
- if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
- mp_raise_ValueError("tuple/list has wrong length");
- } else {
- mp_raise_msg_varg(&mp_type_ValueError,
- "requested length %d but object has length %d", (int)len, (int)seq_len);
- }
+ #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+ mp_raise_ValueError("tuple/list has wrong length");
+ #else
+ mp_raise_msg_varg(&mp_type_ValueError,
+ "requested length %d but object has length %d", (int)len, (int)seq_len);
+ #endif
}
}
@@ -439,13 +439,13 @@ size_t mp_get_index(const mp_obj_type_t *type, size_t len, mp_obj_t index, bool
if (mp_obj_is_small_int(index)) {
i = MP_OBJ_SMALL_INT_VALUE(index);
} else if (!mp_obj_get_int_maybe(index, &i)) {
- if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
- mp_raise_TypeError("indices must be integers");
- } else {
- mp_raise_msg_varg(&mp_type_TypeError,
- "%q indices must be integers, not %s",
- type->name, mp_obj_get_type_str(index));
- }
+ #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+ mp_raise_TypeError("indices must be integers");
+ #else
+ mp_raise_msg_varg(&mp_type_TypeError,
+ "%q indices must be integers, not %s",
+ type->name, mp_obj_get_type_str(index));
+ #endif
}
if (i < 0) {
@@ -459,11 +459,11 @@ size_t mp_get_index(const mp_obj_type_t *type, size_t len, mp_obj_t index, bool
}
} else {
if (i < 0 || (mp_uint_t)i >= len) {
- if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
- mp_raise_msg(&mp_type_IndexError, "index out of range");
- } else {
- mp_raise_msg_varg(&mp_type_IndexError, "%q index out of range", type->name);
- }
+ #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+ mp_raise_msg(&mp_type_IndexError, "index out of range");
+ #else
+ mp_raise_msg_varg(&mp_type_IndexError, "%q index out of range", type->name);
+ #endif
}
}
@@ -493,12 +493,12 @@ mp_obj_t mp_obj_id(mp_obj_t o_in) {
mp_obj_t mp_obj_len(mp_obj_t o_in) {
mp_obj_t len = mp_obj_len_maybe(o_in);
if (len == MP_OBJ_NULL) {
- if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
- mp_raise_TypeError("object has no len");
- } else {
- mp_raise_msg_varg(&mp_type_TypeError,
- "object of type '%s' has no len()", mp_obj_get_type_str(o_in));
- }
+ #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+ mp_raise_TypeError("object has no len");
+ #else
+ mp_raise_msg_varg(&mp_type_TypeError,
+ "object of type '%s' has no len()", mp_obj_get_type_str(o_in));
+ #endif
} else {
return len;
}
@@ -534,26 +534,26 @@ mp_obj_t mp_obj_subscr(mp_obj_t base, mp_obj_t index, mp_obj_t value) {
// TODO: call base classes here?
}
if (value == MP_OBJ_NULL) {
- if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
- mp_raise_TypeError("object doesn't support item deletion");
- } else {
- mp_raise_msg_varg(&mp_type_TypeError,
- "'%s' object doesn't support item deletion", mp_obj_get_type_str(base));
- }
+ #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+ mp_raise_TypeError("object doesn't support item deletion");
+ #else
+ mp_raise_msg_varg(&mp_type_TypeError,
+ "'%s' object doesn't support item deletion", mp_obj_get_type_str(base));
+ #endif
} else if (value == MP_OBJ_SENTINEL) {
- if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
- mp_raise_TypeError("object isn't subscriptable");
- } else {
- mp_raise_msg_varg(&mp_type_TypeError,
- "'%s' object isn't subscriptable", mp_obj_get_type_str(base));
- }
+ #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+ mp_raise_TypeError("object isn't subscriptable");
+ #else
+ mp_raise_msg_varg(&mp_type_TypeError,
+ "'%s' object isn't subscriptable", mp_obj_get_type_str(base));
+ #endif
} else {
- if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
- mp_raise_TypeError("object doesn't support item assignment");
- } else {
- mp_raise_msg_varg(&mp_type_TypeError,
- "'%s' object doesn't support item assignment", mp_obj_get_type_str(base));
- }
+ #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+ mp_raise_TypeError("object doesn't support item assignment");
+ #else
+ mp_raise_msg_varg(&mp_type_TypeError,
+ "'%s' object doesn't support item assignment", mp_obj_get_type_str(base));
+ #endif
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-24 20:27:26 +0000