py: Use str_to_int function in more places to reduce code size.

dpgeorge · dpgeorge · commit 81836c28b346 · 2014-12-21T21:07:03.000Z
diff --git a/py/objstr.c b/py/objstr.c
@@ -790,13 +790,13 @@ STATIC mp_obj_t str_rstrip(mp_uint_t n_args, const mp_obj_t *args) {
 // *num if at least one digit was parsed.
 static int str_to_int(const char *str, int *num) {
     const char *s = str;
-    if (unichar_isdigit(*s)) {
+    if ('0' <= *s && *s <= '9') {
         *num = 0;
         do {
             *num = *num * 10 + (*s - '0');
             s++;
         }
-        while (unichar_isdigit(*s));
+        while ('0' <= *s && *s <= '9');
     }
     return s - str;
 }
@@ -1331,9 +1331,7 @@ STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, mp_uint_t n_args, const mp_o
                 width = mp_obj_get_int(args[arg_i++]);
                 str++;
             } else {
-                for (; str < top && '0' <= *str && *str <= '9'; str++) {
-                    width = width * 10 + *str - '0';
-                }
+                str += str_to_int((const char*)str, &width);
             }
         }
         int prec = -1;
@@ -1347,9 +1345,7 @@ STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, mp_uint_t n_args, const mp_o
                     str++;
                 } else {
                     prec = 0;
-                    for (; str < top && '0' <= *str && *str <= '9'; str++) {
-                        prec = prec * 10 + *str - '0';
-                    }
+                    str += str_to_int((const char*)str, &prec);
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -790,13 +790,13 @@ STATIC mp_obj_t str_rstrip(mp_uint_t n_args, const mp_obj_t *args) {`
`790`	`790`	`// *num if at least one digit was parsed.`
`791`	`791`	`static int str_to_int(const char str, int num) {`
`792`	`792`	`const char *s = str;`
`793`		`- if (unichar_isdigit(*s)) {`
	`793`	`+ if ('0' <= s && s <= '9') {`
`794`	`794`	`*num = 0;`
`795`	`795`	`do {`
`796`	`796`	`num = num * 10 + (*s - '0');`
`797`	`797`	`s++;`
`798`	`798`	`}`
`799`		`- while (unichar_isdigit(*s));`
	`799`	`+ while ('0' <= s && s <= '9');`
`800`	`800`	`}`
`801`	`801`	`return s - str;`
`802`	`802`	`}`
`@@ -1331,9 +1331,7 @@ STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, mp_uint_t n_args, const mp_o`
`1331`	`1331`	`width = mp_obj_get_int(args[arg_i++]);`
`1332`	`1332`	`str++;`
`1333`	`1333`	`} else {`
`1334`		`- for (; str < top && '0' <= str && str <= '9'; str++) {`
`1335`		`- width = width * 10 + *str - '0';`
`1336`		`- }`
	`1334`	`+ str += str_to_int((const char*)str, &width);`
`1337`	`1335`	`}`
`1338`	`1336`	`}`
`1339`	`1337`	`int prec = -1;`
`@@ -1347,9 +1345,7 @@ STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, mp_uint_t n_args, const mp_o`
`1347`	`1345`	`str++;`
`1348`	`1346`	`} else {`
`1349`	`1347`	`prec = 0;`
`1350`		`- for (; str < top && '0' <= str && str <= '9'; str++) {`
`1351`		`- prec = prec * 10 + *str - '0';`
`1352`		`- }`
	`1348`	`+ str += str_to_int((const char*)str, &prec);`
`1353`	`1349`	`}`
`1354`	`1350`	`}`
`1355`	`1351`	`}`