Combine 'index out of range' messages

jepler · jepler · commit 549632abf5c1 · 2020-08-04T13:58:29.000-05:00
diff --git a/extmod/moductypes.c b/extmod/moductypes.c
@@ -520,7 +520,7 @@ STATIC mp_obj_t uctypes_struct_subscr(mp_obj_t base_in, mp_obj_t index_in, mp_ob
             uint val_type = GET_TYPE(arr_sz, VAL_TYPE_BITS);
             arr_sz &= VALUE_MASK(VAL_TYPE_BITS);
             if (index >= arr_sz) {
-                nlr_raise(mp_obj_new_exception_msg(&mp_type_IndexError, translate("struct: index out of range")));
+                mp_raise_IndexError_varg(translate("%q index out of range"), MP_QSTR_struct);
             }
 
             if (t->len == 2) {
diff --git a/ports/atmel-samd/common-hal/pulseio/PulseIn.c b/ports/atmel-samd/common-hal/pulseio/PulseIn.c
@@ -330,7 +330,7 @@ uint16_t common_hal_pulseio_pulsein_get_item(pulseio_pulsein_obj_t* self,
     }
     if (index < 0 || index >= self->len) {
         common_hal_mcu_enable_interrupts();
-        mp_raise_IndexError(translate("index out of range"));
+        mp_raise_IndexError_varg(translate("%q index out of range"), MP_QSTR_PulseIn);
     }
     uint16_t value = self->buffer[(self->start + index) % self->maxlen];
     common_hal_mcu_enable_interrupts();
diff --git a/ports/cxd56/common-hal/pulseio/PulseIn.c b/ports/cxd56/common-hal/pulseio/PulseIn.c
@@ -190,7 +190,7 @@ uint16_t common_hal_pulseio_pulsein_get_item(pulseio_pulsein_obj_t *self, int16_
     }
     if (index < 0 || index >= self->len) {
         common_hal_mcu_enable_interrupts();
-        mp_raise_IndexError(translate("index out of range"));
+        mp_raise_IndexError_varg(translate("%q index out of range"), MP_QSTR_PulseIn);
     }
     uint16_t value = self->buffer[(self->start + index) % self->maxlen];
     common_hal_mcu_enable_interrupts();
diff --git a/ports/mimxrt10xx/common-hal/pulseio/PulseIn.c b/ports/mimxrt10xx/common-hal/pulseio/PulseIn.c
@@ -237,7 +237,7 @@ uint16_t common_hal_pulseio_pulsein_get_item(pulseio_pulsein_obj_t* self,
 //    }
 //    if (index < 0 || index >= self->len) {
 //        common_hal_mcu_enable_interrupts();
-//        mp_raise_IndexError(translate("index out of range"));
+//        mp_raise_IndexError_varg(translate("%q index out of range"), MP_QSTR_PulseIn);
 //    }
 //    uint16_t value = self->buffer[(self->start + index) % self->maxlen];
 //    common_hal_mcu_enable_interrupts();
diff --git a/ports/nrf/common-hal/pulseio/PulseIn.c b/ports/nrf/common-hal/pulseio/PulseIn.c
@@ -271,7 +271,7 @@ uint16_t common_hal_pulseio_pulsein_get_item(pulseio_pulsein_obj_t* self, int16_
         if ( !self->paused ) {
             nrfx_gpiote_in_event_enable(self->pin, true);
         }
-        mp_raise_IndexError(translate("index out of range"));
+        mp_raise_IndexError_varg(translate("%q index out of range"), MP_QSTR_PulseIn);
     }
     uint16_t value = self->buffer[(self->start + index) % self->maxlen];
 
diff --git a/ports/stm/common-hal/pulseio/PulseIn.c b/ports/stm/common-hal/pulseio/PulseIn.c
@@ -249,7 +249,7 @@ uint16_t common_hal_pulseio_pulsein_get_item(pulseio_pulsein_obj_t* self, int16_
     }
     if (index < 0 || index >= self->len) {
         HAL_NVIC_EnableIRQ(self->irq);
-        mp_raise_IndexError(translate("index out of range"));
+        mp_raise_IndexError_varg(translate("%q index out of range"), MP_QSTR_PulseIn);
     }
     uint16_t value = self->buffer[(self->start + index) % self->maxlen];
     HAL_NVIC_EnableIRQ(self->irq);
diff --git a/py/objstr.c b/py/objstr.c
@@ -1076,7 +1076,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);
                 if ((uint)index >= n_args - 1) {
-                    mp_raise_IndexError(translate("tuple index out of range"));
+                    mp_raise_IndexError_varg(translate("%q index out of range"), MP_QSTR_tuple);
                 }
                 arg = args[index + 1];
                 *arg_i = -1;
@@ -1104,7 +1104,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
                 }
             }
             if ((uint)*arg_i >= n_args - 1) {
-                mp_raise_IndexError(translate("tuple index out of range"));
+                mp_raise_IndexError_varg(translate("%q index out of range"), MP_QSTR_tuple);
             }
             arg = args[(*arg_i) + 1];
             (*arg_i)++;
diff --git a/py/objstrunicode.c b/py/objstrunicode.c
@@ -162,7 +162,7 @@ const byte *str_index_to_ptr(const mp_obj_type_t *type, const byte *self_data, s
                 if (is_slice) {
                     return self_data;
                 }
-                mp_raise_IndexError(translate("string index out of range"));
+                mp_raise_IndexError_varg(translate("%q index out of range"), MP_QSTR_str);
             }
             if (!UTF8_IS_CONT(*s)) {
                 ++i;
@@ -181,7 +181,7 @@ const byte *str_index_to_ptr(const mp_obj_type_t *type, const byte *self_data, s
                 if (is_slice) {
                     return top;
                 }
-                mp_raise_IndexError(translate("string index out of range"));
+                mp_raise_IndexError_varg(translate("%q index out of range"), MP_QSTR_str);
             }
             // Then check completion
             if (i-- == 0) {

Original file line number	Diff line number	Diff line change
`@@ -520,7 +520,7 @@ STATIC mp_obj_t uctypes_struct_subscr(mp_obj_t base_in, mp_obj_t index_in, mp_ob`
`520`	`520`	`uint val_type = GET_TYPE(arr_sz, VAL_TYPE_BITS);`
`521`	`521`	`arr_sz &= VALUE_MASK(VAL_TYPE_BITS);`
`522`	`522`	`if (index >= arr_sz) {`
`523`		`- nlr_raise(mp_obj_new_exception_msg(&mp_type_IndexError, translate("struct: index out of range")));`
	`523`	`+ mp_raise_IndexError_varg(translate("%q index out of range"), MP_QSTR_struct);`
`524`	`524`	`}`
`525`	`525`
`526`	`526`	`if (t->len == 2) {`
Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ uint16_t common_hal_pulseio_pulsein_get_item(pulseio_pulsein_obj_t* self,`
`330`	`330`	`}`
`331`	`331`	`if (index < 0 \|\| index >= self->len) {`
`332`	`332`	`common_hal_mcu_enable_interrupts();`
`333`		`- mp_raise_IndexError(translate("index out of range"));`
	`333`	`+ mp_raise_IndexError_varg(translate("%q index out of range"), MP_QSTR_PulseIn);`
`334`	`334`	`}`
`335`	`335`	`uint16_t value = self->buffer[(self->start + index) % self->maxlen];`
`336`	`336`	`common_hal_mcu_enable_interrupts();`
Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ uint16_t common_hal_pulseio_pulsein_get_item(pulseio_pulsein_obj_t *self, int16_`
`190`	`190`	`}`
`191`	`191`	`if (index < 0 \|\| index >= self->len) {`
`192`	`192`	`common_hal_mcu_enable_interrupts();`
`193`		`- mp_raise_IndexError(translate("index out of range"));`
	`193`	`+ mp_raise_IndexError_varg(translate("%q index out of range"), MP_QSTR_PulseIn);`
`194`	`194`	`}`
`195`	`195`	`uint16_t value = self->buffer[(self->start + index) % self->maxlen];`
`196`	`196`	`common_hal_mcu_enable_interrupts();`
Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ uint16_t common_hal_pulseio_pulsein_get_item(pulseio_pulsein_obj_t* self, int16_`
`271`	`271`	`if ( !self->paused ) {`
`272`	`272`	`nrfx_gpiote_in_event_enable(self->pin, true);`
`273`	`273`	`}`
`274`		`- mp_raise_IndexError(translate("index out of range"));`
	`274`	`+ mp_raise_IndexError_varg(translate("%q index out of range"), MP_QSTR_PulseIn);`
`275`	`275`	`}`
`276`	`276`	`uint16_t value = self->buffer[(self->start + index) % self->maxlen];`
`277`	`277`
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ uint16_t common_hal_pulseio_pulsein_get_item(pulseio_pulsein_obj_t* self, int16_`
`249`	`249`	`}`
`250`	`250`	`if (index < 0 \|\| index >= self->len) {`
`251`	`251`	`HAL_NVIC_EnableIRQ(self->irq);`
`252`		`- mp_raise_IndexError(translate("index out of range"));`
	`252`	`+ mp_raise_IndexError_varg(translate("%q index out of range"), MP_QSTR_PulseIn);`
`253`	`253`	`}`
`254`	`254`	`uint16_t value = self->buffer[(self->start + index) % self->maxlen];`
`255`	`255`	`HAL_NVIC_EnableIRQ(self->irq);`
Original file line number	Diff line number	Diff line change
`@@ -1076,7 +1076,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char str, const char top, int *ar`
`1076`	`1076`	`}`
`1077`	`1077`	`field_name = str_to_int(field_name, field_name_top, &index);`
`1078`	`1078`	`if ((uint)index >= n_args - 1) {`
`1079`		`- mp_raise_IndexError(translate("tuple index out of range"));`
	`1079`	`+ mp_raise_IndexError_varg(translate("%q index out of range"), MP_QSTR_tuple);`
`1080`	`1080`	`}`
`1081`	`1081`	`arg = args[index + 1];`
`1082`	`1082`	`*arg_i = -1;`
`@@ -1104,7 +1104,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char str, const char top, int *ar`
`1104`	`1104`	`}`
`1105`	`1105`	`}`
`1106`	`1106`	`if ((uint)*arg_i >= n_args - 1) {`
`1107`		`- mp_raise_IndexError(translate("tuple index out of range"));`
	`1107`	`+ mp_raise_IndexError_varg(translate("%q index out of range"), MP_QSTR_tuple);`
`1108`	`1108`	`}`
`1109`	`1109`	`arg = args[(*arg_i) + 1];`
`1110`	`1110`	`(*arg_i)++;`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ const byte str_index_to_ptr(const mp_obj_type_t type, const byte *self_data, s`
`162`	`162`	`if (is_slice) {`
`163`	`163`	`return self_data;`
`164`	`164`	`}`
`165`		`- mp_raise_IndexError(translate("string index out of range"));`
	`165`	`+ mp_raise_IndexError_varg(translate("%q index out of range"), MP_QSTR_str);`
`166`	`166`	`}`
`167`	`167`	`if (!UTF8_IS_CONT(*s)) {`
`168`	`168`	`++i;`
`@@ -181,7 +181,7 @@ const byte str_index_to_ptr(const mp_obj_type_t type, const byte *self_data, s`
`181`	`181`	`if (is_slice) {`
`182`	`182`	`return top;`
`183`	`183`	`}`
`184`		`- mp_raise_IndexError(translate("string index out of range"));`
	`184`	`+ mp_raise_IndexError_varg(translate("%q index out of range"), MP_QSTR_str);`
`185`	`185`	`}`
`186`	`186`	`// Then check completion`
`187`	`187`	`if (i-- == 0) {`