Mercurial > projects > dwt2
diff com.ibm.icu/src/com/ibm/icu/mangoicu/UCalendar.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/UCalendar.d Sun Apr 17 17:58:36 2011 +0200 +++ b/com.ibm.icu/src/com/ibm/icu/mangoicu/UCalendar.d Sat Jul 09 15:50:20 2011 +0300 @@ -242,7 +242,7 @@ ***********************************************************************/ - this (inout UTimeZone zone, inout ULocale locale, Type type = Type.Traditional) + this (ref UTimeZone zone, ref ULocale locale, Type type = Type.Traditional) { UErrorCode e; @@ -278,7 +278,7 @@ ***********************************************************************/ - void setTimeZone (inout UTimeZone zone) + void setTimeZone (ref UTimeZone zone) { UErrorCode e; @@ -292,9 +292,9 @@ ***********************************************************************/ - void getTimeZoneName (UString s, inout ULocale locale, DisplayNameType type=DisplayNameType.Standard) + void getTimeZoneName (UString s, ref ULocale locale, DisplayNameType type=DisplayNameType.Standard) { - uint format (wchar* dst, uint length, inout ICU.UErrorCode e) + uint format (wchar* dst, uint length, ref ICU.UErrorCode e) { return ucal_getTimeZoneDisplayName (handle, type, toString(locale.name), dst, length, e); } @@ -585,82 +585,27 @@ ***********************************************************************/ - private static void* library; - - /*********************************************************************** - - ***********************************************************************/ - - private static extern (C) - { - Handle function (wchar*, uint, char*, Type, inout UErrorCode) ucal_open; - void function (Handle) ucal_close; - UDate function () ucal_getNow; - UDate function (Handle, inout UErrorCode) ucal_getMillis; - void function (Handle, UDate, inout UErrorCode) ucal_setMillis; - void function (Handle, uint, uint, uint, inout UErrorCode) ucal_setDate; - void function (Handle, uint, uint, uint, uint, uint, uint, inout UErrorCode) ucal_setDateTime; - byte function (Handle, Handle) ucal_equivalentTo; - void function (Handle, uint, uint, inout UErrorCode) ucal_add; - void function (Handle, uint, uint, inout UErrorCode) ucal_roll; - uint function (Handle, uint, inout UErrorCode) ucal_get; - void function (Handle, uint, uint) ucal_set; - byte function (Handle, uint) ucal_isSet; - void function (Handle, uint) ucal_clearField; - void function (Handle) ucal_clear; - uint function (Handle, uint, uint, inout UErrorCode) ucal_getLimit; - void function (Handle, wchar*, uint, inout UErrorCode) ucal_setTimeZone; - byte function (Handle, uint) ucal_inDaylightTime; - uint function (Handle, uint) ucal_getAttribute; - void function (Handle, uint, uint) ucal_setAttribute; - uint function (Handle, uint, char*, wchar*, uint, inout UErrorCode) ucal_getTimeZoneDisplayName; - } - - /*********************************************************************** - - ***********************************************************************/ - - static FunctionLoader.Bind[] targets = - [ - {cast(void**) &ucal_open, "ucal_open"}, - {cast(void**) &ucal_close, "ucal_close"}, - {cast(void**) &ucal_getNow, "ucal_getNow"}, - {cast(void**) &ucal_getMillis, "ucal_getMillis"}, - {cast(void**) &ucal_setMillis, "ucal_setMillis"}, - {cast(void**) &ucal_setDate, "ucal_setDate"}, - {cast(void**) &ucal_setDateTime, "ucal_setDateTime"}, - {cast(void**) &ucal_equivalentTo, "ucal_equivalentTo"}, - {cast(void**) &ucal_add, "ucal_add"}, - {cast(void**) &ucal_roll, "ucal_roll"}, - {cast(void**) &ucal_get, "ucal_get"}, - {cast(void**) &ucal_set, "ucal_set"}, - {cast(void**) &ucal_clearField, "ucal_clearField"}, - {cast(void**) &ucal_clear, "ucal_clear"}, - {cast(void**) &ucal_getLimit, "ucal_getLimit"}, - {cast(void**) &ucal_setTimeZone, "ucal_setTimeZone"}, - {cast(void**) &ucal_inDaylightTime, "ucal_inDaylightTime"}, - {cast(void**) &ucal_getAttribute, "ucal_getAttribute"}, - {cast(void**) &ucal_setAttribute, "ucal_setAttribute"}, - {cast(void**) &ucal_isSet, "ucal_isSet"}, - {cast(void**) &ucal_getTimeZoneDisplayName, "ucal_getTimeZoneDisplayName"}, - ]; - - /*********************************************************************** - - ***********************************************************************/ - - static this () - { - library = FunctionLoader.bind (icuin, targets); - } - - /*********************************************************************** - - ***********************************************************************/ - - static ~this () - { - FunctionLoader.unbind (library); - } - + mixin(genICUNative!("in" + ,"Handle function (wchar*, uint, char*, Type, ref UErrorCode)", "ucal_open" + ,"void function (Handle)", "ucal_close" + ,"UDate function ()", "ucal_getNow" + ,"UDate function (Handle, ref UErrorCode)", "ucal_getMillis" + ,"void function (Handle, UDate, ref UErrorCode)", "ucal_setMillis" + ,"void function (Handle, uint, uint, uint, ref UErrorCode)", "ucal_setDate" + ,"void function (Handle, uint, uint, uint, uint, uint, uint, ref UErrorCode)", "ucal_setDateTime" + ,"byte function (Handle, Handle)", "ucal_equivalentTo" + ,"void function (Handle, uint, uint, ref UErrorCode)", "ucal_add" + ,"void function (Handle, uint, uint, ref UErrorCode)", "ucal_roll" + ,"uint function (Handle, uint, ref UErrorCode)", "ucal_get" + ,"void function (Handle, uint, uint)", "ucal_set" + ,"byte function (Handle, uint)", "ucal_isSet" + ,"void function (Handle, uint)", "ucal_clearField" + ,"void function (Handle)", "ucal_clear" + ,"uint function (Handle, uint, uint, ref UErrorCode)", "ucal_getLimit" + ,"void function (Handle, wchar*, uint, ref UErrorCode)", "ucal_setTimeZone" + ,"byte function (Handle, uint)", "ucal_inDaylightTime" + ,"uint function (Handle, uint)", "ucal_getAttribute" + ,"void function (Handle, uint, uint)", "ucal_setAttribute" + ,"uint function (Handle, uint, char*, wchar*, uint, ref UErrorCode)", "ucal_getTimeZoneDisplayName" + )); }