Mercurial > projects > dwt2

diff base/src/java/lang/Integer.d @ 120:536e43f63c81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Comprehensive update for Win32/Linux32 dmd-2.053/dmd-1.068+Tango-r5661 ===D2=== * added [Try]Immutable/Const/Shared templates to work with differenses in D1/D2 instead of version statements used these templates to work with strict type storage rules of dmd-2.053 * com.ibm.icu now also compilable with D2, but not tested yet * small fixes Snippet288 - shared data is in TLS ===Phobos=== * fixed critical bugs in Phobos implemention completely incorrect segfault prone fromStringz (Linux's port ruthless killer) terrible, incorrect StringBuffer realization (StyledText killer) * fixed small bugs as well Snippet72 - misprint in the snippet * implemented missed functionality for Phobos ByteArrayOutputStream implemented (image loading available) formatting correctly works for all DWT's cases As a result, folowing snippets now works with Phobos (Snippet### - what is fixed): Snippet24, 42, 111, 115, 130, 235, 276 - bad string formatting Snippet48, 282 - crash on image loading Snippet163, 189, 211, 213, 217, 218, 222 - crash on copy/cut in StyledText Snippet244 - hang-up ===Tango=== * few changes for the latest Tango trunc-r5661 * few small performance improvments ===General=== * implMissing-s for only one version changed to implMissingInTango/InPhobos * incorrect calls to Format in toString-s fixed * fixed loading \uXXXX characters in ResourceBundle * added good UTF-8 support for StyledText, TextLayout (Win32) and friends UTF functions revised and tested. It is now in java.nonstandard.*Utf modules StyledText and TextLayout (Win32) modules revised for UTF-8 support * removed small diferences in most identical files in *.swt.* folders *.swt.internal.image, *.swt.events and *.swt.custom are identical in Win32/Linux32 now 179 of 576 (~31%) files in *.swt.* folders are fully identical * Win32: snippets now have right subsystem, pretty icons and native system style controls * small fixes in snippets Snippet44 - it's not Snippet44 Snippet212 - functions work with different images and offsets arrays Win32: Snippet282 - crash on close if the button has an image Snippet293 - setGrayed is commented and others Win32: As a result, folowing snippets now works Snippet68 - color doesn't change Snippet163, 189, 211, 213, 217, 218, 222 - UTF-8 issues (see above) Snippet193 - no tabel headers
author Denis Shelomovskij <verylonglogin.reg@gmail.com>
date Sat, 09 Jul 2011 15:50:20 +0300
parents 46539f5c5993
children
line wrap: on
line diff
--- a/base/src/java/lang/Integer.d	Sun Apr 17 17:58:36 2011 +0200
+++ b/base/src/java/lang/Integer.d	Sat Jul 09 15:50:20 2011 +0300
@@ -4,18 +4,16 @@
 import java.lang.exceptions;
 import java.lang.Number;
 import java.lang.Class;
+import java.lang.Character;
 import java.lang.String;
 
 version(Tango){
+    static import tango.text.convert.Integer;
 } else { // Phobos
     static import std.conv;
     static import std.string;
 }
 
-version(Tango){
-} else { // Phobos
-}
-
 
 class Integer : Number {
 
@@ -39,64 +37,59 @@
     }
 
     public static String toString( int i, int radix ){
-        switch( radix ){
-            case 2:
-                return toBinaryString(i);
-            case 8:
-                return toOctalString(i);
-            case 10:
-                return toString(i);
-            case 16:
-                return toHexString(i);
-            default:
-                implMissing( __FILE__, __LINE__ );
-                return null;
+        if(radix < Character.MIN_RADIX || radix > Character.MAX_RADIX)
+            radix = 10;
+        version(Tango){
+            switch( radix ){
+                case 10:
+                    return tango.text.convert.Integer.toString(i);
+                case 16:
+                    return tango.text.convert.Integer.toString(i, "x" );
+                case 2:
+                    return tango.text.convert.Integer.toString(i, "b" );
+                case 8:
+                    return tango.text.convert.Integer.toString(i, "o" );
+                default:
+                    implMissingInTango( __FILE__, __LINE__ );
+                    return null;
+            }
+        } else { // Phobos
+            return std.conv.to!(String)(i, radix);
         }
     }
 
     public static String toHexString( int i ){
-        version(Tango){
-            return tango.text.convert.Integer.toString(i, "x" );
-        } else { // Phobos
-            return std.string.format("%x", i);
-        }
+        return toString(i, 16);
     }
 
     public static String toOctalString( int i ){
-        version(Tango){
-            return tango.text.convert.Integer.toString(i, "o" );
-        } else { // Phobos
-            return std.string.format("%o", i);
-        }
+        return toString(i, 8);
     }
 
     public static String toBinaryString( int i ){
-        version(Tango){
-            return tango.text.convert.Integer.toString(i, "b" );
-        } else { // Phobos
-            return std.string.format("%b", i);
-        }
+        return toString(i, 2);
     }
 
     public static String toString( int i ){
-        version(Tango){
-            return tango.text.convert.Integer.toString(i);
-        } else { // Phobos
-            return std.conv.to!(string)( i );
-        }
+        return String_valueOf(i);
     }
 
     public static int parseInt( String s, int radix ){
+        if(radix < Character.MIN_RADIX || radix > Character.MAX_RADIX)
+            throw new NumberFormatException("The radix is out of range");
         version(Tango){
             try{
-                return tango.text.convert.Integer.toLong( s, radix );
+                return tango.text.convert.Integer.toInt( s, radix );
             }
             catch( IllegalArgumentException e ){
                 throw new NumberFormatException( e );
             }
         } else { // Phobos
             try{
-            	return std.conv.parse!(int)( s, radix );
+                immutable res = std.conv.parse!(int)( s, radix );
+                if(s.length)
+                    throw new NumberFormatException("String has invalid characters: " ~ s);
+                return res;
             }
             catch( std.conv.ConvException e ){
                 throw new NumberFormatException( e );
@@ -113,7 +106,7 @@
     }
 
     public static Integer valueOf( String s ){
-        return valueOf( parseInt(s));
+        return valueOf(parseInt(s));
     }
 
     public static Integer valueOf( int i ){
@@ -149,11 +142,7 @@
     }
 
     public override String toString(){
-        version(Tango){
-            return tango.text.convert.Integer.toString( value );
-        } else { // Phobos
-            return std.conv.to!(string)(value);
-        }
+        return toString(value);
     }
 
     private static Class TYPE_;