Mercurial > projects > dwt2

diff base/src/java/lang/Character.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 fb3aa8075988
children dc6fc593e8d7
line wrap: on
line diff
--- a/base/src/java/lang/Character.d	Sun Apr 17 17:58:36 2011 +0200
+++ b/base/src/java/lang/Character.d	Sat Jul 09 15:50:20 2011 +0300
@@ -1,78 +1,68 @@
 module java.lang.Character;
 
+import java.lang.util;
 import java.lang.exceptions;
-import java.lang.util;
 import java.lang.Class;
+import java.lang.String;
 
 version(Tango){
     static import tango.text.Unicode;
-    static import tango.text.UnicodeData;
+    static import tango.text.UnicodeData; //for getUnicodeData
 } else { // Phobos
     static import std.utf;
+    static import std.conv;
     static import std.uni;
     static import std.ctype;
     static import std.string;
 }
 
 class Character {
+    public static const int MIN_RADIX = 2;
+    public static const int MAX_RADIX = 36;
     public static bool isUpperCase( dchar c ){
-        implMissing( __FILE__, __LINE__);
-        return false;
-    }
-    public static dchar toUpperCase( wchar c ){
         version(Tango){
-            wchar[1] src;
-            src[0] = c;
-            dchar[1] buf;
-            uint ate;
-            dchar[] darr = tango.text.convert.Utf.toString32( src, buf, &ate );
+            implMissingInTango( __FILE__, __LINE__);
+            return false;
         } else { // Phobos
-            wchar[1] src;
-            src[0] = c;
-            auto darr = std.utf.toUTF32(src);
+            return !!std.uni.isUniUpper(c);
         }
-        return toUpperCase( darr[0] );
-    }
-    public static String toString(char c){
-        implMissing(__FILE__, __LINE__ );
-        return null;
-    }
-    public static String toString(wchar c){
-        implMissing(__FILE__, __LINE__ );
-        return null;
-    }
-    public static String toString(dchar c){
-        implMissing(__FILE__, __LINE__ );
-        return null;
     }
     public static dchar toUpperCase( dchar c ){
         version(Tango){
-            dchar[1] src;
-            src[0] = c;
+            dchar[1] src = c;
             dchar[] r = tango.text.Unicode.toUpper( src );
             return r[0];
         } else { // Phobos
             return std.uni.toUniUpper( c );
         }
     }
-    public static dchar toLowerCase( wchar c ){
+    public static String toString( char c ){
+        version(Tango){
+            implMissingInTango(__FILE__, __LINE__ );
+            return null;
+        } else { // Phobos
+            return std.conv.to!(String)( c );
+        }
+    }
+    public static String toString( wchar c ){
         version(Tango){
-            wchar[1] src;
-            src[0] = c;
-            dchar[1] buf;
-            uint ate;
-            dchar[] darr = tango.text.convert.Utf.toString32( src, buf, &ate );
+            implMissingInTango(__FILE__, __LINE__ );
+            return null;
         } else { // Phobos
-            wchar[1] src;
-            src[0] = c;
-            auto darr = std.utf.toUTF32(src);
+            return std.conv.to!(String)( c );
         }
-        return toLowerCase( darr[0] );
+    }
+    public static String toString( dchar c ){
+        version(Tango){
+            implMissingInTango(__FILE__, __LINE__ );
+            return null;
+        } else { // Phobos
+            return std.conv.to!(String)( c );
+        }
     }
     public static dchar toLowerCase( dchar c ){
         version(Tango){
-            dchar[1] src;
-            src[0] = c;
+            dchar[1] src = c;
             dchar[] r = tango.text.Unicode.toLower( src );
             return r[0];
         } else { // Phobos
@@ -86,32 +76,26 @@
             return std.string.iswhite(c);
         }
     }
+    alias isWhitespace isWhiteSpace;
+    public static bool isSpace( dchar c ){
+        version(Tango){
+            return tango.text.Unicode.isSpace(c);
+        } else { // Phobos
+            return !!std.ctype.isspace(c);
+        }
+    }
     public static bool isDigit( dchar c ){
         version(Tango){
             return tango.text.Unicode.isDigit( c );
         } else { // Phobos
-            return std.string.isNumeric(c);
+            return !!std.ctype.isdigit(c);
         }
     }
     public static bool isLetter( dchar c ){
         version(Tango){
             return tango.text.Unicode.isLetter(c);
         } else { // Phobos
-            return std.uni.isUniAlpha(c) != 0;
-        }
-    }
-    public static bool isSpace( dchar c ){
-        version(Tango){
-            return tango.text.Unicode.isSpace(c);
-        } else { // Phobos
-            return cast(bool)std.ctype.isspace(c);
-        }
-    }
-    public static bool isWhiteSpace( dchar c ){
-        version(Tango){
-            return tango.text.Unicode.isWhitespace(c);
-        } else { // Phobos
-            return std.string.iswhite(c);
+            return !!std.uni.isUniAlpha(c);
         }
     }
     public static bool isLetterOrDigit( dchar c ){
@@ -155,66 +139,26 @@
 
 bool CharacterIsDefined( dchar ch ){
     version(Tango){
-    	return (ch in tango.text.UnicodeData.unicodeData) !is null;
+    	return tango.text.UnicodeData.getUnicodeData(ch) !is null;
     } else { // Phobos
-        implMissing( __FILE__, __LINE__);
-        return false;
-    }
-}
-
-dchar CharacterFirstToLower( CString str ){
-    int consumed;
-    return CharacterFirstToLower( str, consumed );
-}
-
-dchar CharacterFirstToLower( CString str, out int consumed ){
-    version(Tango){
-        dchar[1] buf;
-        buf[0] = firstCodePoint( str, consumed );
-        dchar[] r = tango.text.Unicode.toLower( buf );
-        return r[0];
-    } else { // Phobos
-        implMissing( __FILE__, __LINE__);
-        return 0;
+        return std.utf.isValidDchar(ch);
     }
 }
 
 dchar CharacterToLower( dchar c ){
-    version(Tango){
-        dchar[] r = tango.text.Unicode.toLower( [c] );
-        return r[0];
-    } else { // Phobos
-        return std.uni.toUniLower(c);
-    }
+    return Character.toLowerCase(c);
 }
 dchar CharacterToUpper( dchar c ){
-    version(Tango){
-        dchar[] r = tango.text.Unicode.toUpper( [c] );
-        return r[0];
-    } else { // Phobos
-        return std.uni.toUniUpper(c);
-    }
+    return Character.toUpperCase(c);
 }
 bool CharacterIsWhitespace( dchar c ){
-    version(Tango){
-        return tango.text.Unicode.isWhitespace( c );
-    } else { // Phobos
-        return std.string.iswhite(c);
-    }
+    return Character.isWhitespace(c);
 }
 bool CharacterIsDigit( dchar c ){
-    version(Tango){
-        return tango.text.Unicode.isDigit( c );
-    } else { // Phobos
-        return std.string.isNumeric(c);
-    }
+    return Character.isDigit(c);
 }
 bool CharacterIsLetter( dchar c ){
-    version(Tango){
-        return tango.text.Unicode.isLetter( c );
-    } else { // Phobos
-        return std.uni.isUniAlpha(c) != 0;
-    }
+    return Character.isLetter(c);
 }