[svn:parrot] r39843 - trunk/compilers/imcc

[petdance at svn.parrot.org]

Author: petdance
Date: Tue Jun 30 14:45:25 2009
New Revision: 39843
URL: https://trac.parrot.org/parrot/changeset/39843

Log:
refactored int_overflows

Modified:
   trunk/compilers/imcc/symreg.c

Modified: trunk/compilers/imcc/symreg.c
==============================================================================
--- trunk/compilers/imcc/symreg.c	Tue Jun 30 14:45:08 2009	(r39842)
+++ trunk/compilers/imcc/symreg.c	Tue Jun 30 14:45:25 2009	(r39843)
@@ -82,6 +82,7 @@
         __attribute__nonnull__(1)
         __attribute__nonnull__(2);
 
+PARROT_WARN_UNUSED_RESULT
 static int int_overflows(ARGIN(const SymReg *r))
         __attribute__nonnull__(1);
 
@@ -847,28 +848,39 @@
 
 */
 
+PARROT_WARN_UNUSED_RESULT
 static int
 int_overflows(ARGIN(const SymReg *r))
 {
     ASSERT_ARGS(int_overflows)
     INTVAL i;
-    errno = 0;
+    int base;
+    const char *digits;
 
     if (r->type & VT_CONSTP)
         r = r->reg;
 
-    if (r->name[0] == '0' && (r->name[1] == 'x' || r->name[1] == 'X')) {
-        i = strtoul(r->name + 2, 0, 16);
+    /* Refactor this code to hoist common from functionality between
+     * this function and IMCC_int_from_reg in pbc.c */
+    digits = r->name;
+    base   = 10;
+
+    if (digits[0] == '0') {
+        switch (toupper((unsigned char)digits[1])) {
+            case 'B': base =  2; break;
+            case 'O': base =  8; break;
+            case 'X': base = 16; break;
+            default: break;
+        }
     }
 
-    else if (r->name[0] == '0' && (r->name[1] == 'O' || r->name[1] == 'o'))
-        i = strtoul(r->name + 2, 0, 8);
-
-    else if (r->name[0] == '0' && (r->name[1] == 'b' || r->name[1] == 'B'))
-        i = strtoul(r->name + 2, 0, 2);
-
-    else
-        i = strtol(r->name, 0, 10);
+    errno = 0;
+    if (base == 10) {
+        i = strtol(digits, NULL, base);
+    }
+    else {
+        i = strtoul(digits + 2, NULL, base);
+    }
 
     return errno ? 1 : 0;
 }