Mercurial > projects > dwt2
diff base/src/java/lang/Float.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 | e944a4cf537b |
children |
line wrap: on
line diff
--- a/base/src/java/lang/Float.d Sun Apr 17 17:58:36 2011 +0200 +++ b/base/src/java/lang/Float.d Sat Jul 09 15:50:20 2011 +0300 @@ -4,12 +4,19 @@ import java.lang.exceptions; import java.lang.Number; import java.lang.Class; +import java.lang.String; + +version(Tango){ + static import tango.text.convert.Float; +} else { // Phobos + static import std.conv; +} class Float : Number { - public static float POSITIVE_INFINITY = (1.0f / 0.0f); - public static float NEGATIVE_INFINITY = ((-1.0f) / 0.0f); - public static float NaN = (0.0f / 0.0f); + public static float POSITIVE_INFINITY = float.infinity; + public static float NEGATIVE_INFINITY = -float.infinity; + public static float NaN = float.nan; public static float MAX_VALUE = 3.4028235e+38f; public static float MIN_VALUE = float.min; //1.4e-45f public static int SIZE = 32; @@ -20,12 +27,11 @@ this.value = value; } this( String str ){ - implMissing( __FILE__, __LINE__ ); super(); + this.value = parseFloat(str); } public static String toString( float value ){ - implMissing( __FILE__, __LINE__ ); - return null; + return String_valueOf(value); } public static float parseFloat( String s ){ version(Tango){ @@ -36,8 +42,12 @@ throw new NumberFormatException( e ); } } else { // Phobos - implMissing( __FILE__, __LINE__ ); - return 0.0f; + try{ + return std.conv.to!(float)(s); + } + catch( std.conv.ConvException e ){ + throw new NumberFormatException( e ); + } } }