From 06201ff3d6d9485b2657fc9ac4aa8a306884322f Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Sat, 1 Mar 2014 19:50:50 +0000
Subject: py: Implement bit-shift and not operations for mpz.

Implement not, shl and shr in mpz library.  Add function to create mpzs
on the stack, used for memory efficiency when rhs is a small int.
Factor out code to parse base-prefix of number into a dedicated function.
---
 py/parsenum.c | 34 ++++++----------------------------
 1 file changed, 6 insertions(+), 28 deletions(-)

(limited to 'py/parsenum.c')

diff --git a/py/parsenum.c b/py/parsenum.c
index 64594cd1b4..8e290da338 100644
--- a/py/parsenum.c
+++ b/py/parsenum.c
@@ -5,6 +5,7 @@
 #include "qstr.h"
 #include "nlr.h"
 #include "obj.h"
+#include "parsenumbase.h"
 #include "parsenum.h"
 
 #if defined(UNIX)
@@ -33,38 +34,15 @@ mp_obj_t mp_parse_num_integer(const char *restrict str, uint len, int base) {
     // preced sign
     if (c == '+' || c == '-') {
         neg = - (c == '-');
-        c = *(p++);
-    }
-
-    // find real radix base, and strip preced '0x', '0o' and '0b'
-    // TODO somehow merge with similar code in parse.c
-    if ((base == 0 || base == 16) && c == '0') {
-        c = *(p++);
-        if ((c | 32) == 'x') {
-            base = 16;
-        } else if (base == 0 && (c | 32) == 'o') {
-            base = 8;
-        } else if (base == 0 && (c | 32) == 'b') {
-            base = 2;
-        } else {
-            base = 10;
-            p -= 2;
-        }
-    } else if (base == 8 && c == '0') {
-        c = *(p++);
-        if ((c | 32) != 'o') {
-            p -= 2;
-        }
-    } else if (base == 2 && c == '0') {
-        c = *(p++);
-        if ((c | 32) != 'b') {
-            p -= 2;
-        }
     } else {
-        if (base == 0) base = 10;
         p--;
     }
 
+    len -= p - str;
+    int skip = mp_parse_num_base(p, len, &base);
+    p += skip;
+    len -= skip;
+
     errno = 0;
     found = strtol(p, &num, base);
     if (errno) {
-- 
cgit v1.2.3