diff com.ibm.icu/src/com/ibm/icu/mangoicu/UDateFormat.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/UDateFormat.d	Sun Apr 17 17:58:36 2011 +0200
+++ b/com.ibm.icu/src/com/ibm/icu/mangoicu/UDateFormat.d	Sat Jul 09 15:50:20 2011 +0300
@@ -178,7 +178,7 @@
 
         ***********************************************************************/
 
-        this (Style time, Style date, inout ULocale locale, inout UTimeZone tz, UStringView pattern=null)
+        this (Style time, Style date, ref ULocale locale, ref UTimeZone tz, UStringView pattern=null)
         {
                 UErrorCode  e;
                 wchar* p;
@@ -209,7 +209,7 @@
 
         void format (UString dst, UDate date, UFieldPos p = null)
         {
-                uint fmat (wchar* result, uint len, inout UErrorCode e)
+                uint fmat (wchar* result, uint len, ref UErrorCode e)
                 {
                         return udat_format (handle, date, result, len, p, e);
                 }
@@ -309,7 +309,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 udat_toPattern (handle, localize, result, len, e);
                 }
@@ -359,67 +359,21 @@
 
         ***********************************************************************/
 
-        private static void* library;
-
-        /***********************************************************************
-
-        ***********************************************************************/
-
-        private static extern (C) 
-        {
-                Handle function (uint, uint, char*, wchar*, uint, wchar*, uint, inout UErrorCode) udat_open;
-                void   function (Handle) udat_close;
-                uint   function (Handle, UDate, wchar*, uint, UFieldPos, inout UErrorCode) udat_format;
-                UDate  function (Handle, wchar*, uint, uint*, inout UErrorCode) udat_parse;
-                void   function (Handle, Handle) udat_setCalendar;
-                void   function (Handle, Handle) udat_setNumberFormat;
-                UDate  function (Handle, inout UErrorCode) udat_get2DigitYearStart;
-                void   function (Handle, UDate, inout UErrorCode) udat_set2DigitYearStart;
-                uint   function (Handle, byte, wchar*, uint, inout UErrorCode) udat_toPattern;
-                void   function (Handle, byte, wchar*, uint) udat_applyPattern;
-                void   function (Handle, byte) udat_setLenient;
-                byte   function (Handle) udat_isLenient;
-                Handle function (Handle) udat_getCalendar;
-        }
-
-        /***********************************************************************
-
-        ***********************************************************************/
-
-        static  FunctionLoader.Bind[] targets = 
-                [
-                {cast(void**) &udat_open,               "udat_open"}, 
-                {cast(void**) &udat_close,              "udat_close"},
-                {cast(void**) &udat_format,             "udat_format"},
-                {cast(void**) &udat_parse,              "udat_parse"},
-                {cast(void**) &udat_setCalendar,        "udat_setCalendar"},
-                {cast(void**) &udat_setNumberFormat,    "udat_setNumberFormat"},
-                {cast(void**) &udat_get2DigitYearStart, "udat_get2DigitYearStart"},
-                {cast(void**) &udat_set2DigitYearStart, "udat_set2DigitYearStart"},
-                {cast(void**) &udat_toPattern,          "udat_toPattern"},
-                {cast(void**) &udat_applyPattern,       "udat_applyPattern"},
-                {cast(void**) &udat_setLenient,         "udat_setLenient"},
-                {cast(void**) &udat_isLenient,          "udat_isLenient"},
-                {cast(void**) &udat_getCalendar,        "udat_getCalendar"},
-                ];
-
-        /***********************************************************************
-
-        ***********************************************************************/
-
-        static this ()
-        {
-                library = FunctionLoader.bind (icuin, targets);
-        }
-
-        /***********************************************************************
-
-        ***********************************************************************/
-
-        static ~this ()
-        {
-                FunctionLoader.unbind (library);
-        }
+        mixin(genICUNative!("in"
+                ,"Handle function (uint, uint, char*, wchar*, uint, wchar*, uint, ref UErrorCode)", "udat_open"
+                ,"void   function (Handle)", "udat_close"
+                ,"uint   function (Handle, UDate, wchar*, uint, UFieldPos, ref UErrorCode)", "udat_format"
+                ,"UDate  function (Handle, wchar*, uint, uint*, ref UErrorCode)", "udat_parse"
+                ,"void   function (Handle, Handle)", "udat_setCalendar"
+                ,"void   function (Handle, Handle)", "udat_setNumberFormat"
+                ,"UDate  function (Handle, ref UErrorCode)", "udat_get2DigitYearStart"
+                ,"void   function (Handle, UDate, ref UErrorCode)", "udat_set2DigitYearStart"
+                ,"uint   function (Handle, byte, wchar*, uint, ref UErrorCode)", "udat_toPattern"
+                ,"void   function (Handle, byte, wchar*, uint)", "udat_applyPattern"
+                ,"void   function (Handle, byte)", "udat_setLenient"
+                ,"byte   function (Handle)", "udat_isLenient"
+                ,"Handle function (Handle)", "udat_getCalendar"
+        ));
 }