Mercurial > projects > dwt2
diff com.ibm.icu/src/com/ibm/icu/mangoicu/USearch.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/USearch.d Sun Apr 17 17:58:36 2011 +0200 +++ b/com.ibm.icu/src/com/ibm/icu/mangoicu/USearch.d Sat Jul 09 15:50:20 2011 +0300 @@ -205,7 +205,7 @@ ***********************************************************************/ - this (UStringView pattern, UStringView text, inout ULocale locale, UBreakIterator* iterator = null) + this (UStringView pattern, UStringView text, ref ULocale locale, UBreakIterator* iterator = null) { UErrorCode e; @@ -300,7 +300,7 @@ void getMatchedText (UString s) { - uint fmt (wchar* dst, uint length, inout UErrorCode e) + uint fmt (wchar* dst, uint length, ref UErrorCode e) { return usearch_getMatchedText (handle, dst, length, e); } @@ -525,83 +525,28 @@ ***********************************************************************/ - private static void* library; - - /*********************************************************************** - - ***********************************************************************/ - - private static extern (C) - { - Handle function (wchar*, uint, wchar*, uint, char*, void*, inout UErrorCode) usearch_open; - Handle function (wchar*, uint, wchar*, uint, Handle, void*, inout UErrorCode) usearch_openFromCollator; - void function (Handle) usearch_close; - void function (Handle, uint, inout UErrorCode) usearch_setOffset; - uint function (Handle) usearch_getOffset; - uint function (Handle) usearch_getMatchedStart; - uint function (Handle) usearch_getMatchedLength; - uint function (Handle, wchar*, uint, inout UErrorCode) usearch_getMatchedText; - void function (Handle, wchar*, uint, inout UErrorCode) usearch_setText; - wchar* function (Handle, uint*) usearch_getText; - void function (Handle, wchar*, uint, inout UErrorCode) usearch_setPattern; - wchar* function (Handle, uint*) usearch_getPattern; - uint function (Handle, inout UErrorCode) usearch_first; - uint function (Handle, inout UErrorCode) usearch_last; - uint function (Handle, inout UErrorCode) usearch_next; - uint function (Handle, inout UErrorCode) usearch_previous; - uint function (Handle, uint, inout UErrorCode) usearch_following; - uint function (Handle, uint, inout UErrorCode) usearch_preceding; - void function (Handle) usearch_reset; - void function (Handle, Handle, inout UErrorCode) usearch_setBreakIterator; - Handle function (Handle) usearch_getCollator; - void function (Handle, Handle, inout UErrorCode) usearch_setCollator; - } - - /*********************************************************************** - - ***********************************************************************/ - - static FunctionLoader.Bind[] targets = - [ - {cast(void**) &usearch_open, "usearch_open"}, - {cast(void**) &usearch_openFromCollator, "usearch_openFromCollator"}, - {cast(void**) &usearch_close, "usearch_close"}, - {cast(void**) &usearch_setOffset, "usearch_setOffset"}, - {cast(void**) &usearch_getOffset, "usearch_getOffset"}, - {cast(void**) &usearch_getMatchedStart, "usearch_getMatchedStart"}, - {cast(void**) &usearch_getMatchedLength, "usearch_getMatchedLength"}, - {cast(void**) &usearch_getMatchedText, "usearch_getMatchedText"}, - {cast(void**) &usearch_setText, "usearch_setText"}, - {cast(void**) &usearch_getText, "usearch_getText"}, - {cast(void**) &usearch_setPattern, "usearch_setPattern"}, - {cast(void**) &usearch_getPattern, "usearch_getPattern"}, - {cast(void**) &usearch_first, "usearch_first"}, - {cast(void**) &usearch_last, "usearch_last"}, - {cast(void**) &usearch_next, "usearch_next"}, - {cast(void**) &usearch_previous, "usearch_previous"}, - {cast(void**) &usearch_following, "usearch_following"}, - {cast(void**) &usearch_preceding, "usearch_preceding"}, - {cast(void**) &usearch_reset, "usearch_reset"}, - {cast(void**) &usearch_setBreakIterator, "usearch_setBreakIterator"}, - {cast(void**) &usearch_getCollator, "usearch_getCollator"}, - {cast(void**) &usearch_setCollator, "usearch_setCollator"}, - ]; - - /*********************************************************************** - - ***********************************************************************/ - - static this () - { - library = FunctionLoader.bind (icuin, targets); - } - - /*********************************************************************** - - ***********************************************************************/ - - static ~this () - { - FunctionLoader.unbind (library); - } + mixin(genICUNative!("in" + ,"Handle function (wchar*, uint, wchar*, uint, char*, void*, ref UErrorCode)", "usearch_open" + ,"Handle function (wchar*, uint, wchar*, uint, Handle, void*, ref UErrorCode)", "usearch_openFromCollator" + ,"void function (Handle)", "usearch_close" + ,"void function (Handle, uint, ref UErrorCode)", "usearch_setOffset" + ,"uint function (Handle)", "usearch_getOffset" + ,"uint function (Handle)", "usearch_getMatchedStart" + ,"uint function (Handle)", "usearch_getMatchedLength" + ,"uint function (Handle, wchar*, uint, ref UErrorCode)", "usearch_getMatchedText" + ,"void function (Handle, wchar*, uint, ref UErrorCode)", "usearch_setText" + ,"wchar* function (Handle, uint*)", "usearch_getText" + ,"void function (Handle, wchar*, uint, ref UErrorCode)", "usearch_setPattern" + ,"wchar* function (Handle, uint*)", "usearch_getPattern" + ,"uint function (Handle, ref UErrorCode)", "usearch_first" + ,"uint function (Handle, ref UErrorCode)", "usearch_last" + ,"uint function (Handle, ref UErrorCode)", "usearch_next" + ,"uint function (Handle, ref UErrorCode)", "usearch_previous" + ,"uint function (Handle, uint, ref UErrorCode)", "usearch_following" + ,"uint function (Handle, uint, ref UErrorCode)", "usearch_preceding" + ,"void function (Handle)", "usearch_reset" + ,"void function (Handle, Handle, ref UErrorCode)", "usearch_setBreakIterator" + ,"Handle function (Handle)", "usearch_getCollator" + ,"void function (Handle, Handle, ref UErrorCode)", "usearch_setCollator" + )); }