djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch exception throwing to mp_raise helpers. It saves a little code space each time to share the call.

Browse Source
This commit is contained in:
Scott Shawcroft 2017-02-24 15:13:07 +01:00
parent efd429464e
commit 12fa5b3a66
57 changed files with 327 additions and 296 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
atmel-samd/common-hal/nativeio/AnalogIn.c
View File

@ -46,7 +46,7 @@ void common_hal_nativeio_analogin_construct(nativeio_analogin_obj_t* self,
const mcu_pin_obj_t *pin) { const mcu_pin_obj_t *pin) {
if (!pin->has_adc) { if (!pin->has_adc) {
// No ADC function on that pin // No ADC function on that pin
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Pin does not have ADC capabilities")); mp_raise_ValueError("Pin does not have ADC capabilities");
} }
self->pin = pin; self->pin = pin;

7
atmel-samd/common-hal/nativeio/AnalogOut.c
View File

@ -27,6 +27,7 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include "py/mperrno.h"
#include "py/runtime.h" #include "py/runtime.h"
#include "shared-bindings/nativeio/AnalogOut.h" #include "shared-bindings/nativeio/AnalogOut.h"
@ -37,8 +38,7 @@
void common_hal_nativeio_analogout_construct(nativeio_analogout_obj_t* self, void common_hal_nativeio_analogout_construct(nativeio_analogout_obj_t* self,
const mcu_pin_obj_t *pin) { const mcu_pin_obj_t *pin) {
if (pin->pin != PIN_PA02) { if (pin->pin != PIN_PA02) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mp_raise_ValueError("AnalogOut not supported on given pin");
"AnalogOut not supported on given pin."));
return; return;
} }
struct dac_config config_dac; struct dac_config config_dac;
@ -46,8 +46,7 @@ void common_hal_nativeio_analogout_construct(nativeio_analogout_obj_t* self,
config_dac.reference = DAC_REFERENCE_AVCC; config_dac.reference = DAC_REFERENCE_AVCC;
enum status_code status = dac_init(&self->dac_instance, DAC, &config_dac); enum status_code status = dac_init(&self->dac_instance, DAC, &config_dac);
if (status != STATUS_OK) { if (status != STATUS_OK) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mp_raise_OSError(MP_EIO);
"DAC init failed."));
return; return;
} }

3
atmel-samd/common-hal/nativeio/DigitalInOut.c
View File

@ -171,8 +171,7 @@ enum digitalinout_pull_t common_hal_nativeio_digitalinout_get_pull(
PortGroup *const port_base = port_get_group_from_gpio_pin(pin); PortGroup *const port_base = port_get_group_from_gpio_pin(pin);
uint32_t pin_mask = (1UL << (pin % 32)); uint32_t pin_mask = (1UL << (pin % 32));
if (self->output) { if (self->output) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mp_raise_AttributeError("Cannot get pull while in output mode");
"Cannot get pull while in output mode."));
return PULL_NONE; return PULL_NONE;
} else { } else {
if (port_base->PINCFG[pin % 32].bit.PULLEN == 0) { if (port_base->PINCFG[pin % 32].bit.PULLEN == 0) {

7
atmel-samd/common-hal/nativeio/I2C.c
View File

@ -30,6 +30,7 @@
#include "shared-bindings/nativeio/I2C.h" #include "shared-bindings/nativeio/I2C.h"
#include "py/mperrno.h" #include "py/mperrno.h"
#include "py/nlr.h" #include "py/nlr.h"
#include "py/runtime.h"
#include "asf/sam0/drivers/sercom/i2c/i2c_master.h" #include "asf/sam0/drivers/sercom/i2c/i2c_master.h"
#include "samd21_pins.h" #include "samd21_pins.h"
@ -70,7 +71,7 @@ void common_hal_nativeio_i2c_construct(nativeio_i2c_obj_t *self,
} }
} }
if (sercom == NULL) { if (sercom == NULL) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid pins.")); mp_raise_ValueError("Invalid pins");
} }
config_i2c_master.pinmux_pad0 = sda_pinmux; // SDA config_i2c_master.pinmux_pad0 = sda_pinmux; // SDA
@ -86,9 +87,9 @@ void common_hal_nativeio_i2c_construct(nativeio_i2c_obj_t *self,
if (status != STATUS_OK) { if (status != STATUS_OK) {
common_hal_nativeio_i2c_deinit(self); common_hal_nativeio_i2c_deinit(self);
if (status == STATUS_ERR_BAUDRATE_UNAVAILABLE) { if (status == STATUS_ERR_BAUDRATE_UNAVAILABLE) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Unsupported baudrate")); mp_raise_ValueError("Unsupported baudrate");
} else { } else {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "I2C bus init error")); mp_raise_OSError(MP_EIO);
} }
} }

11
atmel-samd/common-hal/nativeio/PWMOut.c
View File

@ -79,13 +79,11 @@ void common_hal_nativeio_pwmout_construct(nativeio_pwmout_obj_t* self,
self->variable_frequency = variable_frequency; self->variable_frequency = variable_frequency;
if (pin->primary_timer.tc == 0 && pin->secondary_timer.tc == 0) { if (pin->primary_timer.tc == 0 && pin->secondary_timer.tc == 0) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, mp_raise_ValueError("Invalid pin");
"Invalid pin"));
} }
if (frequency == 0 || frequency > 6000000) { if (frequency == 0 || frequency > 6000000) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, mp_raise_ValueError("Invalid PWM frequency");
"Invalid PWM frequency"));
} }
uint16_t primary_timer_index = 0xff; uint16_t primary_timer_index = 0xff;
@ -136,7 +134,7 @@ void common_hal_nativeio_pwmout_construct(nativeio_pwmout_obj_t* self,
index = primary_timer_index; index = primary_timer_index;
} }
if (t == NULL) { if (t == NULL) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "All timers in use")); mp_raise_RuntimeError("All timers in use");
return; return;
} }
uint8_t resolution = 0; uint8_t resolution = 0;
@ -265,8 +263,7 @@ uint16_t common_hal_nativeio_pwmout_get_duty_cycle(nativeio_pwmout_obj_t* self)
void common_hal_nativeio_pwmout_set_frequency(nativeio_pwmout_obj_t* self, void common_hal_nativeio_pwmout_set_frequency(nativeio_pwmout_obj_t* self,
uint32_t frequency) { uint32_t frequency) {
if (frequency == 0 || frequency > 6000000) { if (frequency == 0 || frequency > 6000000) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, mp_raise_ValueError("Invalid PWM frequency");
"Invalid PWM frequency"));
} }
const pin_timer_t* t = self->timer; const pin_timer_t* t = self->timer;
uint8_t resolution; uint8_t resolution;

5
atmel-samd/common-hal/nativeio/SPI.c
View File

@ -29,6 +29,7 @@
#include "shared-bindings/nativeio/SPI.h" #include "shared-bindings/nativeio/SPI.h"
#include "py/nlr.h" #include "py/nlr.h"
#include "py/runtime.h"
#include "samd21_pins.h" #include "samd21_pins.h"
// We use ENABLE registers below we don't want to treat as a macro. // We use ENABLE registers below we don't want to treat as a macro.
@ -92,7 +93,7 @@ void common_hal_nativeio_spi_construct(nativeio_spi_obj_t *self,
} }
} }
if (sercom == NULL) { if (sercom == NULL) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid pins")); mp_raise_ValueError("Invalid pins");
} }
// Depends on where MOSI and CLK are. // Depends on where MOSI and CLK are.
@ -111,7 +112,7 @@ void common_hal_nativeio_spi_construct(nativeio_spi_obj_t *self,
} }
} }
if (dopo == 8) { if (dopo == 8) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "SPI MOSI and clock pins incompatible")); mp_raise_ValueError("MOSI and clock pins incompatible");
} }
config_spi_master.mux_setting = (dopo << SERCOM_SPI_CTRLA_DOPO_Pos) | config_spi_master.mux_setting = (dopo << SERCOM_SPI_CTRLA_DOPO_Pos) |

16
atmel-samd/common-hal/nativeio/TouchIn.c
View File

@ -27,6 +27,7 @@
#include <string.h> #include <string.h>
#include "py/nlr.h" #include "py/nlr.h"
#include "py/mperrno.h"
#include "py/runtime.h" #include "py/runtime.h"
#include "py/binary.h" #include "py/binary.h"
#include "py/mphal.h" #include "py/mphal.h"
@ -186,8 +187,7 @@ nativeio_touchin_obj_t *active_touchin_obj[DEF_SELFCAP_NUM_CHANNELS];
void common_hal_nativeio_touchin_construct(nativeio_touchin_obj_t* self, void common_hal_nativeio_touchin_construct(nativeio_touchin_obj_t* self,
const mcu_pin_obj_t *pin) { const mcu_pin_obj_t *pin) {
if (!pin->has_touch) { if (!pin->has_touch) {
// No ADC function on that pin mp_raise_ValueError("Invalid pin");
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "pin %q does not have touch capabilities", pin->name));
} }
if (selfcap_config.num_channels > 0) { if (selfcap_config.num_channels > 0) {
@ -230,18 +230,18 @@ void common_hal_nativeio_touchin_construct(nativeio_touchin_obj_t* self,
PRIV_SELFCAP_RS_TABLE_INIT, PRIV_NM_TABLE_INIT, PRIV_SELFCAP_RS_TABLE_INIT, PRIV_NM_TABLE_INIT,
PRIV_FREQ_AUTO_TUNE_CHK, PRIV_MOIS_TOLERANCE_CHK); PRIV_FREQ_AUTO_TUNE_CHK, PRIV_MOIS_TOLERANCE_CHK);
if (status != TOUCH_SUCCESS) { if (status != TOUCH_SUCCESS) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "Touch init failed (%d)", status)); mp_raise_OSError(MP_EIO);
} }
for (int i = 0; i < selfcap_config.num_channels; i++) { for (int i = 0; i < selfcap_config.num_channels; i++) {
status = touch_selfcap_sensor_config(SENSOR_TYPE_KEY, i, i, status = touch_selfcap_sensor_config(SENSOR_TYPE_KEY, i, i,
NO_AKS_GROUP, 10u, HYST_25, RES_8_BIT, &active_touchin_obj[i]->sensor_id); NO_AKS_GROUP, 10u, HYST_25, RES_8_BIT, &active_touchin_obj[i]->sensor_id);
if (status != TOUCH_SUCCESS) { if (status != TOUCH_SUCCESS) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "Touch pad config failed (%d)", status)); mp_raise_OSError(MP_EIO);
} }
} }
status = touch_selfcap_sensors_calibrate(AUTO_TUNE_RSEL); status = touch_selfcap_sensors_calibrate(AUTO_TUNE_RSEL);
if (status != TOUCH_SUCCESS) { if (status != TOUCH_SUCCESS) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "Touch pad calibration failed (%d)", status)); mp_raise_OSError(MP_EIO);
} }
// Run a measurement to get calibrated. // Run a measurement to get calibrated.
@ -275,7 +275,7 @@ void touch_selfcap_measure_complete_callback(void)
bool common_hal_nativeio_touchin_get_value(nativeio_touchin_obj_t *self) { bool common_hal_nativeio_touchin_get_value(nativeio_touchin_obj_t *self) {
if (p_selfcap_measure_data->acq_status & TOUCH_CC_CALIB_ERROR) { if (p_selfcap_measure_data->acq_status & TOUCH_CC_CALIB_ERROR) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Touch calibration error")); mp_raise_RuntimeError("Touch calibration error");
} }
touch_acq_status = TOUCH_BURST_AGAIN; touch_acq_status = TOUCH_BURST_AGAIN;
uint64_t start_ticks = ticks_ms; uint64_t start_ticks = ticks_ms;
@ -287,7 +287,7 @@ bool common_hal_nativeio_touchin_get_value(nativeio_touchin_obj_t *self) {
touch_selfcap_measure_complete_callback); touch_selfcap_measure_complete_callback);
if (touch_ret != TOUCH_SUCCESS) { if (touch_ret != TOUCH_SUCCESS) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Touch measure failed")); mp_raise_OSError(MP_EIO);
} }
while(!touch_read_ready && ticks_ms - start_ticks < 1000) { while(!touch_read_ready && ticks_ms - start_ticks < 1000) {
@ -299,7 +299,7 @@ bool common_hal_nativeio_touchin_get_value(nativeio_touchin_obj_t *self) {
} }
if (touch_acq_status & TOUCH_BURST_AGAIN) { if (touch_acq_status & TOUCH_BURST_AGAIN) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Touch read failed")); mp_raise_OSError(MP_EIO);
} }
return (p_selfcap_measure_data->p_sensor_states[self->sensor_id / 8] & (1 << (self->sensor_id % 8))) != 0; return (p_selfcap_measure_data->p_sensor_states[self->sensor_id / 8] & (1 << (self->sensor_id % 8))) != 0;

3
atmel-samd/common-hal/nativeio/TouchInStub.c
View File

@ -34,8 +34,7 @@
void common_hal_nativeio_touchin_construct(nativeio_touchin_obj_t* self, void common_hal_nativeio_touchin_construct(nativeio_touchin_obj_t* self,
const mcu_pin_obj_t *pin) { const mcu_pin_obj_t *pin) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mp_raise_NotImplementError("No capacitive touch support");
"No room in flash for capacitive touch hardware support."));
} }
void common_hal_nativeio_touchin_deinit(nativeio_touchin_obj_t* self) { void common_hal_nativeio_touchin_deinit(nativeio_touchin_obj_t* self) {

8
atmel-samd/common-hal/nativeio/UART.c
View File

@ -31,6 +31,7 @@
#include "py/gc.h" #include "py/gc.h"
#include "py/mperrno.h" #include "py/mperrno.h"
#include "py/nlr.h" #include "py/nlr.h"
#include "py/runtime.h"
#include "py/stream.h" #include "py/stream.h"
#include "samd21_pins.h" #include "samd21_pins.h"
#include "tick.h" #include "tick.h"
@ -162,7 +163,7 @@ void common_hal_nativeio_uart_construct(nativeio_uart_obj_t *self,
} }
} }
if (sercom == NULL) { if (sercom == NULL) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid pins")); mp_raise_ValueError("Invalid pins");
} }
if (tx == NULL) { if (tx == NULL) {
tx_pad = 0; tx_pad = 0;
@ -216,12 +217,11 @@ void common_hal_nativeio_uart_construct(nativeio_uart_obj_t *self,
self->buffer_length *= (bits + 7) / 8; self->buffer_length *= (bits + 7) / 8;
self->buffer = (uint8_t *) gc_alloc(self->buffer_length * sizeof(uint8_t), false); self->buffer = (uint8_t *) gc_alloc(self->buffer_length * sizeof(uint8_t), false);
if (self->buffer == NULL) { if (self->buffer == NULL) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mp_raise_msg(&mp_type_MemoryError, "Failed to allocate RX buffer");
"Unable to allocate RX buffer."));
} }
if (usart_init(&self->uart_instance, sercom, &config_usart) != STATUS_OK) { if (usart_init(&self->uart_instance, sercom, &config_usart) != STATUS_OK) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Unable to init UART")); mp_raise_OSError(MP_EIO);
} }
// We use our own interrupt handler because we want a circular buffer // We use our own interrupt handler because we want a circular buffer

3
atmel-samd/moduos.c
View File

@ -30,6 +30,7 @@
#include "py/mpstate.h" #include "py/mpstate.h"
#include "py/objtuple.h" #include "py/objtuple.h"
#include "py/objstr.h" #include "py/objstr.h"
#include "py/runtime.h"
#include "genhdr/mpversion.h" #include "genhdr/mpversion.h"
#include "lib/fatfs/ff.h" #include "lib/fatfs/ff.h"
#include "lib/fatfs/diskio.h" #include "lib/fatfs/diskio.h"
@ -103,7 +104,7 @@ STATIC mp_obj_t os_getcwd(void) {
FRESULT res = f_getcwd(buf, sizeof buf); FRESULT res = f_getcwd(buf, sizeof buf);
if (res != FR_OK) { if (res != FR_OK) {
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(fresult_to_errno_table[res]))); mp_raise_OSError(fresult_to_errno_table[res]);
} }
return mp_obj_new_str(buf, strlen(buf), false); return mp_obj_new_str(buf, strlen(buf), false);

2
cc3200/mods/moduos.c
View File

@ -498,7 +498,7 @@ STATIC mp_obj_t os_unmount(mp_obj_t path_o) {
if ((mount_obj = osmount_find_by_path(path))) { if ((mount_obj = osmount_find_by_path(path))) {
unmount (mount_obj); unmount (mount_obj);
} else { } else {
mp_raise_msg(&mp_type_ValueError, mpexception_value_invalid_arguments); mp_raise_ValueError(mpexception_value_invalid_arguments);
} }
return mp_const_none; return mp_const_none;

2
extmod/modlwip.c
View File

@ -1025,7 +1025,7 @@ STATIC mp_obj_t lwip_socket_sendall(mp_obj_t self_in, mp_obj_t buf_in) {
break; break;
} }
case MOD_NETWORK_SOCK_DGRAM: case MOD_NETWORK_SOCK_DGRAM:
mp_not_implemented(""); mp_raise_NotImplementError("");
break; break;
} }

2
extmod/modure.c
View File

@ -153,7 +153,7 @@ STATIC mp_obj_t re_split(size_t n_args, const mp_obj_t *args) {
mp_obj_t s = mp_obj_new_str(subj.begin, caps[0] - subj.begin, false); mp_obj_t s = mp_obj_new_str(subj.begin, caps[0] - subj.begin, false);
mp_obj_list_append(retval, s); mp_obj_list_append(retval, s);
if (self->re.sub > 0) { if (self->re.sub > 0) {
mp_not_implemented("Splitting with sub-captures"); mp_raise_NotImplementError("Splitting with sub-captures");
} }
subj.begin = caps[1]; subj.begin = caps[1];
if (maxsplit > 0 && --maxsplit == 0) { if (maxsplit > 0 && --maxsplit == 0) {

2
extmod/modussl_axtls.c
View File

@ -126,7 +126,7 @@ STATIC mp_obj_t socket_setblocking(mp_obj_t self_in, mp_obj_t flag_in) {
// Currently supports only blocking mode // Currently supports only blocking mode
(void)self_in; (void)self_in;
if (!mp_obj_is_true(flag_in)) { if (!mp_obj_is_true(flag_in)) {
mp_not_implemented(""); mp_raise_NotImplementError("");
} }
return mp_const_none; return mp_const_none;
} }

2
extmod/modussl_mbedtls.c
View File

@ -219,7 +219,7 @@ STATIC mp_obj_t socket_setblocking(mp_obj_t self_in, mp_obj_t flag_in) {
// Currently supports only blocking mode // Currently supports only blocking mode
(void)self_in; (void)self_in;
if (!mp_obj_is_true(flag_in)) { if (!mp_obj_is_true(flag_in)) {
mp_not_implemented(""); mp_raise_NotImplementError("");
} }
return mp_const_none; return mp_const_none;
} }

2
extmod/modutimeq.c
View File

@ -121,7 +121,7 @@ STATIC mp_obj_t mod_utimeq_heappush(size_t n_args, const mp_obj_t *args) {
mp_obj_t heap_in = args[0]; mp_obj_t heap_in = args[0];
mp_obj_utimeq_t *heap = get_heap(heap_in); mp_obj_utimeq_t *heap = get_heap(heap_in);
if (heap->len == heap->alloc) { if (heap->len == heap->alloc) {
mp_raise_msg(&mp_type_IndexError, "queue overflow"); mp_raise_IndexError("queue overflow");
} }
mp_uint_t l = heap->len; mp_uint_t l = heap->len;
heap->items[l].time = MP_OBJ_SMALL_INT_VALUE(args[1]); heap->items[l].time = MP_OBJ_SMALL_INT_VALUE(args[1]);

26
py/argcheck.c
View File

@ -37,7 +37,7 @@ void mp_arg_check_num(size_t n_args, size_t n_kw, size_t n_args_min, size_t n_ar
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_arg_error_terse_mismatch(); mp_arg_error_terse_mismatch();
} else { } else {
mp_raise_msg(&mp_type_TypeError, "function does not take keyword arguments"); mp_raise_TypeError("function does not take keyword arguments");
} }
} }
@ -46,9 +46,9 @@ void mp_arg_check_num(size_t n_args, size_t n_kw, size_t n_args_min, size_t n_ar
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_arg_error_terse_mismatch(); mp_arg_error_terse_mismatch();
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg(
"function takes %d positional arguments but %d were given", "function takes %d positional arguments but %d were given",
n_args_min, n_args)); n_args_min, n_args);
} }
} }
} else { } else {
@ -56,17 +56,17 @@ void mp_arg_check_num(size_t n_args, size_t n_kw, size_t n_args_min, size_t n_ar
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_arg_error_terse_mismatch(); mp_arg_error_terse_mismatch();
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg(
"function missing %d required positional arguments", "function missing %d required positional arguments",
n_args_min - n_args)); n_args_min - n_args);
} }
} else if (n_args > n_args_max) { } else if (n_args > n_args_max) {
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_arg_error_terse_mismatch(); mp_arg_error_terse_mismatch();
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg(
"function expected at most %d arguments, got %d", "function expected at most %d arguments, got %d",
n_args_max, n_args)); n_args_max, n_args);
} }
} }
} }
@ -89,8 +89,8 @@ void mp_arg_parse_all(size_t n_pos, const mp_obj_t *pos, mp_map_t *kws, size_t n
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_arg_error_terse_mismatch(); mp_arg_error_terse_mismatch();
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg(
"'%q' argument required", allowed[i].qst)); "'%q' argument required", allowed[i].qst);
} }
} }
out_vals[i] = allowed[i].defval; out_vals[i] = allowed[i].defval;
@ -115,7 +115,7 @@ void mp_arg_parse_all(size_t n_pos, const mp_obj_t *pos, mp_map_t *kws, size_t n
mp_arg_error_terse_mismatch(); mp_arg_error_terse_mismatch();
} else { } else {
// TODO better error message // TODO better error message
mp_raise_msg(&mp_type_TypeError, "extra positional arguments given"); mp_raise_TypeError("extra positional arguments given");
} }
} }
if (kws_found < kws->used) { if (kws_found < kws->used) {
@ -123,7 +123,7 @@ void mp_arg_parse_all(size_t n_pos, const mp_obj_t *pos, mp_map_t *kws, size_t n
mp_arg_error_terse_mismatch(); mp_arg_error_terse_mismatch();
} else { } else {
// TODO better error message // TODO better error message
mp_raise_msg(&mp_type_TypeError, "extra keyword arguments given"); mp_raise_TypeError("extra keyword arguments given");
} }
} }
} }
@ -136,12 +136,12 @@ void mp_arg_parse_all_kw_array(size_t n_pos, size_t n_kw, const mp_obj_t *args,
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE || defined(_MSC_VER) #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE || defined(_MSC_VER)
NORETURN void mp_arg_error_terse_mismatch(void) { NORETURN void mp_arg_error_terse_mismatch(void) {
mp_raise_msg(&mp_type_TypeError, "argument num/types mismatch"); mp_raise_TypeError("argument num/types mismatch");
} }
#endif #endif
#if MICROPY_CPYTHON_COMPAT #if MICROPY_CPYTHON_COMPAT
NORETURN void mp_arg_error_unimpl_kw(void) { NORETURN void mp_arg_error_unimpl_kw(void) {
mp_not_implemented("keyword argument(s) not yet implemented - use normal args instead"); mp_raise_NotImplementError("keyword argument(s) not yet implemented - use normal args instead");
} }
#endif #endif

25
py/bc.c
View File

@ -63,12 +63,12 @@ STATIC NORETURN void fun_pos_args_mismatch(mp_obj_fun_bc_t *f, size_t expected,
mp_arg_error_terse_mismatch(); mp_arg_error_terse_mismatch();
#elif MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NORMAL #elif MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NORMAL
(void)f; (void)f;
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg(
"function takes %d positional arguments but %d were given", expected, given)); "function takes %d positional arguments but %d were given", expected, given);
#elif MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED #elif MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg(
"%q() takes %d positional arguments but %d were given", "%q() takes %d positional arguments but %d were given",
mp_obj_fun_get_name(MP_OBJ_FROM_PTR(f)), expected, given)); mp_obj_fun_get_name(MP_OBJ_FROM_PTR(f)), expected, given);
#endif #endif
} }
@ -176,8 +176,8 @@ void mp_setup_code_state(mp_code_state_t *code_state, mp_obj_fun_bc_t *self, siz
for (size_t j = 0; j < n_pos_args + n_kwonly_args; j++) { for (size_t j = 0; j < n_pos_args + n_kwonly_args; j++) {
if (wanted_arg_name == arg_names[j]) { if (wanted_arg_name == arg_names[j]) {
if (code_state->state[n_state - 1 - j] != MP_OBJ_NULL) { if (code_state->state[n_state - 1 - j] != MP_OBJ_NULL) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg(
"function got multiple values for argument '%q'", MP_OBJ_QSTR_VALUE(wanted_arg_name))); "function got multiple values for argument '%q'", MP_OBJ_QSTR_VALUE(wanted_arg_name));
} }
code_state->state[n_state - 1 - j] = kwargs[2 * i + 1]; code_state->state[n_state - 1 - j] = kwargs[2 * i + 1];
goto continue2; goto continue2;
@ -185,7 +185,7 @@ void mp_setup_code_state(mp_code_state_t *code_state, mp_obj_fun_bc_t *self, siz
} }
// Didn't find name match with positional args // Didn't find name match with positional args
if ((scope_flags & MP_SCOPE_FLAG_VARKEYWORDS) == 0) { if ((scope_flags & MP_SCOPE_FLAG_VARKEYWORDS) == 0) {
mp_raise_msg(&mp_type_TypeError, "function does not take keyword arguments"); mp_raise_TypeError("function does not take keyword arguments");
} }
mp_obj_dict_store(dict, kwargs[2 * i], kwargs[2 * i + 1]); mp_obj_dict_store(dict, kwargs[2 * i], kwargs[2 * i + 1]);
continue2:; continue2:;
@ -209,8 +209,8 @@ continue2:;
// Check that all mandatory positional args are specified // Check that all mandatory positional args are specified
while (d < &code_state->state[n_state]) { while (d < &code_state->state[n_state]) {
if (*d++ == MP_OBJ_NULL) { if (*d++ == MP_OBJ_NULL) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg(
"function missing required positional argument #%d", &code_state->state[n_state] - d)); "function missing required positional argument #%d", &code_state->state[n_state] - d);
} }
} }
@ -225,8 +225,9 @@ continue2:;
if (elem != NULL) { if (elem != NULL) {
code_state->state[n_state - 1 - n_pos_args - i] = elem->value; code_state->state[n_state - 1 - n_pos_args - i] = elem->value;
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg(
"function missing required keyword argument '%q'", MP_OBJ_QSTR_VALUE(arg_names[n_pos_args + i]))); "function missing required keyword argument '%q'",
MP_OBJ_QSTR_VALUE(arg_names[n_pos_args + i]));
} }
} }
} }
@ -234,7 +235,7 @@ continue2:;
} else { } else {
// no keyword arguments given // no keyword arguments given
if (n_kwonly_args != 0) { if (n_kwonly_args != 0) {
mp_raise_msg(&mp_type_TypeError, "function missing keyword-only argument"); mp_raise_TypeError("function missing keyword-only argument");
} }
if ((scope_flags & MP_SCOPE_FLAG_VARKEYWORDS) != 0) { if ((scope_flags & MP_SCOPE_FLAG_VARKEYWORDS) != 0) {
*var_pos_kw_args = mp_obj_new_dict(0); *var_pos_kw_args = mp_obj_new_dict(0);

4
py/builtinevex.c
View File

@ -95,7 +95,7 @@ STATIC mp_obj_t mp_builtin_compile(size_t n_args, const mp_obj_t *args) {
case MP_QSTR_exec: parse_input_kind = MP_PARSE_FILE_INPUT; break; case MP_QSTR_exec: parse_input_kind = MP_PARSE_FILE_INPUT; break;
case MP_QSTR_eval: parse_input_kind = MP_PARSE_EVAL_INPUT; break; case MP_QSTR_eval: parse_input_kind = MP_PARSE_EVAL_INPUT; break;
default: default:
mp_raise_msg(&mp_type_ValueError, "bad compile mode"); mp_raise_ValueError("bad compile mode");
} }
mp_obj_code_t *code = m_new_obj(mp_obj_code_t); mp_obj_code_t *code = m_new_obj(mp_obj_code_t);
@ -137,7 +137,7 @@ STATIC mp_obj_t eval_exec_helper(size_t n_args, const mp_obj_t *args, mp_parse_i
if (MICROPY_PY_BUILTINS_EXECFILE && parse_input_kind == MP_PARSE_SINGLE_INPUT) { if (MICROPY_PY_BUILTINS_EXECFILE && parse_input_kind == MP_PARSE_SINGLE_INPUT) {
lex = mp_lexer_new_from_file(str); lex = mp_lexer_new_from_file(str);
if (lex == NULL) { if (lex == NULL) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "could not open file '%s'", str)); mp_raise_msg_varg(&mp_type_OSError, "could not open file '%s'", str);
} }
parse_input_kind = MP_PARSE_FILE_INPUT; parse_input_kind = MP_PARSE_FILE_INPUT;
} else { } else {

18
py/builtinimport.c
View File

@ -144,10 +144,9 @@ STATIC void do_load_from_lexer(mp_obj_t module_obj, mp_lexer_t *lex, const char
if (lex == NULL) { if (lex == NULL) {
// we verified the file exists using stat, but lexer could still fail // we verified the file exists using stat, but lexer could still fail
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_msg(&mp_type_ImportError, "module not found"); mp_raise_ImportError("module not found");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ImportError, mp_raise_msg_varg(&mp_type_ImportError, "no module named '%s'", fname);
"no module named '%s'", fname));
} }
} }
@ -249,8 +248,7 @@ STATIC void do_load(mp_obj_t module_obj, vstr_t *file) {
#endif #endif
// If we get here then the file was not frozen and we can't compile scripts. // If we get here then the file was not frozen and we can't compile scripts.
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ImportError, mp_raise_ImportError("script compilation not supported");
"script compilation not supported"));
} }
STATIC void chop_component(const char *start, const char **end) { STATIC void chop_component(const char *start, const char **end) {
@ -346,7 +344,7 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
DEBUG_printf("Warning: no dots in current module name and level>0\n"); DEBUG_printf("Warning: no dots in current module name and level>0\n");
p = this_name + this_name_l; p = this_name + this_name_l;
} else if (level != -1) { } else if (level != -1) {
mp_raise_msg(&mp_type_ImportError, "invalid relative import"); mp_raise_ImportError("invalid relative import");
} }
uint new_mod_l = (mod_len == 0 ? (size_t)(p - this_name) : (size_t)(p - this_name) + 1 + mod_len); uint new_mod_l = (mod_len == 0 ? (size_t)(p - this_name) : (size_t)(p - this_name) + 1 + mod_len);
@ -361,7 +359,7 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
DEBUG_printf("Resolved base name for relative import: '%s'\n", qstr_str(new_mod_q)); DEBUG_printf("Resolved base name for relative import: '%s'\n", qstr_str(new_mod_q));
if (new_mod_q == MP_QSTR_) { if (new_mod_q == MP_QSTR_) {
// CPython raises SystemError // CPython raises SystemError
mp_raise_msg(&mp_type_ImportError, "cannot perform relative import"); mp_raise_ImportError("cannot perform relative import");
} }
module_name = MP_OBJ_NEW_QSTR(new_mod_q); module_name = MP_OBJ_NEW_QSTR(new_mod_q);
mod_str = new_mod; mod_str = new_mod;
@ -431,10 +429,10 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
#endif #endif
// couldn't find the file, so fail // couldn't find the file, so fail
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_msg(&mp_type_ImportError, "module not found"); mp_raise_ImportError("module not found");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ImportError, mp_raise_msg_varg(&mp_type_ImportError,
"no module named '%q'", mod_name)); "no module named '%q'", mod_name);
} }
} }
} else { } else {

2
py/lexer.c
View File

@ -463,7 +463,7 @@ STATIC void mp_lexer_next_token_into(mp_lexer_t *lex, bool first_token) {
// 3MB of text; even gzip-compressed and with minimal structure, it'll take // 3MB of text; even gzip-compressed and with minimal structure, it'll take
// roughly half a meg of storage. This form of Unicode escape may be added // roughly half a meg of storage. This form of Unicode escape may be added
// later on, but it's definitely not a priority right now. -- CJA 20140607 // later on, but it's definitely not a priority right now. -- CJA 20140607
mp_not_implemented("unicode name escapes"); mp_raise_NotImplementError("unicode name escapes");
break; break;
default: default:
if (c >= '0' && c <= '7') { if (c >= '0' && c <= '7') {

17
py/modbuiltins.c
View File

@ -178,7 +178,7 @@ STATIC mp_obj_t mp_builtin_chr(mp_obj_t o_in) {
str[3] = (c & 0x3F) | 0x80; str[3] = (c & 0x3F) | 0x80;
len = 4; len = 4;
} else { } else {
mp_raise_msg(&mp_type_ValueError, "chr() arg not in range(0x110000)"); mp_raise_ValueError("chr() arg not in range(0x110000)");
} }
return mp_obj_new_str(str, len, true); return mp_obj_new_str(str, len, true);
#else #else
@ -187,7 +187,7 @@ STATIC mp_obj_t mp_builtin_chr(mp_obj_t o_in) {
char str[1] = {ord}; char str[1] = {ord};
return mp_obj_new_str(str, 1, true); return mp_obj_new_str(str, 1, true);
} else { } else {
mp_raise_msg(&mp_type_ValueError, "chr() arg not in range(256)"); mp_raise_ValueError("chr() arg not in range(256)");
} }
#endif #endif
} }
@ -286,7 +286,7 @@ STATIC mp_obj_t mp_builtin_min_max(size_t n_args, const mp_obj_t *args, mp_map_t
if (default_elem != NULL) { if (default_elem != NULL) {
best_obj = default_elem->value; best_obj = default_elem->value;
} else { } else {
mp_raise_msg(&mp_type_ValueError, "arg is an empty sequence"); mp_raise_ValueError("arg is an empty sequence");
} }
} }
return best_obj; return best_obj;
@ -320,7 +320,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_min_obj, 1, mp_builtin_min);
STATIC mp_obj_t mp_builtin_next(mp_obj_t o) { STATIC mp_obj_t mp_builtin_next(mp_obj_t o) {
mp_obj_t ret = mp_iternext_allow_raise(o); mp_obj_t ret = mp_iternext_allow_raise(o);
if (ret == MP_OBJ_STOP_ITERATION) { if (ret == MP_OBJ_STOP_ITERATION) {
nlr_raise(mp_obj_new_exception(&mp_type_StopIteration)); mp_raise_msg(&mp_type_StopIteration, "");
} else { } else {
return ret; return ret;
} }
@ -366,11 +366,10 @@ STATIC mp_obj_t mp_builtin_ord(mp_obj_t o_in) {
#endif #endif
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError("ord expects a character");
"ord expects a character"));
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg(
"ord() expected a character, but string of length %d found", (int)len)); "ord() expected a character, but string of length %d found", (int)len);
} }
} }
MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_ord_obj, mp_builtin_ord); MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_ord_obj, mp_builtin_ord);
@ -499,7 +498,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_sum_obj, 1, 2, mp_builtin_sum);
STATIC mp_obj_t mp_builtin_sorted(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) { STATIC mp_obj_t mp_builtin_sorted(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
if (n_args > 1) { if (n_args > 1) {
mp_raise_msg(&mp_type_TypeError, "must use keyword argument for key function"); mp_raise_TypeError("must use keyword argument for key function");
} }
mp_obj_t self = mp_type_list.make_new(&mp_type_list, 1, 0, args); mp_obj_t self = mp_type_list.make_new(&mp_type_list, 1, 0, args);
mp_obj_list_sort(1, &self, kwargs); mp_obj_list_sort(1, &self, kwargs);

3
py/modmath.c
View File

@ -26,6 +26,7 @@
#include "py/builtin.h" #include "py/builtin.h"
#include "py/nlr.h" #include "py/nlr.h"
#include "py/runtime.h"
#if MICROPY_PY_BUILTINS_FLOAT && MICROPY_PY_MATH #if MICROPY_PY_BUILTINS_FLOAT && MICROPY_PY_MATH
@ -41,7 +42,7 @@
/// working with floating-point numbers. /// working with floating-point numbers.
STATIC NORETURN void math_error(void) { STATIC NORETURN void math_error(void) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "math domain error")); mp_raise_ValueError("math domain error");
} }
#define MATH_FUN_1(py_name, c_name) \ #define MATH_FUN_1(py_name, c_name) \

2
py/modthread.c
View File

@ -239,7 +239,7 @@ STATIC mp_obj_t mod_thread_start_new_thread(size_t n_args, const mp_obj_t *args)
} else { } else {
// positional and keyword arguments // positional and keyword arguments
if (mp_obj_get_type(args[2]) != &mp_type_dict) { if (mp_obj_get_type(args[2]) != &mp_type_dict) {
mp_raise_msg(&mp_type_TypeError, "expecting a dict for keyword args"); mp_raise_TypeError("expecting a dict for keyword args");
} }
mp_map_t *map = &((mp_obj_dict_t*)MP_OBJ_TO_PTR(args[2]))->map; mp_map_t *map = &((mp_obj_dict_t*)MP_OBJ_TO_PTR(args[2]))->map;
th_args = m_new_obj_var(thread_entry_args_t, mp_obj_t, pos_args_len + 2 * map->used); th_args = m_new_obj_var(thread_entry_args_t, mp_obj_t, pos_args_len + 2 * map->used);

69
py/obj.c
View File

@ -229,10 +229,10 @@ mp_int_t mp_obj_get_int(mp_const_obj_t arg) {
return mp_obj_int_get_checked(arg); return mp_obj_int_get_checked(arg);
} else { } else {
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_msg(&mp_type_TypeError, "can't convert to int"); mp_raise_TypeError("can't convert to int");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg(
"can't convert %s to int", mp_obj_get_type_str(arg))); "can't convert %s to int", mp_obj_get_type_str(arg));
} }
} }
} }
@ -279,10 +279,10 @@ mp_float_t mp_obj_get_float(mp_obj_t arg) {
return mp_obj_float_get(arg); return mp_obj_float_get(arg);
} else { } else {
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_msg(&mp_type_TypeError, "can't convert to float"); mp_raise_TypeError("can't convert to float");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg(
"can't convert %s to float", mp_obj_get_type_str(arg))); "can't convert %s to float", mp_obj_get_type_str(arg));
} }
} }
} }
@ -310,10 +310,10 @@ void mp_obj_get_complex(mp_obj_t arg, mp_float_t *real, mp_float_t *imag) {
mp_obj_complex_get(arg, real, imag); mp_obj_complex_get(arg, real, imag);
} else { } else {
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_msg(&mp_type_TypeError, "can't convert to complex"); mp_raise_TypeError("can't convert to complex");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg(
"can't convert %s to complex", mp_obj_get_type_str(arg))); "can't convert %s to complex", mp_obj_get_type_str(arg));
} }
} }
} }
@ -328,10 +328,10 @@ void mp_obj_get_array(mp_obj_t o, mp_uint_t *len, mp_obj_t **items) {
mp_obj_list_get(o, len, items); mp_obj_list_get(o, len, items);
} else { } else {
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_msg(&mp_type_TypeError, "expected tuple/list"); mp_raise_TypeError("expected tuple/list");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg(
"object '%s' is not a tuple or list", mp_obj_get_type_str(o))); "object '%s' is not a tuple or list", mp_obj_get_type_str(o));
} }
} }
} }
@ -342,10 +342,10 @@ void mp_obj_get_array_fixed_n(mp_obj_t o, mp_uint_t len, mp_obj_t **items) {
mp_obj_get_array(o, &seq_len, items); mp_obj_get_array(o, &seq_len, items);
if (seq_len != len) { if (seq_len != len) {
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_msg(&mp_type_ValueError, "tuple/list has wrong length"); mp_raise_ValueError("tuple/list has wrong length");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, mp_raise_ValueError_varg("requested length %d but object has length %d",
"requested length %d but object has length %d", (int)len, (int)seq_len)); (int)len, (int)seq_len);
} }
} }
} }
@ -357,11 +357,11 @@ mp_uint_t mp_get_index(const mp_obj_type_t *type, mp_uint_t len, mp_obj_t index,
i = MP_OBJ_SMALL_INT_VALUE(index); i = MP_OBJ_SMALL_INT_VALUE(index);
} else if (!mp_obj_get_int_maybe(index, &i)) { } else if (!mp_obj_get_int_maybe(index, &i)) {
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_msg(&mp_type_TypeError, "indices must be integers"); mp_raise_TypeError("indices must be integers");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg(
"%q indices must be integers, not %s", "%q indices must be integers, not %s",
type->name, mp_obj_get_type_str(index))); type->name, mp_obj_get_type_str(index));
} }
} }
@ -377,10 +377,10 @@ mp_uint_t mp_get_index(const mp_obj_type_t *type, mp_uint_t len, mp_obj_t index,
} else { } else {
if (i < 0 || (mp_uint_t)i >= len) { if (i < 0 || (mp_uint_t)i >= len) {
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_msg(&mp_type_IndexError, "index out of range"); mp_raise_IndexError("index out of range");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_IndexError, mp_raise_msg_varg(&mp_type_IndexError,
"%q index out of range", type->name)); "%q index out of range", type->name);
} }
} }
} }
@ -410,10 +410,10 @@ mp_obj_t mp_obj_len(mp_obj_t o_in) {
mp_obj_t len = mp_obj_len_maybe(o_in); mp_obj_t len = mp_obj_len_maybe(o_in);
if (len == MP_OBJ_NULL) { if (len == MP_OBJ_NULL) {
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_msg(&mp_type_TypeError, "object has no len"); mp_raise_TypeError("object has no len");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg(
"object of type '%s' has no len()", mp_obj_get_type_str(o_in))); "object of type '%s' has no len()", mp_obj_get_type_str(o_in));
} }
} else { } else {
return len; return len;
@ -451,25 +451,24 @@ mp_obj_t mp_obj_subscr(mp_obj_t base, mp_obj_t index, mp_obj_t value) {
} }
if (value == MP_OBJ_NULL) { if (value == MP_OBJ_NULL) {
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_msg(&mp_type_TypeError, "object does not support item deletion"); mp_raise_TypeError("object does not support item deletion");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg(
"'%s' object does not support item deletion", mp_obj_get_type_str(base))); "'%s' object does not support item deletion", mp_obj_get_type_str(base));
} }
} else if (value == MP_OBJ_SENTINEL) { } else if (value == MP_OBJ_SENTINEL) {
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError("object is not subscriptable");
"object is not subscriptable"));
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg(
"'%s' object is not subscriptable", mp_obj_get_type_str(base))); "'%s' object is not subscriptable", mp_obj_get_type_str(base));
} }
} else { } else {
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_msg(&mp_type_TypeError, "object does not support item assignment"); mp_raise_TypeError("object does not support item assignment");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg(
"'%s' object does not support item assignment", mp_obj_get_type_str(base))); "'%s' object does not support item assignment", mp_obj_get_type_str(base));
} }
} }
} }
@ -495,7 +494,7 @@ bool mp_get_buffer(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
void mp_get_buffer_raise(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags) { void mp_get_buffer_raise(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
if (!mp_get_buffer(obj, bufinfo, flags)) { if (!mp_get_buffer(obj, bufinfo, flags)) {
mp_raise_msg(&mp_type_TypeError, "object with buffer protocol required"); mp_raise_TypeError("object with buffer protocol required");
} }
} }

10
py/objarray.c
View File

@ -95,7 +95,7 @@ STATIC void array_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t
STATIC mp_obj_array_t *array_new(char typecode, mp_uint_t n) { STATIC mp_obj_array_t *array_new(char typecode, mp_uint_t n) {
int typecode_size = mp_binary_get_size('@', typecode, NULL); int typecode_size = mp_binary_get_size('@', typecode, NULL);
if (typecode_size == 0) { if (typecode_size == 0) {
mp_raise_msg(&mp_type_ValueError, "bad typecode"); mp_raise_ValueError("bad typecode");
} }
mp_obj_array_t *o = m_new_obj(mp_obj_array_t); mp_obj_array_t *o = m_new_obj(mp_obj_array_t);
#if MICROPY_PY_BUILTINS_BYTEARRAY && MICROPY_PY_ARRAY #if MICROPY_PY_BUILTINS_BYTEARRAY && MICROPY_PY_ARRAY
@ -292,7 +292,7 @@ STATIC mp_obj_t array_binary_op(mp_uint_t op, mp_obj_t lhs_in, mp_obj_t rhs_in)
// Otherwise, can only look for a scalar numeric value in an array // Otherwise, can only look for a scalar numeric value in an array
if (MP_OBJ_IS_INT(rhs_in) || mp_obj_is_float(rhs_in)) { if (MP_OBJ_IS_INT(rhs_in) || mp_obj_is_float(rhs_in)) {
mp_not_implemented(""); mp_raise_NotImplementError("");
} }
return mp_const_false; return mp_const_false;
@ -382,7 +382,7 @@ STATIC mp_obj_t array_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value
} else if (MP_OBJ_IS_TYPE(index_in, &mp_type_slice)) { } else if (MP_OBJ_IS_TYPE(index_in, &mp_type_slice)) {
mp_bound_slice_t slice; mp_bound_slice_t slice;
if (!mp_seq_get_fast_slice_indexes(o->len, index_in, &slice)) { if (!mp_seq_get_fast_slice_indexes(o->len, index_in, &slice)) {
mp_not_implemented("only slices with step=1 (aka None) are supported"); mp_raise_NotImplementError("only slices with step=1 (aka None) are supported");
} }
if (value != MP_OBJ_SENTINEL) { if (value != MP_OBJ_SENTINEL) {
#if MICROPY_PY_ARRAY_SLICE_ASSIGN #if MICROPY_PY_ARRAY_SLICE_ASSIGN
@ -395,7 +395,7 @@ STATIC mp_obj_t array_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value
mp_obj_array_t *src_slice = MP_OBJ_TO_PTR(value); mp_obj_array_t *src_slice = MP_OBJ_TO_PTR(value);
if (item_sz != mp_binary_get_size('@', src_slice->typecode & TYPECODE_MASK, NULL)) { if (item_sz != mp_binary_get_size('@', src_slice->typecode & TYPECODE_MASK, NULL)) {
compat_error: compat_error:
mp_raise_msg(&mp_type_ValueError, "lhs and rhs should be compatible"); mp_raise_ValueError("lhs and rhs should be compatible");
} }
src_len = src_slice->len; src_len = src_slice->len;
src_items = src_slice->items; src_items = src_slice->items;
@ -413,7 +413,7 @@ STATIC mp_obj_t array_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value
src_len = bufinfo.len; src_len = bufinfo.len;
src_items = bufinfo.buf; src_items = bufinfo.buf;
} else { } else {
mp_not_implemented("array/bytes required on right side"); mp_raise_NotImplementError("array/bytes required on right side");
} }
// TODO: check src/dst compat // TODO: check src/dst compat

2
py/objcomplex.c
View File

@ -194,7 +194,7 @@ mp_obj_t mp_obj_complex_binary_op(mp_uint_t op, mp_float_t lhs_real, mp_float_t
} }
case MP_BINARY_OP_FLOOR_DIVIDE: case MP_BINARY_OP_FLOOR_DIVIDE:
case MP_BINARY_OP_INPLACE_FLOOR_DIVIDE: case MP_BINARY_OP_INPLACE_FLOOR_DIVIDE:
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "can't do truncated division of a complex number")); mp_raise_TypeError("can't do truncated division of a complex number");
case MP_BINARY_OP_TRUE_DIVIDE: case MP_BINARY_OP_TRUE_DIVIDE:
case MP_BINARY_OP_INPLACE_TRUE_DIVIDE: case MP_BINARY_OP_INPLACE_TRUE_DIVIDE:

2
py/objdict.c
View File

@ -385,7 +385,7 @@ STATIC mp_obj_t dict_update(size_t n_args, const mp_obj_t *args, mp_map_t *kwarg
if (key == MP_OBJ_STOP_ITERATION if (key == MP_OBJ_STOP_ITERATION
|| value == MP_OBJ_STOP_ITERATION || value == MP_OBJ_STOP_ITERATION
|| stop != MP_OBJ_STOP_ITERATION) { || stop != MP_OBJ_STOP_ITERATION) {
mp_raise_msg(&mp_type_ValueError, "dictionary update sequence has the wrong length"); mp_raise_ValueError("dictionary update sequence has the wrong length");
} else { } else {
mp_map_lookup(&self->map, key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value; mp_map_lookup(&self->map, key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
} }

6
py/objgenerator.c
View File

@ -105,7 +105,7 @@ mp_vm_return_kind_t mp_obj_gen_resume(mp_obj_t self_in, mp_obj_t send_value, mp_
} }
if (self->code_state.sp == self->code_state.state - 1) { if (self->code_state.sp == self->code_state.state - 1) {
if (send_value != mp_const_none) { if (send_value != mp_const_none) {
mp_raise_msg(&mp_type_TypeError, "can't send non-None value to a just-started generator"); mp_raise_TypeError("can't send non-None value to a just-started generator");
} }
} else { } else {
*self->code_state.sp = send_value; *self->code_state.sp = send_value;
@ -157,7 +157,7 @@ STATIC mp_obj_t gen_resume_and_raise(mp_obj_t self_in, mp_obj_t send_value, mp_o
case MP_VM_RETURN_YIELD: case MP_VM_RETURN_YIELD:
if (throw_value != MP_OBJ_NULL && mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(mp_obj_get_type(throw_value)), MP_OBJ_FROM_PTR(&mp_type_GeneratorExit))) { if (throw_value != MP_OBJ_NULL && mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(mp_obj_get_type(throw_value)), MP_OBJ_FROM_PTR(&mp_type_GeneratorExit))) {
mp_raise_msg(&mp_type_RuntimeError, "generator ignored GeneratorExit"); mp_raise_RuntimeError("generator ignored GeneratorExit");
} }
return ret; return ret;
@ -209,7 +209,7 @@ STATIC mp_obj_t gen_instance_close(mp_obj_t self_in) {
mp_obj_t ret; mp_obj_t ret;
switch (mp_obj_gen_resume(self_in, mp_const_none, MP_OBJ_FROM_PTR(&mp_const_GeneratorExit_obj), &ret)) { switch (mp_obj_gen_resume(self_in, mp_const_none, MP_OBJ_FROM_PTR(&mp_const_GeneratorExit_obj), &ret)) {
case MP_VM_RETURN_YIELD: case MP_VM_RETURN_YIELD:
mp_raise_msg(&mp_type_RuntimeError, "generator ignored GeneratorExit"); mp_raise_RuntimeError("generator ignored GeneratorExit");
// Swallow StopIteration & GeneratorExit (== successful close), and re-raise any other // Swallow StopIteration & GeneratorExit (== successful close), and re-raise any other
case MP_VM_RETURN_EXCEPTION: case MP_VM_RETURN_EXCEPTION:

10
py/objint.c
View File

@ -322,15 +322,15 @@ mp_obj_t mp_obj_new_int_from_uint(mp_uint_t value) {
mp_obj_t mp_obj_new_int_from_float(mp_float_t val) { mp_obj_t mp_obj_new_int_from_float(mp_float_t val) {
int cl = fpclassify(val); int cl = fpclassify(val);
if (cl == FP_INFINITE) { if (cl == FP_INFINITE) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OverflowError, "can't convert inf to int")); mp_raise_msg(&mp_type_OverflowError, "can't convert inf to int");
} else if (cl == FP_NAN) { } else if (cl == FP_NAN) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "can't convert NaN to int")); mp_raise_ValueError("can't convert NaN to int");
} else { } else {
mp_fp_as_int_class_t icl = mp_classify_fp_as_int(val); mp_fp_as_int_class_t icl = mp_classify_fp_as_int(val);
if (icl == MP_FP_CLASS_FIT_SMALLINT) { if (icl == MP_FP_CLASS_FIT_SMALLINT) {
return MP_OBJ_NEW_SMALL_INT((mp_int_t)val); return MP_OBJ_NEW_SMALL_INT((mp_int_t)val);
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "float too big")); mp_raise_ValueError("float too big");
} }
} }
} }
@ -380,7 +380,7 @@ STATIC mp_obj_t int_from_bytes(size_t n_args, const mp_obj_t *args) {
(void)n_args; (void)n_args;
if (args[2] != MP_OBJ_NEW_QSTR(MP_QSTR_little)) { if (args[2] != MP_OBJ_NEW_QSTR(MP_QSTR_little)) {
mp_not_implemented(""); mp_raise_NotImplementError("");
} }
// get the buffer info // get the buffer info
@ -405,7 +405,7 @@ STATIC mp_obj_t int_to_bytes(size_t n_args, const mp_obj_t *args) {
(void)n_args; (void)n_args;
if (args[2] != MP_OBJ_NEW_QSTR(MP_QSTR_little)) { if (args[2] != MP_OBJ_NEW_QSTR(MP_QSTR_little)) {
mp_not_implemented(""); mp_raise_NotImplementError("");
} }
mp_uint_t len = MP_OBJ_SMALL_INT_VALUE(args[1]); mp_uint_t len = MP_OBJ_SMALL_INT_VALUE(args[1]);

8
py/objint_longlong.c
View File

@ -241,7 +241,7 @@ mp_obj_t mp_obj_new_int_from_ll(long long val) {
mp_obj_t mp_obj_new_int_from_ull(unsigned long long val) { mp_obj_t mp_obj_new_int_from_ull(unsigned long long val) {
// TODO raise an exception if the unsigned long long won't fit // TODO raise an exception if the unsigned long long won't fit
if (val >> (sizeof(unsigned long long) * 8 - 1) != 0) { if (val >> (sizeof(unsigned long long) * 8 - 1) != 0) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OverflowError, "ulonglong too large")); mp_raise_msg(&mp_type_OverflowError, "ulonglong too large"));
} }
mp_obj_int_t *o = m_new_obj(mp_obj_int_t); mp_obj_int_t *o = m_new_obj(mp_obj_int_t);
o->base.type = &mp_type_int; o->base.type = &mp_type_int;
@ -253,9 +253,9 @@ mp_obj_t mp_obj_new_int_from_ull(unsigned long long val) {
mp_obj_t mp_obj_new_int_from_float(mp_float_t val) { mp_obj_t mp_obj_new_int_from_float(mp_float_t val) {
int cl = fpclassify(val); int cl = fpclassify(val);
if (cl == FP_INFINITE) { if (cl == FP_INFINITE) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OverflowError, "can't convert inf to int")); mp_raise_msg(&mp_type_OverflowError, "can't convert inf to int"));
} else if (cl == FP_NAN) { } else if (cl == FP_NAN) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "can't convert NaN to int")); mp_raise_ValueError("can't convert NaN to int");
} else { } else {
mp_fp_as_int_class_t icl = mp_classify_fp_as_int(val); mp_fp_as_int_class_t icl = mp_classify_fp_as_int(val);
if (icl == MP_FP_CLASS_FIT_SMALLINT) { if (icl == MP_FP_CLASS_FIT_SMALLINT) {
@ -263,7 +263,7 @@ mp_obj_t mp_obj_new_int_from_float(mp_float_t val) {
} else if (icl == MP_FP_CLASS_FIT_LONGINT) { } else if (icl == MP_FP_CLASS_FIT_LONGINT) {
return mp_obj_new_int_from_ll((long long)val); return mp_obj_new_int_from_ll((long long)val);
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "float too big")); mp_raise_ValueError("float too big");
} }
} }
} }

6
py/objint_mpz.c
View File

@ -271,7 +271,7 @@ mp_obj_t mp_obj_int_binary_op(mp_uint_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
case MP_BINARY_OP_INPLACE_RSHIFT: { case MP_BINARY_OP_INPLACE_RSHIFT: {
mp_int_t irhs = mp_obj_int_get_checked(rhs_in); mp_int_t irhs = mp_obj_int_get_checked(rhs_in);
if (irhs < 0) { if (irhs < 0) {
mp_raise_msg(&mp_type_ValueError, "negative shift count"); mp_raise_ValueError("negative shift count");
} }
if (op == MP_BINARY_OP_LSHIFT || op == MP_BINARY_OP_INPLACE_LSHIFT) { if (op == MP_BINARY_OP_LSHIFT || op == MP_BINARY_OP_INPLACE_LSHIFT) {
mpz_shl_inpl(&res->mpz, zlhs, irhs); mpz_shl_inpl(&res->mpz, zlhs, irhs);
@ -354,9 +354,9 @@ mp_obj_t mp_obj_new_int_from_uint(mp_uint_t value) {
mp_obj_t mp_obj_new_int_from_float(mp_float_t val) { mp_obj_t mp_obj_new_int_from_float(mp_float_t val) {
int cl = fpclassify(val); int cl = fpclassify(val);
if (cl == FP_INFINITE) { if (cl == FP_INFINITE) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OverflowError, "can't convert inf to int")); mp_raise_msg(&mp_type_OverflowError, "can't convert inf to int");
} else if (cl == FP_NAN) { } else if (cl == FP_NAN) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "can't convert NaN to int")); mp_raise_ValueError("can't convert NaN to int");
} else { } else {
mp_fp_as_int_class_t icl = mp_classify_fp_as_int(val); mp_fp_as_int_class_t icl = mp_classify_fp_as_int(val);
if (icl == MP_FP_CLASS_FIT_SMALLINT) { if (icl == MP_FP_CLASS_FIT_SMALLINT) {

6
py/objlist.c
View File

@ -156,7 +156,7 @@ STATIC mp_obj_t list_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in); mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in);
mp_bound_slice_t slice; mp_bound_slice_t slice;
if (!mp_seq_get_fast_slice_indexes(self->len, index, &slice)) { if (!mp_seq_get_fast_slice_indexes(self->len, index, &slice)) {
mp_not_implemented(""); mp_raise_NotImplementError("");
} }
mp_int_t len_adj = slice.start - slice.stop; mp_int_t len_adj = slice.start - slice.stop;
@ -196,7 +196,7 @@ STATIC mp_obj_t list_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
mp_obj_list_t *slice = MP_OBJ_TO_PTR(value); mp_obj_list_t *slice = MP_OBJ_TO_PTR(value);
mp_bound_slice_t slice_out; mp_bound_slice_t slice_out;
if (!mp_seq_get_fast_slice_indexes(self->len, index, &slice_out)) { if (!mp_seq_get_fast_slice_indexes(self->len, index, &slice_out)) {
mp_not_implemented(""); mp_raise_NotImplementError("");
} }
mp_int_t len_adj = slice->len - (slice_out.stop - slice_out.start); mp_int_t len_adj = slice->len - (slice_out.stop - slice_out.start);
//printf("Len adj: %d\n", len_adj); //printf("Len adj: %d\n", len_adj);
@ -266,7 +266,7 @@ STATIC mp_obj_t list_pop(size_t n_args, const mp_obj_t *args) {
mp_check_self(MP_OBJ_IS_TYPE(args[0], &mp_type_list)); mp_check_self(MP_OBJ_IS_TYPE(args[0], &mp_type_list));
mp_obj_list_t *self = MP_OBJ_TO_PTR(args[0]); mp_obj_list_t *self = MP_OBJ_TO_PTR(args[0]);
if (self->len == 0) { if (self->len == 0) {
mp_raise_msg(&mp_type_IndexError, "pop from empty list"); mp_raise_IndexError("pop from empty list");
} }
mp_uint_t index = mp_get_index(self->base.type, self->len, n_args == 1 ? MP_OBJ_NEW_SMALL_INT(-1) : args[1], false); mp_uint_t index = mp_get_index(self->base.type, self->len, n_args == 1 ? MP_OBJ_NEW_SMALL_INT(-1) : args[1], false);
mp_obj_t ret = self->items[index]; mp_obj_t ret = self->items[index];

18
py/objnamedtuple.c
View File

@ -64,7 +64,7 @@ void namedtuple_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
} else { } else {
// delete/store attribute // delete/store attribute
// provide more detailed error message than we'd get by just returning // provide more detailed error message than we'd get by just returning
mp_raise_msg(&mp_type_AttributeError, "can't set attribute"); mp_raise_AttributeError("can't set attribute");
} }
} }
@ -75,13 +75,13 @@ mp_obj_t namedtuple_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_arg_error_terse_mismatch(); mp_arg_error_terse_mismatch();
} else if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NORMAL) { } else if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NORMAL) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg(
"function takes %d positional arguments but %d were given", "function takes %d positional arguments but %d were given",
num_fields, n_args + n_kw)); num_fields, n_args + n_kw);
} else if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED) { } else if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg(
"%q() takes %d positional arguments but %d were given", "%q() takes %d positional arguments but %d were given",
type->base.name, num_fields, n_args + n_kw)); type->base.name, num_fields, n_args + n_kw);
} }
} }
@ -104,16 +104,16 @@ mp_obj_t namedtuple_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_arg_error_terse_mismatch(); mp_arg_error_terse_mismatch();
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg(
"unexpected keyword argument '%q'", kw)); "unexpected keyword argument '%q'", kw);
} }
} }
if (arg_objects[id] != MP_OBJ_NULL) { if (arg_objects[id] != MP_OBJ_NULL) {
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_arg_error_terse_mismatch(); mp_arg_error_terse_mismatch();
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg(
"function got multiple values for argument '%q'", kw)); "function got multiple values for argument '%q'", kw);
} }
} }
arg_objects[id] = args[i + 1]; arg_objects[id] = args[i + 1];

2
py/objobject.c
View File

@ -50,7 +50,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(object___init___obj, object___init__);
STATIC mp_obj_t object___new__(mp_obj_t cls) { STATIC mp_obj_t object___new__(mp_obj_t cls) {
if (!MP_OBJ_IS_TYPE(cls, &mp_type_type) || !mp_obj_is_instance_type((mp_obj_type_t*)MP_OBJ_TO_PTR(cls))) { if (!MP_OBJ_IS_TYPE(cls, &mp_type_type) || !mp_obj_is_instance_type((mp_obj_type_t*)MP_OBJ_TO_PTR(cls))) {
mp_raise_msg(&mp_type_TypeError, "__new__ arg must be a user-type"); mp_raise_TypeError("__new__ arg must be a user-type");
} }
mp_obj_t o = MP_OBJ_SENTINEL; mp_obj_t o = MP_OBJ_SENTINEL;
mp_obj_t res = mp_obj_instance_make_new(MP_OBJ_TO_PTR(cls), 1, 0, &o); mp_obj_t res = mp_obj_instance_make_new(MP_OBJ_TO_PTR(cls), 1, 0, &o);

2
py/objset.c
View File

@ -68,7 +68,7 @@ STATIC void check_set(mp_obj_t o) {
if (MP_OBJ_IS_TYPE(o, &mp_type_frozenset)) { if (MP_OBJ_IS_TYPE(o, &mp_type_frozenset)) {
// Mutable method called on frozenset; emulate CPython behavior, eg: // Mutable method called on frozenset; emulate CPython behavior, eg:
// AttributeError: 'frozenset' object has no attribute 'add' // AttributeError: 'frozenset' object has no attribute 'add'
mp_raise_msg(&mp_type_AttributeError, "'frozenset' has no such attribute"); mp_raise_AttributeError("'frozenset' has no such attribute");
} }
#endif #endif
mp_check_self(MP_OBJ_IS_TYPE(o, &mp_type_set)); mp_check_self(MP_OBJ_IS_TYPE(o, &mp_type_set));

35
py/objstr.c
View File

@ -400,7 +400,7 @@ STATIC mp_obj_t bytes_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) { if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) {
mp_bound_slice_t slice; mp_bound_slice_t slice;
if (!mp_seq_get_fast_slice_indexes(self_len, index, &slice)) { if (!mp_seq_get_fast_slice_indexes(self_len, index, &slice)) {
mp_not_implemented("only slices with step=1 (aka None) are supported"); mp_raise_NotImplementError("only slices with step=1 (aka None) are supported");
} }
return mp_obj_new_str_of_type(type, self_data + slice.start, slice.stop - slice.start); return mp_obj_new_str_of_type(type, self_data + slice.start, slice.stop - slice.start);
} }
@ -609,7 +609,7 @@ STATIC mp_obj_t str_rsplit(size_t n_args, const mp_obj_t *args) {
mp_int_t idx = splits; mp_int_t idx = splits;
if (sep == mp_const_none) { if (sep == mp_const_none) {
mp_not_implemented("rsplit(None,n)"); mp_raise_NotImplementError("rsplit(None,n)");
} else { } else {
mp_uint_t sep_len; mp_uint_t sep_len;
const char *sep_str = mp_obj_str_get_data(sep, &sep_len); const char *sep_str = mp_obj_str_get_data(sep, &sep_len);
@ -727,7 +727,7 @@ STATIC mp_obj_t str_endswith(size_t n_args, const mp_obj_t *args) {
GET_STR_DATA_LEN(args[0], str, str_len); GET_STR_DATA_LEN(args[0], str, str_len);
GET_STR_DATA_LEN(args[1], suffix, suffix_len); GET_STR_DATA_LEN(args[1], suffix, suffix_len);
if (n_args > 2) { if (n_args > 2) {
mp_not_implemented("start/end indices"); mp_raise_NotImplementError("start/end indices");
} }
if (suffix_len > str_len) { if (suffix_len > str_len) {
@ -950,8 +950,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
mp_raise_ValueError( mp_raise_ValueError(
"end of format while looking for conversion specifier"); "end of format while looking for conversion specifier");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, mp_raise_ValueError_varg("unknown conversion specifier %c", *str);
"unknown conversion specifier %c", *str));
} }
} }
} }
@ -1008,7 +1007,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
} }
field_name = str_to_int(field_name, field_name_top, &index); field_name = str_to_int(field_name, field_name_top, &index);
if ((uint)index >= n_args - 1) { if ((uint)index >= n_args - 1) {
mp_raise_msg(&mp_type_IndexError, "tuple index out of range"); mp_raise_IndexError("tuple index out of range");
} }
arg = args[index + 1]; arg = args[index + 1];
*arg_i = -1; *arg_i = -1;
@ -1024,7 +1023,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
arg = key_elem->value; arg = key_elem->value;
} }
if (field_name < field_name_top) { if (field_name < field_name_top) {
mp_not_implemented("attributes not supported yet"); mp_raise_NotImplementError("attributes not supported yet");
} }
} else { } else {
if (*arg_i < 0) { if (*arg_i < 0) {
@ -1036,7 +1035,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
} }
} }
if ((uint)*arg_i >= n_args - 1) { if ((uint)*arg_i >= n_args - 1) {
mp_raise_msg(&mp_type_IndexError, "tuple index out of range"); mp_raise_IndexError("tuple index out of range");
} }
arg = args[(*arg_i) + 1]; arg = args[(*arg_i) + 1];
(*arg_i)++; (*arg_i)++;
@ -1214,9 +1213,9 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
terse_str_format_value_error(); terse_str_format_value_error();
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, mp_raise_ValueError_varg(
"unknown format code '%c' for object of type '%s'", "unknown format code '%c' for object of type '%s'",
type, mp_obj_get_type_str(arg))); type, mp_obj_get_type_str(arg));
} }
} }
} }
@ -1286,9 +1285,9 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
terse_str_format_value_error(); terse_str_format_value_error();
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, mp_raise_ValueError_varg(
"unknown format code '%c' for object of type 'float'", "unknown format code '%c' for object of type 'float'",
type, mp_obj_get_type_str(arg))); type, mp_obj_get_type_str(arg));
} }
} }
} else { } else {
@ -1322,9 +1321,9 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
terse_str_format_value_error(); terse_str_format_value_error();
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, mp_raise_ValueError_varg(
"unknown format code '%c' for object of type 'str'", "unknown format code '%c' for object of type 'str'",
type, mp_obj_get_type_str(arg))); type, mp_obj_get_type_str(arg));
} }
} }
} }
@ -1520,9 +1519,9 @@ not_enough_args:
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
terse_str_format_value_error(); terse_str_format_value_error();
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, mp_raise_ValueError_varg(
"unsupported format character '%c' (0x%x) at index %d", "unsupported format character '%c' (0x%x) at index %d",
*str, *str, str - start_str)); *str, *str, str - start_str);
} }
} }
} }
@ -2061,9 +2060,9 @@ STATIC void bad_implicit_conversion(mp_obj_t self_in) {
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_TypeError("can't convert to str implicitly"); mp_raise_TypeError("can't convert to str implicitly");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg(
"can't convert '%s' object to str implicitly", "can't convert '%s' object to str implicitly",
mp_obj_get_type_str(self_in))); mp_obj_get_type_str(self_in));
} }
} }

2
py/objstringio.c
View File

@ -39,7 +39,7 @@
#if MICROPY_CPYTHON_COMPAT #if MICROPY_CPYTHON_COMPAT
STATIC void check_stringio_is_open(const mp_obj_stringio_t *o) { STATIC void check_stringio_is_open(const mp_obj_stringio_t *o) {
if (o->vstr == NULL) { if (o->vstr == NULL) {
mp_raise_msg(&mp_type_ValueError, "I/O operation on closed file"); mp_raise_ValueError("I/O operation on closed file");
} }
} }
#else #else

8
py/objstrunicode.c
View File

@ -131,7 +131,7 @@ const byte *str_index_to_ptr(const mp_obj_type_t *type, const byte *self_data, s
if (MP_OBJ_IS_SMALL_INT(index)) { if (MP_OBJ_IS_SMALL_INT(index)) {
i = MP_OBJ_SMALL_INT_VALUE(index); i = MP_OBJ_SMALL_INT_VALUE(index);
} else if (!mp_obj_get_int_maybe(index, &i)) { } else if (!mp_obj_get_int_maybe(index, &i)) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "string indices must be integers, not %s", mp_obj_get_type_str(index))); mp_raise_TypeError_varg("string indices must be integers, not %s", mp_obj_get_type_str(index));
} }
const byte *s, *top = self_data + self_len; const byte *s, *top = self_data + self_len;
if (i < 0) if (i < 0)
@ -142,7 +142,7 @@ const byte *str_index_to_ptr(const mp_obj_type_t *type, const byte *self_data, s
if (is_slice) { if (is_slice) {
return self_data; return self_data;
} }
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_IndexError, "string index out of range")); mp_raise_IndexError("string index out of range");
} }
if (!UTF8_IS_CONT(*s)) { if (!UTF8_IS_CONT(*s)) {
++i; ++i;
@ -161,7 +161,7 @@ const byte *str_index_to_ptr(const mp_obj_type_t *type, const byte *self_data, s
if (is_slice) { if (is_slice) {
return top; return top;
} }
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_IndexError, "string index out of range")); mp_raise_IndexError("string index out of range");
} }
// Then check completion // Then check completion
if (i-- == 0) { if (i-- == 0) {
@ -188,7 +188,7 @@ STATIC mp_obj_t str_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
mp_obj_t ostart, ostop, ostep; mp_obj_t ostart, ostop, ostep;
mp_obj_slice_get(index, &ostart, &ostop, &ostep); mp_obj_slice_get(index, &ostart, &ostop, &ostep);
if (ostep != mp_const_none && ostep != MP_OBJ_NEW_SMALL_INT(1)) { if (ostep != mp_const_none && ostep != MP_OBJ_NEW_SMALL_INT(1)) {
mp_not_implemented("only slices with step=1 (aka None) are supported"); mp_raise_NotImplementError("only slices with step=1 (aka None) are supported");
} }
const byte *pstart, *pstop; const byte *pstart, *pstop;

2
py/objtuple.c
View File

@ -181,7 +181,7 @@ mp_obj_t mp_obj_tuple_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) { if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) {
mp_bound_slice_t slice; mp_bound_slice_t slice;
if (!mp_seq_get_fast_slice_indexes(self->len, index, &slice)) { if (!mp_seq_get_fast_slice_indexes(self->len, index, &slice)) {
mp_not_implemented("only slices with step=1 (aka None) are supported"); mp_raise_NotImplementError("only slices with step=1 (aka None) are supported");
} }
mp_obj_tuple_t *res = MP_OBJ_TO_PTR(mp_obj_new_tuple(slice.stop - slice.start, NULL)); mp_obj_tuple_t *res = MP_OBJ_TO_PTR(mp_obj_new_tuple(slice.stop - slice.start, NULL));
mp_seq_copy(res->items, self->items + slice.start, res->len, mp_obj_t); mp_seq_copy(res->items, self->items + slice.start, res->len, mp_obj_t);

33
py/objtype.c
View File

@ -314,10 +314,10 @@ mp_obj_t mp_obj_instance_make_new(const mp_obj_type_t *self, size_t n_args, size
} }
if (init_ret != mp_const_none) { if (init_ret != mp_const_none) {
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_msg(&mp_type_TypeError, "__init__() should return None"); mp_raise_TypeError("__init__() should return None");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg("__init__() should return None, not '%s'",
"__init__() should return None, not '%s'", mp_obj_get_type_str(init_ret))); mp_obj_get_type_str(init_ret));
} }
} }
@ -510,7 +510,7 @@ STATIC void mp_obj_instance_load_attr(mp_obj_t self_in, qstr attr, mp_obj_t *des
// the code. // the code.
const mp_obj_t *proxy = mp_obj_property_get(member); const mp_obj_t *proxy = mp_obj_property_get(member);
if (proxy[0] == mp_const_none) { if (proxy[0] == mp_const_none) {
mp_raise_msg(&mp_type_AttributeError, "unreadable attribute"); mp_raise_AttributeError("unreadable attribute");
} else { } else {
dest[0] = mp_call_function_n_kw(proxy[0], 1, 0, &self_in); dest[0] = mp_call_function_n_kw(proxy[0], 1, 0, &self_in);
} }
@ -713,10 +713,10 @@ mp_obj_t mp_obj_instance_call(mp_obj_t self_in, size_t n_args, size_t n_kw, cons
mp_obj_t call = mp_obj_instance_get_call(self_in, member); mp_obj_t call = mp_obj_instance_get_call(self_in, member);
if (call == MP_OBJ_NULL) { if (call == MP_OBJ_NULL) {
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_msg(&mp_type_TypeError, "object not callable"); mp_raise_TypeError("object not callable");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg("'%s' object is not callable",
"'%s' object is not callable", mp_obj_get_type_str(self_in))); mp_obj_get_type_str(self_in));
} }
} }
mp_obj_instance_t *self = MP_OBJ_TO_PTR(self_in); mp_obj_instance_t *self = MP_OBJ_TO_PTR(self_in);
@ -795,7 +795,7 @@ STATIC mp_obj_t type_make_new(const mp_obj_type_t *type_in, size_t n_args, size_
return mp_obj_new_type(mp_obj_str_get_qstr(args[0]), args[1], args[2]); return mp_obj_new_type(mp_obj_str_get_qstr(args[0]), args[1], args[2]);
default: default:
mp_raise_msg(&mp_type_TypeError, "type takes 1 or 3 arguments"); mp_raise_TypeError("type takes 1 or 3 arguments");
} }
} }
@ -806,10 +806,9 @@ STATIC mp_obj_t type_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp
if (self->make_new == NULL) { if (self->make_new == NULL) {
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_msg(&mp_type_TypeError, "cannot create instance"); mp_raise_TypeError("cannot create instance");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg("cannot create '%q' instances", self->name);
"cannot create '%q' instances", self->name));
} }
} }
@ -894,10 +893,10 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
// TODO: Verify with CPy, tested on function type // TODO: Verify with CPy, tested on function type
if (t->make_new == NULL) { if (t->make_new == NULL) {
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_msg(&mp_type_TypeError, "type is not an acceptable base type"); mp_raise_TypeError("type is not an acceptable base type");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg(
"type '%q' is not an acceptable base type", t->name)); "type '%q' is not an acceptable base type", t->name);
} }
} }
} }
@ -928,7 +927,7 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
const mp_obj_type_t *native_base; const mp_obj_type_t *native_base;
uint num_native_bases = instance_count_native_bases(o, &native_base); uint num_native_bases = instance_count_native_bases(o, &native_base);
if (num_native_bases > 1) { if (num_native_bases > 1) {
mp_raise_msg(&mp_type_TypeError, "multiple bases have instance lay-out conflict"); mp_raise_TypeError("multiple bases have instance lay-out conflict");
} }
mp_map_t *locals_map = &o->locals_dict->map; mp_map_t *locals_map = &o->locals_dict->map;
@ -1075,7 +1074,7 @@ STATIC mp_obj_t mp_obj_is_subclass(mp_obj_t object, mp_obj_t classinfo) {
} else if (MP_OBJ_IS_TYPE(classinfo, &mp_type_tuple)) { } else if (MP_OBJ_IS_TYPE(classinfo, &mp_type_tuple)) {
mp_obj_tuple_get(classinfo, &len, &items); mp_obj_tuple_get(classinfo, &len, &items);
} else { } else {
mp_raise_msg(&mp_type_TypeError, "issubclass() arg 2 must be a class or a tuple of classes"); mp_raise_TypeError("issubclass() arg 2 must be a class or a tuple of classes");
} }
for (uint i = 0; i < len; i++) { for (uint i = 0; i < len; i++) {
@ -1089,7 +1088,7 @@ STATIC mp_obj_t mp_obj_is_subclass(mp_obj_t object, mp_obj_t classinfo) {
STATIC mp_obj_t mp_builtin_issubclass(mp_obj_t object, mp_obj_t classinfo) { STATIC mp_obj_t mp_builtin_issubclass(mp_obj_t object, mp_obj_t classinfo) {
if (!MP_OBJ_IS_TYPE(object, &mp_type_type)) { if (!MP_OBJ_IS_TYPE(object, &mp_type_type)) {
mp_raise_msg(&mp_type_TypeError, "issubclass() arg 1 must be a class"); mp_raise_TypeError("issubclass() arg 1 must be a class");
} }
return mp_obj_is_subclass(object, classinfo); return mp_obj_is_subclass(object, classinfo);
} }

2
py/parsenum.c
View File

@ -55,7 +55,7 @@ mp_obj_t mp_parse_num_integer(const char *restrict str_, size_t len, int base, m
// check radix base // check radix base
if ((base != 0 && base < 2) || base > 36) { if ((base != 0 && base < 2) || base > 36) {
// this won't be reached if lex!=NULL // this won't be reached if lex!=NULL
mp_raise_msg(&mp_type_ValueError, "int() arg 2 must be >= 2 and <= 36"); mp_raise_ValueError("int() arg 2 must be >= 2 and <= 36");
} }
// skip leading space // skip leading space

134
py/runtime.c
View File

@ -24,6 +24,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
@ -245,11 +246,11 @@ mp_obj_t mp_unary_op(mp_uint_t op, mp_obj_t arg) {
} }
} }
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_msg(&mp_type_TypeError, "unsupported type for operator"); mp_raise_TypeError("unsupported type for operator");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg(
"unsupported type for %q: '%s'", "unsupported type for %q: '%s'",
mp_unary_op_method_name[op], mp_obj_get_type_str(arg))); mp_unary_op_method_name[op], mp_obj_get_type_str(arg));
} }
} }
} }
@ -337,7 +338,7 @@ mp_obj_t mp_binary_op(mp_uint_t op, mp_obj_t lhs, mp_obj_t rhs) {
case MP_BINARY_OP_INPLACE_LSHIFT: { case MP_BINARY_OP_INPLACE_LSHIFT: {
if (rhs_val < 0) { if (rhs_val < 0) {
// negative shift not allowed // negative shift not allowed
mp_raise_msg(&mp_type_ValueError, "negative shift count"); mp_raise_ValueError("negative shift count");
} else if (rhs_val >= (mp_int_t)BITS_PER_WORD || lhs_val > (MP_SMALL_INT_MAX >> rhs_val) || lhs_val < (MP_SMALL_INT_MIN >> rhs_val)) { } else if (rhs_val >= (mp_int_t)BITS_PER_WORD || lhs_val > (MP_SMALL_INT_MAX >> rhs_val) || lhs_val < (MP_SMALL_INT_MIN >> rhs_val)) {
// left-shift will overflow, so use higher precision integer // left-shift will overflow, so use higher precision integer
lhs = mp_obj_new_int_from_ll(lhs_val); lhs = mp_obj_new_int_from_ll(lhs_val);
@ -352,7 +353,7 @@ mp_obj_t mp_binary_op(mp_uint_t op, mp_obj_t lhs, mp_obj_t rhs) {
case MP_BINARY_OP_INPLACE_RSHIFT: case MP_BINARY_OP_INPLACE_RSHIFT:
if (rhs_val < 0) { if (rhs_val < 0) {
// negative shift not allowed // negative shift not allowed
mp_raise_msg(&mp_type_ValueError, "negative shift count"); mp_raise_ValueError("negative shift count");
} else { } else {
// standard precision is enough for right-shift // standard precision is enough for right-shift
if (rhs_val >= (mp_int_t)BITS_PER_WORD) { if (rhs_val >= (mp_int_t)BITS_PER_WORD) {
@ -428,7 +429,7 @@ mp_obj_t mp_binary_op(mp_uint_t op, mp_obj_t lhs, mp_obj_t rhs) {
lhs = mp_obj_new_float(lhs_val); lhs = mp_obj_new_float(lhs_val);
goto generic_binary_op; goto generic_binary_op;
#else #else
mp_raise_msg(&mp_type_ValueError, "negative power with no float support"); mp_raise_ValueError("negative power with no float support");
#endif #endif
} else { } else {
mp_int_t ans = 1; mp_int_t ans = 1;
@ -529,10 +530,10 @@ mp_obj_t mp_binary_op(mp_uint_t op, mp_obj_t lhs, mp_obj_t rhs) {
} }
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_msg(&mp_type_TypeError, "object not iterable"); mp_raise_TypeError("object not iterable");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg(
"'%s' object is not iterable", mp_obj_get_type_str(rhs))); "'%s' object is not iterable", mp_obj_get_type_str(rhs));
} }
} }
@ -551,11 +552,11 @@ generic_binary_op:
unsupported_op: unsupported_op:
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_msg(&mp_type_TypeError, "unsupported type for operator"); mp_raise_TypeError("unsupported type for operator");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg(
"unsupported types for %q: '%s', '%s'", "unsupported types for %q: '%s', '%s'",
mp_binary_op_method_name[op], mp_obj_get_type_str(lhs), mp_obj_get_type_str(rhs))); mp_binary_op_method_name[op], mp_obj_get_type_str(lhs), mp_obj_get_type_str(rhs));
} }
zero_division: zero_division:
@ -593,10 +594,9 @@ mp_obj_t mp_call_function_n_kw(mp_obj_t fun_in, mp_uint_t n_args, mp_uint_t n_kw
} }
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_msg(&mp_type_TypeError, "object not callable"); mp_raise_TypeError("object not callable");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg("'%s' object is not callable", mp_obj_get_type_str(fun_in));
"'%s' object is not callable", mp_obj_get_type_str(fun_in)));
} }
} }
@ -824,17 +824,17 @@ void mp_unpack_sequence(mp_obj_t seq_in, mp_uint_t num, mp_obj_t *items) {
too_short: too_short:
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_msg(&mp_type_ValueError, "wrong number of values to unpack"); mp_raise_ValueError("wrong number of values to unpack");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, mp_raise_ValueError_varg("need more than %d values to unpack",
"need more than %d values to unpack", (int)seq_len)); (int)seq_len);
} }
too_long: too_long:
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_msg(&mp_type_ValueError, "wrong number of values to unpack"); mp_raise_ValueError("wrong number of values to unpack");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, mp_raise_ValueError_varg("too many values to unpack (expected %d)",
"too many values to unpack (expected %d)", (int)num)); (int)num);
} }
} }
@ -897,10 +897,10 @@ void mp_unpack_ex(mp_obj_t seq_in, mp_uint_t num_in, mp_obj_t *items) {
too_short: too_short:
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_msg(&mp_type_ValueError, "wrong number of values to unpack"); mp_raise_ValueError("wrong number of values to unpack");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, mp_raise_ValueError_varg("need more than %d values to unpack",
"need more than %d values to unpack", (int)seq_len)); (int)seq_len);
} }
} }
@ -936,10 +936,10 @@ STATIC mp_obj_t checked_fun_call(mp_obj_t self_in, size_t n_args, size_t n_kw, c
const mp_obj_type_t *arg0_type = mp_obj_get_type(args[0]); const mp_obj_type_t *arg0_type = mp_obj_get_type(args[0]);
if (arg0_type != self->type) { if (arg0_type != self->type) {
if (MICROPY_ERROR_REPORTING != MICROPY_ERROR_REPORTING_DETAILED) { if (MICROPY_ERROR_REPORTING != MICROPY_ERROR_REPORTING_DETAILED) {
mp_raise_msg(&mp_type_TypeError, "argument has wrong type"); mp_raise_TypeError("argument has wrong type");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg("argument should be a '%q' not a '%q'",
"argument should be a '%q' not a '%q'", self->type->name, arg0_type->name)); self->type->name, arg0_type->name);
} }
} }
} }
@ -1016,7 +1016,7 @@ void mp_convert_member_lookup(mp_obj_t self, const mp_obj_type_t *type, mp_obj_t
// the code. // the code.
const mp_obj_t *proxy = mp_obj_property_get(member); const mp_obj_t *proxy = mp_obj_property_get(member);
if (proxy[0] == mp_const_none) { if (proxy[0] == mp_const_none) {
mp_raise_msg(&mp_type_AttributeError, "unreadable attribute"); mp_raise_AttributeError("unreadable attribute");
} else { } else {
dest[0] = mp_call_function_n_kw(proxy[0], 1, 0, &self); dest[0] = mp_call_function_n_kw(proxy[0], 1, 0, &self);
} }
@ -1074,7 +1074,7 @@ void mp_load_method(mp_obj_t base, qstr attr, mp_obj_t *dest) {
if (dest[0] == MP_OBJ_NULL) { if (dest[0] == MP_OBJ_NULL) {
// no attribute/method called attr // no attribute/method called attr
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_msg(&mp_type_AttributeError, "no such attribute"); mp_raise_AttributeError("no such attribute");
} else { } else {
// following CPython, we give a more detailed error message for type objects // following CPython, we give a more detailed error message for type objects
if (MP_OBJ_IS_TYPE(base, &mp_type_type)) { if (MP_OBJ_IS_TYPE(base, &mp_type_type)) {
@ -1131,7 +1131,7 @@ void mp_store_attr(mp_obj_t base, qstr attr, mp_obj_t value) {
#endif #endif
} }
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_msg(&mp_type_AttributeError, "no such attribute"); mp_raise_AttributeError("no such attribute");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_AttributeError, nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_AttributeError,
"'%s' object has no attribute '%q'", "'%s' object has no attribute '%q'",
@ -1161,10 +1161,10 @@ mp_obj_t mp_getiter(mp_obj_t o_in) {
// object not iterable // object not iterable
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_msg(&mp_type_TypeError, "object not iterable"); mp_raise_TypeError("object not iterable");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg(
"'%s' object is not iterable", mp_obj_get_type_str(o_in))); "'%s' object is not iterable", mp_obj_get_type_str(o_in));
} }
} }
@ -1183,10 +1183,10 @@ mp_obj_t mp_iternext_allow_raise(mp_obj_t o_in) {
return mp_call_method_n_kw(0, 0, dest); return mp_call_method_n_kw(0, 0, dest);
} else { } else {
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_msg(&mp_type_TypeError, "object not an iterator"); mp_raise_TypeError("object not an iterator");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg("'%s' object is not an iterator",
"'%s' object is not an iterator", mp_obj_get_type_str(o_in))); mp_obj_get_type_str(o_in));
} }
} }
} }
@ -1219,10 +1219,10 @@ mp_obj_t mp_iternext(mp_obj_t o_in) {
} }
} else { } else {
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) { if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_msg(&mp_type_TypeError, "object not an iterator"); mp_raise_TypeError("object not an iterator");
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, mp_raise_TypeError_varg("'%s' object is not an iterator",
"'%s' object is not an iterator", mp_obj_get_type_str(o_in))); mp_obj_get_type_str(o_in));
} }
} }
} }
@ -1354,7 +1354,7 @@ mp_obj_t mp_import_from(mp_obj_t module, qstr name) {
if (dest[1] != MP_OBJ_NULL) { if (dest[1] != MP_OBJ_NULL) {
// Hopefully we can't import bound method from an object // Hopefully we can't import bound method from an object
import_error: import_error:
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ImportError, "cannot import name %q", name)); mp_raise_msg_varg(&mp_type_ImportError, "cannot import name %q", name);
} }
if (dest[0] != MP_OBJ_NULL) { if (dest[0] != MP_OBJ_NULL) {
@ -1454,27 +1454,67 @@ void *m_malloc_fail(size_t num_bytes) {
mp_raise_msg(&mp_type_MemoryError, "memory allocation failed, heap is locked"); mp_raise_msg(&mp_type_MemoryError, "memory allocation failed, heap is locked");
#endif #endif
} else { } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_MemoryError, mp_raise_msg_varg(&mp_type_MemoryError,
"memory allocation failed, allocating %u bytes", (uint)num_bytes)); "memory allocation failed, allocating %u bytes", (uint)num_bytes);
} }
} }
NORETURN void mp_raise_msg(const mp_obj_type_t *exc_type, const char *msg) { NORETURN void mp_raise_msg(const mp_obj_type_t *exc_type, const char *msg) {
nlr_raise(mp_obj_new_exception_msg(exc_type, msg)); nlr_raise(mp_obj_new_exception_msg_varg(exc_type, msg));
}
NORETURN void mp_raise_msg_varg(const mp_obj_type_t *exc_type, const char *fmt, ...) {
va_list argptr;
va_start(argptr,fmt);
mp_obj_t exception = mp_obj_new_exception_msg_varg(exc_type, fmt, argptr);
va_end(argptr);
nlr_raise(exception);
}
NORETURN void mp_raise_AttributeError(const char *msg) {
mp_raise_msg(&mp_type_AttributeError, msg);
}
NORETURN void mp_raise_RuntimeError(const char *msg) {
mp_raise_msg(&mp_type_RuntimeError, msg);
}
NORETURN void mp_raise_NotImplementError(const char *msg) {
mp_raise_msg(&mp_type_NotImplementedError, msg);
}
NORETURN void mp_raise_ImportError(const char *msg) {
mp_raise_msg(&mp_type_ImportError, msg);
}
NORETURN void mp_raise_IndexError(const char *msg) {
mp_raise_msg(&mp_type_IndexError, msg);
} }
NORETURN void mp_raise_ValueError(const char *msg) { NORETURN void mp_raise_ValueError(const char *msg) {
mp_raise_msg(&mp_type_ValueError, msg); mp_raise_msg(&mp_type_ValueError, msg);
} }
NORETURN void mp_raise_ValueError_varg(const char *fmt, ...) {
va_list argptr;
va_start(argptr,fmt);
mp_obj_t exception = mp_obj_new_exception_msg_varg(&mp_type_ValueError, fmt, argptr);
va_end(argptr);
nlr_raise(exception);
}
NORETURN void mp_raise_TypeError(const char *msg) { NORETURN void mp_raise_TypeError(const char *msg) {
mp_raise_msg(&mp_type_TypeError, msg); mp_raise_msg(&mp_type_TypeError, msg);
} }
NORETURN void mp_raise_TypeError_varg(const char *fmt, ...) {
va_list argptr;
va_start(argptr,fmt);
mp_obj_t exception = mp_obj_new_exception_msg_varg(&mp_type_TypeError, fmt, argptr);
va_end(argptr);
nlr_raise(exception);
}
NORETURN void mp_raise_OSError(int errno_) { NORETURN void mp_raise_OSError(int errno_) {
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(errno_))); nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(errno_)));
} }
NORETURN void mp_not_implemented(const char *msg) {
mp_raise_msg(&mp_type_NotImplementedError, msg);
}

10
py/runtime.h
View File

@ -135,11 +135,17 @@ mp_obj_t mp_import_from(mp_obj_t module, qstr name);
void mp_import_all(mp_obj_t module); void mp_import_all(mp_obj_t module);
NORETURN void mp_raise_msg(const mp_obj_type_t *exc_type, const char *msg); NORETURN void mp_raise_msg(const mp_obj_type_t *exc_type, const char *msg);
//NORETURN void nlr_raise_msg_varg(const mp_obj_type_t *exc_type, const char *fmt, ...); NORETURN void mp_raise_msg_varg(const mp_obj_type_t *exc_type, const char *fmt, ...);
NORETURN void mp_raise_ValueError(const char *msg); NORETURN void mp_raise_ValueError(const char *msg);
NORETURN void mp_raise_ValueError_varg(const char *fmt, ...);
NORETURN void mp_raise_TypeError(const char *msg); NORETURN void mp_raise_TypeError(const char *msg);
NORETURN void mp_raise_TypeError_varg(const char *fmt, ...);
NORETURN void mp_raise_AttributeError(const char *msg);
NORETURN void mp_raise_RuntimeError(const char *msg);
NORETURN void mp_raise_NotImplementError(const char *msg);
NORETURN void mp_raise_ImportError(const char *msg);
NORETURN void mp_raise_IndexError(const char *msg);
NORETURN void mp_raise_OSError(int errno_); NORETURN void mp_raise_OSError(int errno_);
NORETURN void mp_not_implemented(const char *msg); // Raise NotImplementedError with given message
NORETURN void mp_exc_recursion_depth(void); NORETURN void mp_exc_recursion_depth(void);
#if MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG #if MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG

2
py/sequence.c
View File

@ -256,7 +256,7 @@ mp_obj_t mp_seq_index_obj(const mp_obj_t *items, mp_uint_t len, mp_uint_t n_args
} }
} }
mp_raise_msg(&mp_type_ValueError, "object not in sequence"); mp_raise_ValueError("object not in sequence");
} }
mp_obj_t mp_seq_count_obj(const mp_obj_t *items, mp_uint_t len, mp_obj_t value) { mp_obj_t mp_seq_count_obj(const mp_obj_t *items, mp_uint_t len, mp_obj_t value) {

4
py/stackctrl.c
View File

@ -52,8 +52,8 @@ void mp_stack_set_limit(mp_uint_t limit) {
} }
void mp_exc_recursion_depth(void) { void mp_exc_recursion_depth(void) {
nlr_raise(mp_obj_new_exception_arg1(&mp_type_RuntimeError, mp_raise_RuntimeError(
MP_OBJ_NEW_QSTR(MP_QSTR_maximum_space_recursion_space_depth_space_exceeded))); MP_OBJ_NEW_QSTR(MP_QSTR_maximum_space_recursion_space_depth_space_exceeded));
} }
void mp_stack_check(void) { void mp_stack_check(void) {

4
py/stream.c
View File

@ -142,7 +142,7 @@ STATIC mp_obj_t stream_read_generic(size_t n_args, const mp_obj_t *args, byte fl
while (more_bytes > 0) { while (more_bytes > 0) {
char *p = vstr_add_len(&vstr, more_bytes); char *p = vstr_add_len(&vstr, more_bytes);
if (p == NULL) { if (p == NULL) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_MemoryError, "out of memory")); mp_raise_msg(&mp_type_MemoryError, "out of memory");
} }
int error; int error;
mp_uint_t out_sz = mp_stream_read_exactly(args[0], p, more_bytes, &error); mp_uint_t out_sz = mp_stream_read_exactly(args[0], p, more_bytes, &error);
@ -381,7 +381,7 @@ STATIC mp_obj_t stream_unbuffered_readline(size_t n_args, const mp_obj_t *args)
while (max_size == -1 || max_size-- != 0) { while (max_size == -1 || max_size-- != 0) {
char *p = vstr_add_len(&vstr, 1); char *p = vstr_add_len(&vstr, 1);
if (p == NULL) { if (p == NULL) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_MemoryError, "out of memory")); mp_raise_msg(&mp_type_MemoryError, "out of memory");
} }
int error; int error;

2
shared-bindings/bitbangio/I2C.c
View File

@ -100,7 +100,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitbangio_i2c_obj___exit___obj, 4, 4,
static void check_lock(bitbangio_i2c_obj_t *self) { static void check_lock(bitbangio_i2c_obj_t *self) {
if (!shared_module_bitbangio_i2c_has_lock(self)) { if (!shared_module_bitbangio_i2c_has_lock(self)) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Function requires I2C lock.")); mp_raise_RuntimeError("Function requires lock");
} }
} }

13
shared-bindings/bitbangio/SPI.c
View File

@ -33,6 +33,7 @@
#include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/microcontroller/Pin.h"
#include "lib/utils/context_manager_helpers.h" #include "lib/utils/context_manager_helpers.h"
#include "py/mperrno.h"
#include "py/runtime.h" #include "py/runtime.h"
//| .. currentmodule:: bitbangio //| .. currentmodule:: bitbangio
@ -113,7 +114,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitbangio_spi_obj___exit___obj, 4, 4,
static void check_lock(bitbangio_spi_obj_t *self) { static void check_lock(bitbangio_spi_obj_t *self) {
if (!shared_module_bitbangio_spi_has_lock(self)) { if (!shared_module_bitbangio_spi_has_lock(self)) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Function requires SPI lock.")); mp_raise_RuntimeError("Function requires lock");
} }
} }
@ -136,15 +137,15 @@ STATIC mp_obj_t bitbangio_spi_configure(size_t n_args, const mp_obj_t *pos_args,
uint8_t polarity = args[ARG_polarity].u_int; uint8_t polarity = args[ARG_polarity].u_int;
if (polarity != 0 && polarity != 1) { if (polarity != 0 && polarity != 1) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid polarity.")); mp_raise_ValueError("Invalid polarity");
} }
uint8_t phase = args[ARG_phase].u_int; uint8_t phase = args[ARG_phase].u_int;
if (phase != 0 && phase != 1) { if (phase != 0 && phase != 1) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid phase.")); mp_raise_ValueError("Invalid phase");
} }
uint8_t bits = args[ARG_bits].u_int; uint8_t bits = args[ARG_bits].u_int;
if (bits != 8 && bits != 9) { if (bits != 8 && bits != 9) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid number of bits.")); mp_raise_ValueError("Invalid number of bits");
} }
shared_module_bitbangio_spi_configure(self, args[ARG_baudrate].u_int, polarity, phase, bits); shared_module_bitbangio_spi_configure(self, args[ARG_baudrate].u_int, polarity, phase, bits);
@ -183,7 +184,7 @@ STATIC mp_obj_t bitbangio_spi_write(mp_obj_t self_in, mp_obj_t wr_buf) {
check_lock(self); check_lock(self);
bool ok = shared_module_bitbangio_spi_write(self, src.buf, src.len); bool ok = shared_module_bitbangio_spi_write(self, src.buf, src.len);
if (!ok) { if (!ok) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "SPI bus error")); mp_raise_OSError(MP_EIO);
} }
return mp_const_none; return mp_const_none;
} }
@ -200,7 +201,7 @@ STATIC mp_obj_t bitbangio_spi_readinto(size_t n_args, const mp_obj_t *args) {
check_lock(args[0]); check_lock(args[0]);
bool ok = shared_module_bitbangio_spi_read(args[0], bufinfo.buf, bufinfo.len); bool ok = shared_module_bitbangio_spi_read(args[0], bufinfo.buf, bufinfo.len);
if (!ok) { if (!ok) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "SPI bus error")); mp_raise_OSError(MP_EIO);
} }
return mp_const_none; return mp_const_none;
} }

3
shared-bindings/nativeio/AnalogOut.c
View File

@ -113,8 +113,7 @@ STATIC mp_obj_t nativeio_analogout_obj_set_value(mp_obj_t self_in, mp_obj_t valu
nativeio_analogout_obj_t *self = MP_OBJ_TO_PTR(self_in); nativeio_analogout_obj_t *self = MP_OBJ_TO_PTR(self_in);
uint32_t v = mp_obj_get_int(value); uint32_t v = mp_obj_get_int(value);
if (v >= (1 << 16)) { if (v >= (1 << 16)) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mp_raise_ValueError("AnalogOut is only 16 bits. Value must be less than 65536.");
"AnalogOut is only 16 bits. Value must be less than 65536."));
} }
common_hal_nativeio_analogout_set_value(self, v); common_hal_nativeio_analogout_set_value(self, v);
return mp_const_none; return mp_const_none;

15
shared-bindings/nativeio/DigitalInOut.c
View File

@ -220,8 +220,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(nativeio_digitalinout_get_value_obj, nativeio_digitali
STATIC mp_obj_t nativeio_digitalinout_obj_set_value(mp_obj_t self_in, mp_obj_t value) { STATIC mp_obj_t nativeio_digitalinout_obj_set_value(mp_obj_t self_in, mp_obj_t value) {
nativeio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in); nativeio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in);
if (common_hal_nativeio_digitalinout_get_direction(self) == DIRECTION_IN) { if (common_hal_nativeio_digitalinout_get_direction(self) == DIRECTION_IN) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mp_raise_AttributeError("Cannot set value when direction is input.");
"Cannot set value when direction is input."));
return mp_const_none; return mp_const_none;
} }
common_hal_nativeio_digitalinout_set_value(self, mp_obj_is_true(value)); common_hal_nativeio_digitalinout_set_value(self, mp_obj_is_true(value));
@ -243,8 +242,7 @@ mp_obj_property_t nativeio_digitalinout_value_obj = {
STATIC mp_obj_t nativeio_digitalinout_obj_get_drive_mode(mp_obj_t self_in) { STATIC mp_obj_t nativeio_digitalinout_obj_get_drive_mode(mp_obj_t self_in) {
nativeio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in); nativeio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in);
if (common_hal_nativeio_digitalinout_get_direction(self) == DIRECTION_IN) { if (common_hal_nativeio_digitalinout_get_direction(self) == DIRECTION_IN) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mp_raise_AttributeError("Drive mode not used when direction is input.");
"Drive mode not used when direction is input."));
return mp_const_none; return mp_const_none;
} }
enum digitalinout_drive_mode_t drive_mode = common_hal_nativeio_digitalinout_get_drive_mode(self); enum digitalinout_drive_mode_t drive_mode = common_hal_nativeio_digitalinout_get_drive_mode(self);
@ -258,8 +256,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(nativeio_digitalinout_get_drive_mode_obj, nativeio_dig
STATIC mp_obj_t nativeio_digitalinout_obj_set_drive_mode(mp_obj_t self_in, mp_obj_t drive_mode) { STATIC mp_obj_t nativeio_digitalinout_obj_set_drive_mode(mp_obj_t self_in, mp_obj_t drive_mode) {
nativeio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in); nativeio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in);
if (common_hal_nativeio_digitalinout_get_direction(self) == DIRECTION_IN) { if (common_hal_nativeio_digitalinout_get_direction(self) == DIRECTION_IN) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mp_raise_AttributeError("Drive mode not used when direction is input.");
"Drive mode not used when direction is input."));
return mp_const_none; return mp_const_none;
} }
enum digitalinout_drive_mode_t c_drive_mode = DRIVE_MODE_PUSH_PULL; enum digitalinout_drive_mode_t c_drive_mode = DRIVE_MODE_PUSH_PULL;
@ -287,8 +284,7 @@ mp_obj_property_t nativeio_digitalinout_drive_mode_obj = {
STATIC mp_obj_t nativeio_digitalinout_obj_get_pull(mp_obj_t self_in) { STATIC mp_obj_t nativeio_digitalinout_obj_get_pull(mp_obj_t self_in) {
nativeio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in); nativeio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in);
if (common_hal_nativeio_digitalinout_get_direction(self) == DIRECTION_OUT) { if (common_hal_nativeio_digitalinout_get_direction(self) == DIRECTION_OUT) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mp_raise_AttributeError("Pull not used when direction is output.");
"Pull not used when direction is output."));
return mp_const_none; return mp_const_none;
} }
enum digitalinout_pull_t pull = common_hal_nativeio_digitalinout_get_pull(self); enum digitalinout_pull_t pull = common_hal_nativeio_digitalinout_get_pull(self);
@ -304,8 +300,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(nativeio_digitalinout_get_pull_obj, nativeio_digitalin
STATIC mp_obj_t nativeio_digitalinout_obj_set_pull(mp_obj_t self_in, mp_obj_t pull_obj) { STATIC mp_obj_t nativeio_digitalinout_obj_set_pull(mp_obj_t self_in, mp_obj_t pull_obj) {
nativeio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in); nativeio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in);
if (common_hal_nativeio_digitalinout_get_direction(self) == DIRECTION_OUT) { if (common_hal_nativeio_digitalinout_get_direction(self) == DIRECTION_OUT) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mp_raise_AttributeError("Pull not used when direction is output.");
"Pull not used when direction is output."));
return mp_const_none; return mp_const_none;
} }
enum digitalinout_pull_t pull = PULL_NONE; enum digitalinout_pull_t pull = PULL_NONE;

2
shared-bindings/nativeio/I2C.c
View File

@ -109,7 +109,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(nativeio_i2c___exit___obj, 4, 4, nati
static void check_lock(nativeio_i2c_obj_t *self) { static void check_lock(nativeio_i2c_obj_t *self) {
if (!common_hal_nativeio_i2c_has_lock(self)) { if (!common_hal_nativeio_i2c_has_lock(self)) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Function requires I2C lock.")); mp_raise_RuntimeError("Function requires lock.");
} }
} }

8
shared-bindings/nativeio/PWMOut.c
View File

@ -155,9 +155,7 @@ STATIC mp_obj_t nativeio_pwmout_obj_set_duty_cycle(mp_obj_t self_in, mp_obj_t du
nativeio_pwmout_obj_t *self = MP_OBJ_TO_PTR(self_in); nativeio_pwmout_obj_t *self = MP_OBJ_TO_PTR(self_in);
mp_int_t duty = mp_obj_get_int(duty_cycle); mp_int_t duty = mp_obj_get_int(duty_cycle);
if (duty < 0 || duty > 0xffff) { if (duty < 0 || duty > 0xffff) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, mp_raise_ValueError("PWM duty must be between 0 and 65536 (16 bit resolution)");
"PWM duty must be between 0 and 65536 (16 bit resolution), not %d",
duty));
} }
common_hal_nativeio_pwmout_set_duty_cycle(self, duty); common_hal_nativeio_pwmout_set_duty_cycle(self, duty);
return mp_const_none; return mp_const_none;
@ -185,9 +183,9 @@ MP_DEFINE_CONST_FUN_OBJ_1(nativeio_pwmout_get_frequency_obj, nativeio_pwmout_obj
STATIC mp_obj_t nativeio_pwmout_obj_set_frequency(mp_obj_t self_in, mp_obj_t frequency) { STATIC mp_obj_t nativeio_pwmout_obj_set_frequency(mp_obj_t self_in, mp_obj_t frequency) {
nativeio_pwmout_obj_t *self = MP_OBJ_TO_PTR(self_in); nativeio_pwmout_obj_t *self = MP_OBJ_TO_PTR(self_in);
if (!common_hal_nativeio_pwmout_get_variable_frequency(self)) { if (!common_hal_nativeio_pwmout_get_variable_frequency(self)) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_AttributeError, mp_raise_AttributeError(
"PWM frequency not writeable when variable_frequency is False on " "PWM frequency not writeable when variable_frequency is False on "
"construction.")); "construction.");
} }
common_hal_nativeio_pwmout_set_frequency(self, mp_obj_get_int(frequency)); common_hal_nativeio_pwmout_set_frequency(self, mp_obj_get_int(frequency));
return mp_const_none; return mp_const_none;

15
shared-bindings/nativeio/SPI.c
View File

@ -33,6 +33,7 @@
#include "shared-bindings/nativeio/SPI.h" #include "shared-bindings/nativeio/SPI.h"
#include "lib/utils/context_manager_helpers.h" #include "lib/utils/context_manager_helpers.h"
#include "py/mperrno.h"
#include "py/nlr.h" #include "py/nlr.h"
#include "py/runtime.h" #include "py/runtime.h"
@ -124,7 +125,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(nativeio_spi_obj___exit___obj, 4, 4,
static void check_lock(nativeio_spi_obj_t *self) { static void check_lock(nativeio_spi_obj_t *self) {
if (!common_hal_nativeio_spi_has_lock(self)) { if (!common_hal_nativeio_spi_has_lock(self)) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Function requires SPI lock.")); mp_raise_RuntimeError("Function requires lock");
} }
} }
@ -147,20 +148,20 @@ STATIC mp_obj_t nativeio_spi_configure(size_t n_args, const mp_obj_t *pos_args,
uint8_t polarity = args[ARG_polarity].u_int; uint8_t polarity = args[ARG_polarity].u_int;
if (polarity != 0 && polarity != 1) { if (polarity != 0 && polarity != 1) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid polarity.")); mp_raise_ValueError("Invalid polarity");
} }
uint8_t phase = args[ARG_phase].u_int; uint8_t phase = args[ARG_phase].u_int;
if (phase != 0 && phase != 1) { if (phase != 0 && phase != 1) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid phase.")); mp_raise_ValueError("Invalid phase");
} }
uint8_t bits = args[ARG_bits].u_int; uint8_t bits = args[ARG_bits].u_int;
if (bits != 8 && bits != 9) { if (bits != 8 && bits != 9) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid number of bits.")); mp_raise_ValueError("Invalid number of bits");
} }
if (!common_hal_nativeio_spi_configure(self, args[ARG_baudrate].u_int, if (!common_hal_nativeio_spi_configure(self, args[ARG_baudrate].u_int,
polarity, phase, bits)) { polarity, phase, bits)) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "SPI configure failed.")); mp_raise_OSError(MP_EIO);
} }
return mp_const_none; return mp_const_none;
} }
@ -222,7 +223,7 @@ STATIC mp_obj_t nativeio_spi_write(size_t n_args, const mp_obj_t *pos_args, mp_m
bool ok = common_hal_nativeio_spi_write(self, ((uint8_t*)bufinfo.buf) + start, len); bool ok = common_hal_nativeio_spi_write(self, ((uint8_t*)bufinfo.buf) + start, len);
if (!ok) { if (!ok) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "SPI bus error")); mp_raise_OSError(MP_EIO);
} }
return mp_const_none; return mp_const_none;
} }
@ -267,7 +268,7 @@ STATIC mp_obj_t nativeio_spi_readinto(size_t n_args, const mp_obj_t *pos_args, m
bool ok = common_hal_nativeio_spi_read(self, ((uint8_t*)bufinfo.buf) + start, len, args[ARG_write_value].u_int); bool ok = common_hal_nativeio_spi_read(self, ((uint8_t*)bufinfo.buf) + start, len, args[ARG_write_value].u_int);
if (!ok) { if (!ok) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "SPI bus error")); mp_raise_OSError(MP_EIO);
} }
return mp_const_none; return mp_const_none;
} }

6
shared-bindings/nativeio/UART.c
View File

@ -92,8 +92,7 @@ STATIC mp_obj_t nativeio_uart_make_new(const mp_obj_type_t *type, size_t n_args,
uint8_t bits = args[ARG_bits].u_int; uint8_t bits = args[ARG_bits].u_int;
if (bits < 7 || bits > 9) { if (bits < 7 || bits > 9) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mp_raise_ValueError("bits must be 7, 8 or 9");
"bits must be 7, 8 or 9"));
} }
uart_parity_t parity = PARITY_NONE; uart_parity_t parity = PARITY_NONE;
@ -105,8 +104,7 @@ STATIC mp_obj_t nativeio_uart_make_new(const mp_obj_type_t *type, size_t n_args,
uint8_t stop = args[ARG_stop].u_int; uint8_t stop = args[ARG_stop].u_int;
if (stop != 1 && stop != 2) { if (stop != 1 && stop != 2) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mp_raise_ValueError("stop must be 1 or 2");
"stop must be 1 or 2"));
} }
common_hal_nativeio_uart_construct(self, tx, rx, common_hal_nativeio_uart_construct(self, tx, rx,

6
shared-bindings/time/__init__.c
View File

@ -69,7 +69,7 @@ STATIC mp_obj_t time_sleep(mp_obj_t seconds_o) {
int seconds = mp_obj_get_int(seconds_o); int seconds = mp_obj_get_int(seconds_o);
#endif #endif
if (seconds < 0) { if (seconds < 0) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "sleep length must be non-negative")); mp_raise_ValueError("sleep length must be non-negative");
} }
common_hal_time_delay_ms(1000 * seconds); common_hal_time_delay_ms(1000 * seconds);
return mp_const_none; return mp_const_none;
@ -79,10 +79,10 @@ MP_DEFINE_CONST_FUN_OBJ_1(time_sleep_obj, time_sleep);
#if MICROPY_PY_COLLECTIONS #if MICROPY_PY_COLLECTIONS
mp_obj_t struct_time_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { mp_obj_t struct_time_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
if (n_args != 1) { if (n_args != 1) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "time.struct_time() takes exactly 1 argument")); mp_raise_TypeError("time.struct_time() takes exactly 1 argument");
} }
if (!MP_OBJ_IS_TYPE(args[0], &mp_type_tuple) || ((mp_obj_tuple_t*) MP_OBJ_TO_PTR(args[0]))->len != 9) { if (!MP_OBJ_IS_TYPE(args[0], &mp_type_tuple) || ((mp_obj_tuple_t*) MP_OBJ_TO_PTR(args[0]))->len != 9) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "time.struct_time() takes a 9-sequence")); mp_raise_TypeError("time.struct_time() takes a 9-sequence");
} }
mp_obj_tuple_t* tuple = MP_OBJ_TO_PTR(args[0]); mp_obj_tuple_t* tuple = MP_OBJ_TO_PTR(args[0]);

2
unix/modjni.c
View File

@ -268,7 +268,7 @@ STATIC mp_obj_t jobject_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value)
return mp_const_none; return mp_const_none;
} }
} }
mp_not_implemented(""); mp_raise_NotImplementError("");
} }
if (!JJ(IsInstanceOf, self->obj, List_class)) { if (!JJ(IsInstanceOf, self->obj, List_class)) {