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

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 5d5bd660917f
children
line wrap: on
line diff
--- a/base/src/java/lang/Long.d	Sun Apr 17 17:58:36 2011 +0200
+++ b/base/src/java/lang/Long.d	Sat Jul 09 15:50:20 2011 +0300
@@ -3,7 +3,16 @@
 import java.lang.util;
 import java.lang.exceptions;
 import java.lang.Number;
+import java.lang.Character;
 import java.lang.Class;
+import java.lang.String;
+
+version(Tango){
+    static import tango.text.convert.Integer;
+} else { // Phobos
+    static import std.conv;
+    static import std.string;
+}
 
 class Long : Number {
     public static const long MIN_VALUE = long.min;
@@ -14,8 +23,8 @@
         this.value = value;
     }
     this( String str ){
-        implMissing( __FILE__, __LINE__ );
         super();
+        this.value = parseLong(str);
     }
     public byte byteValue(){
         return cast(byte)value;
@@ -44,6 +53,8 @@
         return parseLong( s, 10 );
     }
     public static long parseLong(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 );
@@ -52,13 +63,19 @@
                 throw new NumberFormatException( e );
             }
         } else { // Phobos
-            implMissing( __FILE__, __LINE__ );
-            return 0;
+            try{
+                immutable res = std.conv.parse!(long)( s, radix );
+                if(s.length)
+                    throw new NumberFormatException("String has invalid characters: " ~ s);
+                return res;
+            }
+            catch( std.conv.ConvException e ){
+                throw new NumberFormatException( e );
+            }
         }
     }
-    public static String toString( double value ){
-        implMissing( __FILE__, __LINE__ );
-        return null;
+    public static String toString( long i ){
+        return String_valueOf(i);
     }
     private static Class TYPE_;
     public static Class TYPE(){