py/modstruct: Use more compact mp_raise_ValueError function.

dpgeorge · dpgeorge · commit fe3cc5bb5319 · 2016-08-26T23:42:40.000+10:00
Saves a few bytes of code size.
diff --git a/py/modstruct.c b/py/modstruct.c
@@ -114,7 +114,7 @@ STATIC mp_obj_t struct_calcsize(mp_obj_t fmt_in) {
             mp_uint_t align;
             size_t sz = mp_binary_get_size(fmt_type, *fmt, &align);
             if (sz == 0) {
-                nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "unsupported format"));
+                mp_raise_ValueError("unsupported format");
             }
             while (cnt--) {
                 // Apply alignment
@@ -149,7 +149,7 @@ STATIC mp_obj_t struct_unpack_from(size_t n_args, const mp_obj_t *args) {
             // negative offsets are relative to the end of the buffer
             offset = bufinfo.len + offset;
             if (offset < 0) {
-                nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "buffer too small"));
+                mp_raise_ValueError("buffer too small");
             }
         }
         p += offset;
@@ -164,7 +164,7 @@ STATIC mp_obj_t struct_unpack_from(size_t n_args, const mp_obj_t *args) {
             sz = get_fmt_num(&fmt);
         }
         if (p + sz > end_p) {
-            nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "buffer too small"));
+            mp_raise_ValueError("buffer too small");
         }
         mp_obj_t item;
         if (*fmt == 's') {
@@ -197,7 +197,7 @@ STATIC void struct_pack_into_internal(mp_obj_t fmt_in, byte *p, byte* end_p, siz
             sz = get_fmt_num(&fmt);
         }
         if (p + sz > end_p) {
-            nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "buffer too small"));
+            mp_raise_ValueError("buffer too small");
         }
 
         if (*fmt == 's') {
@@ -240,7 +240,7 @@ STATIC mp_obj_t struct_pack_into(size_t n_args, const mp_obj_t *args) {
         // negative offsets are relative to the end of the buffer
         offset = (mp_int_t)bufinfo.len + offset;
         if (offset < 0) {
-            nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "buffer too small"));
+            mp_raise_ValueError("buffer too small");
         }
     }
     byte *p = (byte *)bufinfo.buf;

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ STATIC mp_obj_t struct_calcsize(mp_obj_t fmt_in) {`
`114`	`114`	`mp_uint_t align;`
`115`	`115`	`size_t sz = mp_binary_get_size(fmt_type, *fmt, &align);`
`116`	`116`	`if (sz == 0) {`
`117`		`- nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "unsupported format"));`
	`117`	`+ mp_raise_ValueError("unsupported format");`
`118`	`118`	`}`
`119`	`119`	`while (cnt--) {`
`120`	`120`	`// Apply alignment`
`@@ -149,7 +149,7 @@ STATIC mp_obj_t struct_unpack_from(size_t n_args, const mp_obj_t *args) {`
`149`	`149`	`// negative offsets are relative to the end of the buffer`
`150`	`150`	`offset = bufinfo.len + offset;`
`151`	`151`	`if (offset < 0) {`
`152`		`- nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "buffer too small"));`
	`152`	`+ mp_raise_ValueError("buffer too small");`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`	`p += offset;`
`@@ -164,7 +164,7 @@ STATIC mp_obj_t struct_unpack_from(size_t n_args, const mp_obj_t *args) {`
`164`	`164`	`sz = get_fmt_num(&fmt);`
`165`	`165`	`}`
`166`	`166`	`if (p + sz > end_p) {`
`167`		`- nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "buffer too small"));`
	`167`	`+ mp_raise_ValueError("buffer too small");`
`168`	`168`	`}`
`169`	`169`	`mp_obj_t item;`
`170`	`170`	`if (*fmt == 's') {`
`@@ -197,7 +197,7 @@ STATIC void struct_pack_into_internal(mp_obj_t fmt_in, byte p, byte end_p, siz`
`197`	`197`	`sz = get_fmt_num(&fmt);`
`198`	`198`	`}`
`199`	`199`	`if (p + sz > end_p) {`
`200`		`- nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "buffer too small"));`
	`200`	`+ mp_raise_ValueError("buffer too small");`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`if (*fmt == 's') {`
`@@ -240,7 +240,7 @@ STATIC mp_obj_t struct_pack_into(size_t n_args, const mp_obj_t *args) {`
`240`	`240`	`// negative offsets are relative to the end of the buffer`
`241`	`241`	`offset = (mp_int_t)bufinfo.len + offset;`
`242`	`242`	`if (offset < 0) {`
`243`		`- nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "buffer too small"));`
	`243`	`+ mp_raise_ValueError("buffer too small");`
`244`	`244`	`}`
`245`	`245`	`}`
`246`	`246`	`byte p = (byte )bufinfo.buf;`