Epictetus
diff --git a/‎.github/workflows/build.yml‎
Lines changed: 1 addition & 0 deletions b/‎.github/workflows/build.yml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎extmod/machine_mem.c‎
Lines changed: 1 addition & 1 deletion b/‎extmod/machine_mem.c‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎extmod/moduheapq.c‎
Lines changed: 1 addition & 1 deletion b/‎extmod/moduheapq.c‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎extmod/modure.c‎
Lines changed: 3 additions & 3 deletions b/‎extmod/modure.c‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎extmod/moduzlib.c‎
Lines changed: 1 addition & 1 deletion b/‎extmod/moduzlib.c‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎extmod/ulab‎ b/‎extmod/ulab‎
diff --git a/‎extmod/vfs_posix_file.c‎
Lines changed: 1 addition & 1 deletion b/‎extmod/vfs_posix_file.c‎
Lines changed: 1 addition & 1 deletion
@@ -198,6 +198,7 @@ jobs:
         - "circuitplayground_express_displayio"
         - "clue_nrf52840_express"
         - "cp32-m4"
+        - "cp_sapling_m0"
         - "datalore_ip_m4"
         - "datum_distance"
         - "datum_imu"
 
@@ -21,7 +21,7 @@
 STATIC uintptr_t machine_mem_get_addr(mp_obj_t addr_o, uint align) {
     uintptr_t addr = mp_obj_int_get_truncated(addr_o);
     if ((addr & (align - 1)) != 0) {
-        nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, translate("address %08x is not aligned to %d bytes"), addr, align));
+        mp_raise_ValueError_varg(translate("address %08x is not aligned to %d bytes"), addr, align);
     }
     return addr;
 }
 
@@ -62,7 +62,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_uheapq_heappush_obj, mod_uheapq_heappush);
 STATIC mp_obj_t mod_uheapq_heappop(mp_obj_t heap_in) {
     mp_obj_list_t *heap = get_heap(heap_in);
     if (heap->len == 0) {
-        nlr_raise(mp_obj_new_exception_msg(&mp_type_IndexError, translate("empty heap")));
+        mp_raise_IndexError(translate("empty heap"));
     }
     mp_obj_t item = heap->items[0];
     heap->len -= 1;
 
@@ -43,7 +43,7 @@ STATIC mp_obj_t match_group(mp_obj_t self_in, mp_obj_t no_in) {
     mp_obj_match_t *self = MP_OBJ_TO_PTR(self_in);
     mp_int_t no = mp_obj_get_int(no_in);
     if (no < 0 || no >= self->num_matches) {
-        nlr_raise(mp_obj_new_exception_arg1(&mp_type_IndexError, no_in));
+        mp_raise_arg1(&mp_type_IndexError, no_in);
     }
 
     const char *start = self->caps[no * 2];
@@ -82,7 +82,7 @@ STATIC void match_span_helper(size_t n_args, const mp_obj_t *args, mp_obj_t span
     if (n_args == 2) {
         no = mp_obj_get_int(args[1]);
         if (no < 0 || no >= self->num_matches) {
-            nlr_raise(mp_obj_new_exception_arg1(&mp_type_IndexError, args[1]));
+            mp_raise_arg1(&mp_type_IndexError, args[1]);
         }
     }
 
@@ -326,7 +326,7 @@ STATIC mp_obj_t re_sub_helper(mp_obj_t self_in, size_t n_args, const mp_obj_t *a
                     }
 
                     if (match_no >= (unsigned int)match->num_matches) {
-                        nlr_raise(mp_obj_new_exception_arg1(&mp_type_IndexError, MP_OBJ_NEW_SMALL_INT(match_no)));
+                        mp_raise_arg1(&mp_type_IndexError, MP_OBJ_NEW_SMALL_INT(match_no));
                     }
 
                     const char *start_match = match->caps[match_no * 2];
 
@@ -179,7 +179,7 @@ STATIC mp_obj_t mod_uzlib_decompress(size_t n_args, const mp_obj_t *args) {
     return res;
 
 error:
-        nlr_raise(mp_obj_new_exception_arg1(&mp_type_ValueError, MP_OBJ_NEW_SMALL_INT(st)));
+    mp_raise_arg1(&mp_type_ValueError, MP_OBJ_NEW_SMALL_INT(st));
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_uzlib_decompress_obj, 1, 3, mod_uzlib_decompress);
 
 
@@ -24,7 +24,7 @@ typedef struct _mp_obj_vfs_posix_file_t {
 #ifdef MICROPY_CPYTHON_COMPAT
 STATIC void check_fd_is_open(const mp_obj_vfs_posix_file_t *o) {
     if (o->fd < 0) {
-        nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, translate("I/O operation on closed file")));
+        mp_raise_ValueError(translate("I/O operation on closed file"));
     }
 }
 #else
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`STATIC uintptr_t machine_mem_get_addr(mp_obj_t addr_o, uint align) {`
`22`	`22`	`uintptr_t addr = mp_obj_int_get_truncated(addr_o);`
`23`	`23`	`if ((addr & (align - 1)) != 0) {`
`24`		`- nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, translate("address %08x is not aligned to %d bytes"), addr, align));`
	`24`	`+ mp_raise_ValueError_varg(translate("address %08x is not aligned to %d bytes"), addr, align);`
`25`	`25`	`}`
`26`	`26`	`return addr;`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_uheapq_heappush_obj, mod_uheapq_heappush);`
`62`	`62`	`STATIC mp_obj_t mod_uheapq_heappop(mp_obj_t heap_in) {`
`63`	`63`	`mp_obj_list_t *heap = get_heap(heap_in);`
`64`	`64`	`if (heap->len == 0) {`
`65`		`- nlr_raise(mp_obj_new_exception_msg(&mp_type_IndexError, translate("empty heap")));`
	`65`	`+ mp_raise_IndexError(translate("empty heap"));`
`66`	`66`	`}`
`67`	`67`	`mp_obj_t item = heap->items[0];`
`68`	`68`	`heap->len -= 1;`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ STATIC mp_obj_t match_group(mp_obj_t self_in, mp_obj_t no_in) {`
`43`	`43`	`mp_obj_match_t *self = MP_OBJ_TO_PTR(self_in);`
`44`	`44`	`mp_int_t no = mp_obj_get_int(no_in);`
`45`	`45`	`if (no < 0 \|\| no >= self->num_matches) {`
`46`		`- nlr_raise(mp_obj_new_exception_arg1(&mp_type_IndexError, no_in));`
	`46`	`+ mp_raise_arg1(&mp_type_IndexError, no_in);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`const char start = self->caps[no 2];`
`@@ -82,7 +82,7 @@ STATIC void match_span_helper(size_t n_args, const mp_obj_t *args, mp_obj_t span`
`82`	`82`	`if (n_args == 2) {`
`83`	`83`	`no = mp_obj_get_int(args[1]);`
`84`	`84`	`if (no < 0 \|\| no >= self->num_matches) {`
`85`		`- nlr_raise(mp_obj_new_exception_arg1(&mp_type_IndexError, args[1]));`
	`85`	`+ mp_raise_arg1(&mp_type_IndexError, args[1]);`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
`@@ -326,7 +326,7 @@ STATIC mp_obj_t re_sub_helper(mp_obj_t self_in, size_t n_args, const mp_obj_t *a`
`326`	`326`	`}`
`327`	`327`
`328`	`328`	`if (match_no >= (unsigned int)match->num_matches) {`
`329`		`- nlr_raise(mp_obj_new_exception_arg1(&mp_type_IndexError, MP_OBJ_NEW_SMALL_INT(match_no)));`
	`329`	`+ mp_raise_arg1(&mp_type_IndexError, MP_OBJ_NEW_SMALL_INT(match_no));`
`330`	`330`	`}`
`331`	`331`
`332`	`332`	`const char start_match = match->caps[match_no 2];`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ STATIC mp_obj_t mod_uzlib_decompress(size_t n_args, const mp_obj_t *args) {`
`179`	`179`	`return res;`
`180`	`180`
`181`	`181`	`error:`
`182`		`- nlr_raise(mp_obj_new_exception_arg1(&mp_type_ValueError, MP_OBJ_NEW_SMALL_INT(st)));`
	`182`	`+ mp_raise_arg1(&mp_type_ValueError, MP_OBJ_NEW_SMALL_INT(st));`
`183`	`183`	`}`
`184`	`184`	`STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_uzlib_decompress_obj, 1, 3, mod_uzlib_decompress);`
`185`	`185`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ typedef struct _mp_obj_vfs_posix_file_t {`
`24`	`24`	`#ifdef MICROPY_CPYTHON_COMPAT`
`25`	`25`	`STATIC void check_fd_is_open(const mp_obj_vfs_posix_file_t *o) {`
`26`	`26`	`if (o->fd < 0) {`
`27`		`- nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, translate("I/O operation on closed file")));`
	`27`	`+ mp_raise_ValueError(translate("I/O operation on closed file"));`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`#else`