Mercurial > projects > dwt2
diff com.ibm.icu/src/com/ibm/icu/mangoicu/UNumberFormat.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/UNumberFormat.d Sun Apr 17 17:58:36 2011 +0200 +++ b/com.ibm.icu/src/com/ibm/icu/mangoicu/UNumberFormat.d Sat Jul 09 15:50:20 2011 +0300 @@ -99,7 +99,7 @@ ***********************************************************************/ - this (inout ULocale locale) + this (ref ULocale locale) { super (Style.Decimal, null, locale); } @@ -130,7 +130,7 @@ ***********************************************************************/ - this (inout ULocale locale) + this (ref ULocale locale) { super (Style.Currency, null, locale); } @@ -147,7 +147,7 @@ ***********************************************************************/ - this (inout ULocale locale) + this (ref ULocale locale) { super (Style.Percent, null, locale); } @@ -164,7 +164,7 @@ ***********************************************************************/ - this (inout ULocale locale) + this (ref ULocale locale) { super (Style.Scientific, null, locale); } @@ -181,7 +181,7 @@ ***********************************************************************/ - this (inout ULocale locale) + this (ref ULocale locale) { super (Style.Spellout, null, locale); } @@ -198,7 +198,7 @@ ***********************************************************************/ - this (inout ULocale locale) + this (ref ULocale locale) { super (Style.Duration, null, locale); } @@ -215,7 +215,7 @@ ***********************************************************************/ - this (inout ULocale locale) + this (ref ULocale locale) { super (Style.RuleBased, null, locale); } @@ -251,7 +251,7 @@ ***********************************************************************/ - this (Style style, char[] pattern, inout ULocale locale) + this (Style style, char[] pattern, ref ULocale locale) { super (style, pattern, locale); } @@ -648,7 +648,7 @@ void getPattern (UString dst, bool localize) { - uint fmat (wchar* result, uint len, inout UErrorCode e) + uint fmat (wchar* result, uint len, ref UErrorCode e) { return unum_toPattern (handle, localize, result, len, e); } @@ -768,7 +768,7 @@ ***********************************************************************/ - this (Style style, char[] pattern, inout ULocale locale) + this (Style style, char[] pattern, ref ULocale locale) { UErrorCode e; @@ -791,7 +791,7 @@ void format (UString dst, int number, UFieldPos p = null) { - uint fmat (wchar* result, uint len, inout UErrorCode e) + uint fmat (wchar* result, uint len, ref UErrorCode e) { return unum_format (handle, number, result, len, p, e); } @@ -805,7 +805,7 @@ void format (UString dst, long number, UFieldPos p = null) { - uint fmat (wchar* result, uint len, inout UErrorCode e) + uint fmat (wchar* result, uint len, ref UErrorCode e) { return unum_formatInt64 (handle, number, result, len, p, e); } @@ -819,7 +819,7 @@ void format (UString dst, double number, UFieldPos p = null) { - uint fmat (wchar* result, uint len, inout UErrorCode e) + uint fmat (wchar* result, uint len, ref UErrorCode e) { return unum_formatDouble (handle, number, result, len, p, e); } @@ -870,64 +870,20 @@ ***********************************************************************/ - private static void* library; - - /*********************************************************************** - - ***********************************************************************/ - - private static extern (C) - { - Handle function (uint, char*, uint, char*, ParseError, inout UErrorCode) unum_open; - void function (Handle) unum_close; - int function (Handle, int, wchar*, uint, UFieldPos, inout UErrorCode) unum_format; - int function (Handle, long, wchar*, uint, UFieldPos, inout UErrorCode) unum_formatInt64; - int function (Handle, double, wchar*, uint, UFieldPos, inout UErrorCode) unum_formatDouble; - int function (Handle, wchar*, uint, uint*, inout UErrorCode) unum_parse; - long function (Handle, wchar*, uint, uint*, inout UErrorCode) unum_parseInt64; - double function (Handle, wchar*, uint, uint*, inout UErrorCode) unum_parseDouble; - int function (Handle, uint) unum_getAttribute; - void function (Handle, uint, uint) unum_setAttribute; - uint function (Handle, byte, wchar*, uint, inout UErrorCode) unum_toPattern; - void function (Handle, byte, wchar*, uint, ParseError, inout UErrorCode) unum_applyPattern; - } - - /*********************************************************************** - - ***********************************************************************/ - - static FunctionLoader.Bind[] targets = - [ - {cast(void**) &unum_open, "unum_open"}, - {cast(void**) &unum_close, "unum_close"}, - {cast(void**) &unum_format, "unum_format"}, - {cast(void**) &unum_formatInt64 "unum_formatInt64"}, - {cast(void**) &unum_formatDouble "unum_formatDouble"}, - {cast(void**) &unum_parse, "unum_parse"}, - {cast(void**) &unum_parseInt64 "unum_parseInt64"}, - {cast(void**) &unum_parseDouble "unum_parseDouble"}, - {cast(void**) &unum_getAttribute "unum_getAttribute"}, - {cast(void**) &unum_setAttribute "unum_setAttribute"}, - {cast(void**) &unum_toPattern "unum_toPattern"}, - ]; - - /*********************************************************************** - - ***********************************************************************/ - - static this () - { - library = FunctionLoader.bind (icuin, targets); - } - - /*********************************************************************** - - ***********************************************************************/ - - static ~this () - { - FunctionLoader.unbind (library); - } + mixin(genICUNative!("in" + ,"Handle function (uint, char*, uint, char*, ParseError, ref UErrorCode)", "unum_open" + ,"void function (Handle)", "unum_close" + ,"int function (Handle, int, wchar*, uint, UFieldPos, ref UErrorCode)", "unum_format" + ,"int function (Handle, long, wchar*, uint, UFieldPos, ref UErrorCode)", "unum_formatInt64" + ,"int function (Handle, double, wchar*, uint, UFieldPos, ref UErrorCode)", "unum_formatDouble" + ,"int function (Handle, wchar*, uint, uint*, ref UErrorCode)", "unum_parse" + ,"long function (Handle, wchar*, uint, uint*, ref UErrorCode)", "unum_parseInt64" + ,"double function (Handle, wchar*, uint, uint*, ref UErrorCode)", "unum_parseDouble" + ,"int function (Handle, uint)", "unum_getAttribute" + ,"void function (Handle, uint, uint)", "unum_setAttribute" + ,"uint function (Handle, byte, wchar*, uint, ref UErrorCode)", "unum_toPattern" + ,"void function (Handle, byte, wchar*, uint, ParseError, ref UErrorCode)", "unum_applyPattern" + )); }