@@ -1522,12 +1522,16 @@ NORETURN void mp_raise_msg(const mp_obj_type_t *exc_type, const compressed_strin
1522
1522
}
1523
1523
}
1524
1524
1525
+ NORETURN void mp_raise_msg_vlist (const mp_obj_type_t * exc_type , const compressed_string_t * fmt , va_list argptr ) {
1526
+ mp_obj_t exception = mp_obj_new_exception_msg_vlist (exc_type , fmt , argptr );
1527
+ nlr_raise (exception );
1528
+ }
1529
+
1525
1530
NORETURN void mp_raise_msg_varg (const mp_obj_type_t * exc_type , const compressed_string_t * fmt , ...) {
1526
1531
va_list argptr ;
1527
1532
va_start (argptr ,fmt );
1528
- mp_obj_t exception = mp_obj_new_exception_msg_vlist (exc_type , fmt , argptr );
1533
+ mp_raise_msg_vlist (exc_type , fmt , argptr );
1529
1534
va_end (argptr );
1530
- nlr_raise (exception );
1531
1535
}
1532
1536
1533
1537
NORETURN void mp_raise_AttributeError (const compressed_string_t * msg ) {
@@ -1549,9 +1553,8 @@ NORETURN void mp_raise_IndexError(const compressed_string_t *msg) {
1549
1553
NORETURN void mp_raise_IndexError_varg (const compressed_string_t * fmt , ...) {
1550
1554
va_list argptr ;
1551
1555
va_start (argptr ,fmt );
1552
- mp_obj_t exception = mp_obj_new_exception_msg_vlist (& mp_type_IndexError , fmt , argptr );
1556
+ mp_raise_msg_vlist (& mp_type_IndexError , fmt , argptr );
1553
1557
va_end (argptr );
1554
- nlr_raise (exception );
1555
1558
}
1556
1559
1557
1560
NORETURN void mp_raise_ValueError (const compressed_string_t * msg ) {
@@ -1561,9 +1564,8 @@ NORETURN void mp_raise_ValueError(const compressed_string_t *msg) {
1561
1564
NORETURN void mp_raise_ValueError_varg (const compressed_string_t * fmt , ...) {
1562
1565
va_list argptr ;
1563
1566
va_start (argptr ,fmt );
1564
- mp_obj_t exception = mp_obj_new_exception_msg_vlist (& mp_type_ValueError , fmt , argptr );
1567
+ mp_raise_msg_vlist (& mp_type_ValueError , fmt , argptr );
1565
1568
va_end (argptr );
1566
- nlr_raise (exception );
1567
1569
}
1568
1570
1569
1571
NORETURN void mp_raise_TypeError (const compressed_string_t * msg ) {
@@ -1573,9 +1575,8 @@ NORETURN void mp_raise_TypeError(const compressed_string_t *msg) {
1573
1575
NORETURN void mp_raise_TypeError_varg (const compressed_string_t * fmt , ...) {
1574
1576
va_list argptr ;
1575
1577
va_start (argptr ,fmt );
1576
- mp_obj_t exception = mp_obj_new_exception_msg_vlist (& mp_type_TypeError , fmt , argptr );
1578
+ mp_raise_msg_vlist (& mp_type_TypeError , fmt , argptr );
1577
1579
va_end (argptr );
1578
- nlr_raise (exception );
1579
1580
}
1580
1581
1581
1582
NORETURN void mp_raise_OSError (int errno_ ) {
@@ -1597,9 +1598,8 @@ NORETURN void mp_raise_OSError_errno_str(int errno_, mp_obj_t str) {
1597
1598
NORETURN void mp_raise_OSError_msg_varg (const compressed_string_t * fmt , ...) {
1598
1599
va_list argptr ;
1599
1600
va_start (argptr ,fmt );
1600
- mp_obj_t exception = mp_obj_new_exception_msg_vlist (& mp_type_OSError , fmt , argptr );
1601
+ mp_raise_msg_vlist (& mp_type_OSError , fmt , argptr );
1601
1602
va_end (argptr );
1602
- nlr_raise (exception );
1603
1603
}
1604
1604
1605
1605
NORETURN void mp_raise_NotImplementedError (const compressed_string_t * msg ) {
@@ -1609,17 +1609,15 @@ NORETURN void mp_raise_NotImplementedError(const compressed_string_t *msg) {
1609
1609
NORETURN void mp_raise_NotImplementedError_varg (const compressed_string_t * fmt , ...) {
1610
1610
va_list argptr ;
1611
1611
va_start (argptr ,fmt );
1612
- mp_obj_t exception = mp_obj_new_exception_msg_vlist (& mp_type_NotImplementedError , fmt , argptr );
1612
+ mp_raise_msg_vlist (& mp_type_NotImplementedError , fmt , argptr );
1613
1613
va_end (argptr );
1614
- nlr_raise (exception );
1615
1614
}
1616
1615
1617
1616
NORETURN void mp_raise_OverflowError_varg (const compressed_string_t * fmt , ...) {
1618
1617
va_list argptr ;
1619
1618
va_start (argptr ,fmt );
1620
- mp_obj_t exception = mp_obj_new_exception_msg_vlist (& mp_type_OverflowError , fmt , argptr );
1619
+ mp_raise_msg_vlist (& mp_type_OverflowError , fmt , argptr );
1621
1620
va_end (argptr );
1622
- nlr_raise (exception );
1623
1621
}
1624
1622
1625
1623
NORETURN void mp_raise_MpyError (const compressed_string_t * msg ) {
0 commit comments