Mercurial > projects > dwt2
diff com.ibm.icu/src/com/ibm/icu/mangoicu/URegex.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/URegex.d Sun Apr 17 17:58:36 2011 +0200 +++ b/com.ibm.icu/src/com/ibm/icu/mangoicu/URegex.d Sat Jul 09 15:50:20 2011 +0300 @@ -360,7 +360,7 @@ void group (UString s, uint index) { - uint fmt (wchar* dst, uint length, inout UErrorCode e) + uint fmt (wchar* dst, uint length, ref UErrorCode e) { return uregex_group (handle, index, dst, length, e); } @@ -626,75 +626,24 @@ ***********************************************************************/ - private static void* library; - - /*********************************************************************** - - ***********************************************************************/ - - private static extern (C) - { - Handle function (wchar*, uint, uint, ParseError*, inout UErrorCode) uregex_open; - void function (Handle) uregex_close; - Handle function (Handle, inout UErrorCode) uregex_clone; - wchar* function (Handle, inout uint, inout UErrorCode) uregex_pattern; - uint function (Handle, inout UErrorCode) uregex_flags; - void function (Handle, wchar*, uint, inout UErrorCode) uregex_setText; - wchar* function (Handle, inout uint, inout UErrorCode) uregex_getText; - uint function (Handle, uint, wchar*, uint, inout UErrorCode) uregex_group; - uint function (Handle, inout UErrorCode) uregex_groupCount; - uint function (Handle, uint, inout UErrorCode) uregex_start; - uint function (Handle, uint, inout UErrorCode) uregex_end; - void function (Handle, uint, inout UErrorCode) uregex_reset; - bool function (Handle, uint, inout UErrorCode) uregex_matches; - bool function (Handle, uint, inout UErrorCode) uregex_lookingAt; - bool function (Handle, uint, inout UErrorCode) uregex_find; - bool function (Handle, inout UErrorCode) uregex_findNext; - uint function (Handle, wchar*, uint, wchar*, uint, inout UErrorCode) uregex_replaceAll; - uint function (Handle, wchar*, uint, wchar*, uint, inout UErrorCode) uregex_replaceFirst; - } - - /*********************************************************************** - - ***********************************************************************/ - - static FunctionLoader.Bind[] targets = - [ - {cast(void**) &uregex_open, "uregex_open"}, - {cast(void**) &uregex_close, "uregex_close"}, - {cast(void**) &uregex_clone, "uregex_clone"}, - {cast(void**) &uregex_pattern, "uregex_pattern"}, - {cast(void**) &uregex_flags, "uregex_flags"}, - {cast(void**) &uregex_setText, "uregex_setText"}, - {cast(void**) &uregex_getText, "uregex_getText"}, - {cast(void**) &uregex_group, "uregex_group"}, - {cast(void**) &uregex_groupCount, "uregex_groupCount"}, - {cast(void**) &uregex_start, "uregex_start"}, - {cast(void**) &uregex_end, "uregex_end"}, - {cast(void**) &uregex_reset, "uregex_reset"}, - {cast(void**) &uregex_matches, "uregex_matches"}, - {cast(void**) &uregex_lookingAt, "uregex_lookingAt"}, - {cast(void**) &uregex_find, "uregex_find"}, - {cast(void**) &uregex_findNext, "uregex_findNext"}, - {cast(void**) &uregex_replaceAll, "uregex_replaceAll"}, - {cast(void**) &uregex_replaceFirst, "uregex_replaceFirst"}, - ]; - - /*********************************************************************** - - ***********************************************************************/ - - static this () - { - library = FunctionLoader.bind (icuin, targets); - } - - /*********************************************************************** - - ***********************************************************************/ - - static ~this () - { - FunctionLoader.unbind (library); - } + mixin(genICUNative!("in" + ,"Handle function (wchar*, uint, uint, ParseError*, ref UErrorCode)", "uregex_open" + ,"void function (Handle)", "uregex_close" + ,"Handle function (Handle, ref UErrorCode)", "uregex_clone" + ,"wchar* function (Handle, ref uint, ref UErrorCode)", "uregex_pattern" + ,"uint function (Handle, ref UErrorCode)", "uregex_flags" + ,"void function (Handle, wchar*, uint, ref UErrorCode)", "uregex_setText" + ,"wchar* function (Handle, ref uint, ref UErrorCode)", "uregex_getText" + ,"uint function (Handle, uint, wchar*, uint, ref UErrorCode)", "uregex_group" + ,"uint function (Handle, ref UErrorCode)", "uregex_groupCount" + ,"uint function (Handle, uint, ref UErrorCode)", "uregex_start" + ,"uint function (Handle, uint, ref UErrorCode)", "uregex_end" + ,"void function (Handle, uint, ref UErrorCode)", "uregex_reset" + ,"bool function (Handle, uint, ref UErrorCode)", "uregex_matches" + ,"bool function (Handle, uint, ref UErrorCode)", "uregex_lookingAt" + ,"bool function (Handle, uint, ref UErrorCode)", "uregex_find" + ,"bool function (Handle, ref UErrorCode)", "uregex_findNext" + ,"uint function (Handle, wchar*, uint, wchar*, uint, ref UErrorCode)", "uregex_replaceAll" + ,"uint function (Handle, wchar*, uint, wchar*, uint, ref UErrorCode)", "uregex_replaceFirst" + )); }