Mercurial > projects > dwt2

diff com.ibm.icu/src/com/ibm/icu/mangoicu/UText.d @ 120:536e43f63c81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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/UText.d	Sun Apr 17 17:58:36 2011 +0200
+++ b/com.ibm.icu/src/com/ibm/icu/mangoicu/UText.d	Sat Jul 09 15:50:20 2011 +0300
@@ -149,101 +149,37 @@
 
         ***********************************************************************/
 
-        private static void* library;
-
-        /***********************************************************************
-
-        ***********************************************************************/
-    static extern(System){
-        UText * function(UText* ut) utext_close;
-        UText * function(UText* ut, char *s, long length, inout ICU.UErrorCode status) utext_openUTF8;
-//         UText * function(UText* ut, UChar *s, int64_t length, inout UErrorCode status) utext_openUChars;
-//         UText * function(UText* ut, U_NAMESPACE_QUALIFIER UnicodeString *s, inout UErrorCode status) utext_openUnicodeString;
-//         UText * function(UText* ut, U_NAMESPACE_QUALIFIER UnicodeString *s, inout UErrorCode status) utext_openConstUnicodeString;
-//         UText * function(UText* ut, U_NAMESPACE_QUALIFIER Replaceable *rep, inout UErrorCode status) utext_openReplaceable;
-//         UText * function(UText* ut, U_NAMESPACE_QUALIFIER CharacterIterator *ic, inout UErrorCode status) utext_openCharacterIterator;
-//         UText * function(UText* ut, UText *src, UBool deep, UBool readOnly, inout UErrorCode status) utext_clone;
-//         UBool function(const UText *a, const UText *b) utext_equals;
-//         int64_t function(UText* ut) utext_nativeLength;
-//         UBool function(UText* ut) utext_isLengthExpensive;
-//         UChar32 function(UText* ut, int64_t nativeIndex) utext_char32At;
-//         UChar32 function(UText* ut) utext_current32;
-//         UChar32 function(UText* ut) utext_next32;
-//         UChar32 function(UText* ut) utext_previous32;
-//         UChar32 function(UText* ut, int64_t nativeIndex) utext_next32From;
-//         UChar32 function(UText* ut, int64_t nativeIndex) utext_previous32From;
-//         int64_t function(UText* ut) utext_getNativeIndex;
-//         void function(UText* ut, int64_t nativeIndex) utext_setNativeIndex;
-//         UBool function(UText* ut, int delta) utext_moveIndex32;
-//         int64_t function(UText* ut) utext_getPreviousNativeIndex;
-//         int function(UText* ut, int64_t nativeStart, int64_t nativeLimit,
-//                 UChar *dest, int destCapacity,
-//                 inout UErrorCode status) utext_extract;
-//         UBool function(UText* ut) utext_isWritable;
-//         UBool function(UText* ut) utext_hasMetaData;
-//         int function(UText* ut,
-//                 int64_t nativeStart, int64_t nativeLimit,
-//                 UChar *replacementText, int replacementLength,
-//                 inout UErrorCode status) utext_replace;
-//         void function(UText* ut,
-//                 int64_t nativeStart, int64_t nativeLimit,
-//                 int64_t destIndex,
-//                 UBool move,
-//                 inout UErrorCode status) utext_copy;
-//         void function(UText* ut) utext_freeze;
-//         UText * function(UText* ut, int extraSpace, inout UErrorCode status) utext_setup;
-    }
-
-        /***********************************************************************
-
-        ***********************************************************************/
-        static  FunctionLoader.Bind[] targets = [
-            {cast(void**) &utext_close,                   "utext_close"},
-            {cast(void**) &utext_openUTF8,                "utext_openUTF8"},
-//         {cast(void**) &utext_openUChars,              "utext_openUChars"},
-//         {cast(void**) &utext_openUnicodeString,       "utext_openUnicodeString"},
-//         {cast(void**) &utext_openConstUnicodeString,  "utext_openConstUnicodeString"},
-//         {cast(void**) &utext_openReplaceable,         "utext_openReplaceable"},
-//         {cast(void**) &utext_openCharacterIterator,   "utext_openCharacterIterator"},
-//         {cast(void**) &utext_clone,                   "utext_clone"},
-//         {cast(void**) &utext_equals,                  "utext_equals"},
-//         {cast(void**) &utext_nativeLength,            "utext_nativeLength"},
-//         {cast(void**) &utext_isLengthExpensive,       "utext_isLengthExpensive"},
-//         {cast(void**) &utext_char32At,                "utext_char32At"},
-//         {cast(void**) &utext_current32,               "utext_current32"},
-//         {cast(void**) &utext_next32,                  "utext_next32"},
-//         {cast(void**) &utext_next32From,              "utext_next32From"},
-//         {cast(void**) &utext_previous32,              "utext_previous32"},
-//         {cast(void**) &utext_previous32From,          "utext_previous32From"},
-//         {cast(void**) &utext_setNativeIndex,          "utext_setNativeIndex"},
-//         {cast(void**) &utext_moveIndex32,             "utext_moveIndex32"},
-//         {cast(void**) &utext_getPreviousNativeIndex,  "utext_getPreviousNativeIndex"},
-//         {cast(void**) &utext_extract,                 "utext_extract"},
-//         {cast(void**) &utext_isWritable,              "utext_isWritable"},
-//         {cast(void**) &utext_hasMetaData,             "utext_hasMetaData"},
-//         {cast(void**) &utext_replace,                 "utext_replace"},
-//         {cast(void**) &utext_copy,                    "utext_copy"},
-//         {cast(void**) &utext_freeze,                  "utext_freeze"},
-//         {cast(void**) &utext_setup,                   "utext_setup"},
-        ];
-
-        /***********************************************************************
-
-        ***********************************************************************/
-
-        static this ()
-        {
-                library = FunctionLoader.bind (ICU.icuuc, targets);
-                //test ();
-        }
-
-        /***********************************************************************
-
-        ***********************************************************************/
-
-        static ~this ()
-        {
-                FunctionLoader.unbind (library);
-        }
-
+        /*extern(System)*/
+        mixin(genICUNative!("uc"
+            ,"UText * function(UText* ut)", "utext_close"
+            ,"UText * function(UText* ut, char *s, long length, ref ICU.UErrorCode status)", "utext_openUTF8"
+            /+
+            ,"UText * function(UText* ut, UChar *s, int64_t length, ref UErrorCode status)", "utext_openUChars"
+            ,"UText * function(UText* ut, U_NAMESPACE_QUALIFIER UnicodeString *s, ref UErrorCode status)", "utext_openUnicodeString"
+            ,"UText * function(UText* ut, U_NAMESPACE_QUALIFIER UnicodeString *s, ref UErrorCode status)", "utext_openConstUnicodeString"
+            ,"UText * function(UText* ut, U_NAMESPACE_QUALIFIER Replaceable *rep, ref UErrorCode status)", "utext_openReplaceable"
+            ,"UText * function(UText* ut, U_NAMESPACE_QUALIFIER CharacterIterator *ic, ref UErrorCode status)", "utext_openCharacterIterator"
+            ,"UText * function(UText* ut, UText *src, UBool deep, UBool readOnly, ref UErrorCode status)", "utext_clone"
+            ,"UBool function(const UText *a, const UText *b)", "utext_equals"
+            ,"int64_t function(UText* ut)", "utext_nativeLength"
+            ,"UBool function(UText* ut)", "utext_isLengthExpensive"
+            ,"UChar32 function(UText* ut, int64_t nativeIndex)", "utext_char32At"
+            ,"UChar32 function(UText* ut)", "utext_current32"
+            ,"UChar32 function(UText* ut)", "utext_next32"
+            ,"UChar32 function(UText* ut)", "utext_previous32"
+            ,"UChar32 function(UText* ut, int64_t nativeIndex)", "utext_next32From"
+            ,"UChar32 function(UText* ut, int64_t nativeIndex)", "utext_previous32From"
+            ,"int64_t function(UText* ut)", "utext_getNativeIndex"
+            ,"void function(UText* ut, int64_t nativeIndex)", "utext_setNativeIndex"
+            ,"UBool function(UText* ut, int delta)", "utext_moveIndex32"
+            ,"int64_t function(UText* ut)", "utext_getPreviousNativeIndex"
+            ,"int function(UText* ut, int64_t nativeStart, int64_t nativeLimit, UChar *dest, int destCapacity, ref UErrorCode status)", "utext_extract"
+            ,"UBool function(UText* ut)", "utext_isWritable"
+            ,"UBool function(UText* ut)", "utext_hasMetaData"
+            ,"int function(UText* ut, int64_t nativeStart, int64_t nativeLimit, UChar *replacementText, int replacementLength, ref UErrorCode status)", "utext_replace"
+            ,"void function(UText* ut, int64_t nativeStart, int64_t nativeLimit, int64_t destIndex, UBool move, ref UErrorCode status)", "utext_copy"
+            ,"void function(UText* ut)", "utext_freeze"
+            ,"UText * function(UText* ut, int extraSpace, ref UErrorCode status)", "utext_setup"
+            +/
+        ));
 }