Mercurial > projects > dwt2
diff com.ibm.icu/src/com/ibm/icu/mangoicu/UConverter.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 | ebefa5c2eab4 |
| children |
line wrap: on
line diff
--- a/com.ibm.icu/src/com/ibm/icu/mangoicu/UConverter.d Sun Apr 17 17:58:36 2011 +0200 +++ b/com.ibm.icu/src/com/ibm/icu/mangoicu/UConverter.d Sat Jul 09 15:50:20 2011 +0300 @@ -104,7 +104,7 @@ { void reset (); - bool convert (void[] input, void[] output, inout UAdjust x, bool flush); + bool convert (void[] input, void[] output, ref UAdjust x, bool flush); } /******************************************************************************* @@ -438,7 +438,7 @@ ***********************************************************************/ - bool encode (wchar[] input, void[] output, inout UAdjust x, bool flush) + bool encode (wchar[] input, void[] output, ref UAdjust x, bool flush) { UErrorCode e; wchar* src = input.ptr; @@ -549,7 +549,7 @@ ***********************************************************************/ - bool decode (void[] input, wchar[] output, inout UAdjust x, bool flush) + bool decode (void[] input, wchar[] output, ref UAdjust x, bool flush) { UErrorCode e; void* src = input.ptr; @@ -596,7 +596,7 @@ **********************************************************************/ - static int opApply (int delegate(inout char[] element) dg) + static int opApply (int delegate(ref char[] element) dg) { char[] name; int result; @@ -654,7 +654,7 @@ **************************************************************/ - bool convert (void[] input, void[] output, inout UAdjust x, bool flush) + bool convert (void[] input, void[] output, ref UAdjust x, bool flush) { UErrorCode e; void* src = input.ptr; @@ -686,79 +686,28 @@ ***********************************************************************/ - private static void* library; - - /*********************************************************************** - - ***********************************************************************/ - - private static extern (C) - { - int function (char*, char*) ucnv_compareNames; - Handle function (char*, inout UErrorCode) ucnv_open; - char* function (void*, uint, inout uint, inout UErrorCode) ucnv_detectUnicodeSignature; - void function (Handle) ucnv_close; - void function (Handle) ucnv_reset; - int function (Handle) ucnv_resetToUnicode; - int function (Handle) ucnv_resetFromUnicode; - ubyte function (Handle) ucnv_getMaxCharSize; - ubyte function (Handle) ucnv_getMinCharSize; - char* function (Handle, inout UErrorCode) ucnv_getName; - uint function (Handle, wchar*, uint, void*, uint, inout UErrorCode) ucnv_toUChars; - uint function (Handle, void*, uint, wchar*, uint, inout UErrorCode) ucnv_fromUChars; - void function (Handle, void**, void*, wchar**, wchar*, int*, ubyte, inout UErrorCode) ucnv_fromUnicode; - void function (Handle, wchar**, wchar*, void**, void*, int*, ubyte, inout UErrorCode) ucnv_toUnicode; - void function (Handle, Handle, void**, void*, void**, void*, wchar*, wchar*, wchar*, wchar*, ubyte, ubyte, inout UErrorCode) ucnv_convertEx; - ubyte function (Handle) ucnv_isAmbiguous; - char* function (uint) ucnv_getAvailableName; - uint function () ucnv_countAvailable; - } - - /*********************************************************************** - - ***********************************************************************/ - - static FunctionLoader.Bind[] targets = - [ - {cast(void**) &ucnv_open, "ucnv_open"}, - {cast(void**) &ucnv_close, "ucnv_close"}, - {cast(void**) &ucnv_reset, "ucnv_reset"}, - {cast(void**) &ucnv_resetToUnicode, "ucnv_resetToUnicode"}, - {cast(void**) &ucnv_resetFromUnicode, "ucnv_resetFromUnicode"}, - {cast(void**) &ucnv_compareNames, "ucnv_compareNames"}, - {cast(void**) &ucnv_getMaxCharSize, "ucnv_getMaxCharSize"}, - {cast(void**) &ucnv_getMinCharSize, "ucnv_getMinCharSize"}, - {cast(void**) &ucnv_getName, "ucnv_getName"}, - {cast(void**) &ucnv_detectUnicodeSignature, "ucnv_detectUnicodeSignature"}, - {cast(void**) &ucnv_toUChars, "ucnv_toUChars"}, - {cast(void**) &ucnv_fromUChars, "ucnv_fromUChars"}, - {cast(void**) &ucnv_toUnicode, "ucnv_toUnicode"}, - {cast(void**) &ucnv_fromUnicode, "ucnv_fromUnicode"}, - {cast(void**) &ucnv_convertEx, "ucnv_convertEx"}, - {cast(void**) &ucnv_isAmbiguous, "ucnv_isAmbiguous"}, - {cast(void**) &ucnv_countAvailable, "ucnv_countAvailable"}, - {cast(void**) &ucnv_getAvailableName, "ucnv_getAvailableName"}, - ]; - - /*********************************************************************** - - ***********************************************************************/ - - static this () - { - library = FunctionLoader.bind (icuuc, targets); + mixin(genICUNative!("uc" + ,"int function (char*, char*)", "ucnv_compareNames" + ,"Handle function (char*, ref UErrorCode)", "ucnv_open" + ,"char* function (void*, uint, ref uint, ref UErrorCode)", "ucnv_detectUnicodeSignature" + ,"void function (Handle)", "ucnv_close" + ,"void function (Handle)", "ucnv_reset" + ,"int function (Handle)", "ucnv_resetToUnicode" + ,"int function (Handle)", "ucnv_resetFromUnicode" + ,"ubyte function (Handle)", "ucnv_getMaxCharSize" + ,"ubyte function (Handle)", "ucnv_getMinCharSize" + ,"char* function (Handle, ref UErrorCode)", "ucnv_getName" + ,"uint function (Handle, wchar*, uint, void*, uint, ref UErrorCode)", "ucnv_toUChars" + ,"uint function (Handle, void*, uint, wchar*, uint, ref UErrorCode)", "ucnv_fromUChars" + ,"void function (Handle, void**, void*, wchar**, wchar*, int*, ubyte, ref UErrorCode)", "ucnv_fromUnicode" + ,"void function (Handle, wchar**, wchar*, void**, void*, int*, ubyte, ref UErrorCode)", "ucnv_toUnicode" + ,"void function (Handle, Handle, void**, void*, void**, void*, wchar*, wchar*, wchar*, wchar*, ubyte, ubyte, ref UErrorCode)", "ucnv_convertEx" + ,"ubyte function (Handle)", "ucnv_isAmbiguous" + ,"char* function (uint)", "ucnv_getAvailableName" + ,"uint function ()", "ucnv_countAvailable" + )); /+ foreach (char[] name; UConverter) printf ("%.*s\n", name); +/ - } - - /*********************************************************************** - - ***********************************************************************/ - - static ~this () - { - FunctionLoader.unbind (library); - } }