SmallInteger.st
changeset 3706 6cd714580176
parent 3705 f4e7b2db4d4b
child 3707 a80825dc682b
--- a/SmallInteger.st	Fri Jul 31 22:10:06 1998 +0200
+++ b/SmallInteger.st	Fri Jul 31 22:20:04 1998 +0200
@@ -2503,34 +2503,34 @@
     OBJ newString;
     INT myValue;
     int negative = 0;
-    INT base;
+    INT __base;
 
     if (__isSmallInteger(base)) {
+	__base = __intVal(base));
+
 #ifdef SLOW_CODE
-        if (__isSmallInteger(base)) {
-            switch (__intVal(base)) {
-                case 10:
+        switch (__base) {
+            case 10:
 #ifdef alpha64
-                    format = "%ld";
+                format = "%ld";
 #else
-                    format = "%d";
+                format = "%d";
 #endif
-                    break;
-                case 16:
+                break;
+            case 16:
 #ifdef alpha64
-                    format = "%lx";
+                format = "%lx";
 #else
-                    format = "%x";
+                format = "%x";
 #endif
-                    break;
-                case 8:
+                break;
+            case 8:
 #ifdef alpha64
-                    format = "%lo";
+                format = "%lo";
 #else
-                    format = "%o";
+                format = "%o";
 #endif
-                    break;
-            }
+                break;
         }
 
         if (format) {
@@ -2551,8 +2551,7 @@
             }
         }
 #else
-        base = __intVal(base);
-        if ((base <= 36) && (base > 1)) {
+        if ((__base <= 36) && (__base > 1)) {
             myValue = __intVal(self);
             if (myValue == 0) {
                 RETURN (__MKSTRING_L("0", 1));
@@ -2566,13 +2565,13 @@
             while (myValue != 0) {
                 int digit;
 
-                digit = myValue % base;
+                digit = myValue % __base;
                 if (digit <= 9) {
                     *cp = '0' + digit;
                 } else {
                     *cp = 'A' + digit - 10;
                 }
-                myValue = myValue / base;
+                myValue = myValue / __base;
                 cp--;
             }
             if (negative) {
@@ -2799,5 +2798,5 @@
 !SmallInteger class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/SmallInteger.st,v 1.102 1998-07-31 20:10:06 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/SmallInteger.st,v 1.103 1998-07-31 20:20:04 cg Exp $'
 ! !