commit 20773971186151b53426bd607908546598036a16
author Damien George <damien.p.george@gmail.com> Sat Feb 22 18:12:43 2014 +0000
committer Damien George <damien.p.george@gmail.com> Sat Feb 22 18:12:43 2014 +0000
tree c74ee3ac2f07061a820355bac0bea075e0177fa8
parent 2613ffde431594f3fe0562042c32105623fbe4dc

py: Put number parsing code together in parsenum.c.

py/objint.c

diff --git a/py/objint.c b/py/objint.c
index 82bab9e..0caaab6 100644
--- a/py/objint.c
+++ b/py/objint.c
@@ -5,10 +5,10 @@
 
 #include "nlr.h"
 #include "misc.h"
-#include "strtonum.h"
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
+#include "parsenum.h"
 #include "objint.h"
 
 // This dispatcher function is expected to be independent of the implementation
@@ -25,7 +25,7 @@
                 // a string, parse it
                 uint l;
                 const char *s = mp_obj_str_get_data(args[0], &l);
-                return MP_OBJ_NEW_SMALL_INT(mp_strtonum(s, 0));
+                return mp_parse_num_integer(s, l, 0);
             } else {
                 return MP_OBJ_NEW_SMALL_INT(mp_obj_get_int(args[0]));
             }
@@ -36,7 +36,7 @@
             // TODO proper error checking of argument types
             uint l;
             const char *s = mp_obj_str_get_data(args[0], &l);
-            return MP_OBJ_NEW_SMALL_INT(mp_strtonum(s, mp_obj_get_int(args[1])));
+            return mp_parse_num_integer(s, l, mp_obj_get_int(args[1]));
         }
 
         default: