Mercurial > projects > dwt2
diff com.ibm.icu/src/com/ibm/icu/mangoicu/UString.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/UString.d Sun Apr 17 17:58:36 2011 +0200 +++ b/com.ibm.icu/src/com/ibm/icu/mangoicu/UString.d Sat Jul 09 15:50:20 2011 +0300 @@ -181,7 +181,7 @@ ***********************************************************************/ - this (CString16 content, bool mutable = true) + this (in wchar[] content, bool mutable = true) { setTo (content, mutable); } @@ -386,6 +386,18 @@ /*********************************************************************** + Append a single UTF32 unit to this UString + + ***********************************************************************/ + + UString opCat (dchar chr) + { + dchar[1] chars = chr; + return opCat (chars); + } + + /*********************************************************************** + Append text to this UString ***********************************************************************/ @@ -403,7 +415,7 @@ UString opCat (char[] chars) { - uint fmt (wchar* dst, uint len, inout UErrorCode e) + uint fmt (wchar* dst, uint len, ref UErrorCode e) { uint x; @@ -417,6 +429,26 @@ /*********************************************************************** + Converts a sequence of UTF32 units to UChars (UTF-16) + + ***********************************************************************/ + + UString opCat (dchar[] chars) + { + uint fmt (wchar* dst, uint len, ref UErrorCode e) + { + uint x; + + u_strFromUTF32 (dst, len, &x, chars.ptr, chars.length, e); + return x; + } + + expand (chars.length); + return format (&fmt, "failed to append UTF dchar[]"); + } + + /*********************************************************************** + Set a section of this UString to the specified character ***********************************************************************/ @@ -439,7 +471,7 @@ ***********************************************************************/ - UString setTo (CString16 chars, bool mutable = true) + UString setTo (in wchar[] chars, bool mutable = true) { len = chars.length; if ((this.mutable = mutable) == true) @@ -621,9 +653,9 @@ ***********************************************************************/ - typedef uint delegate (wchar* dst, uint len, inout UErrorCode e) Formatter; + typedef uint delegate (wchar* dst, uint len, ref UErrorCode e) Formatter; - package final UString format (Formatter format, CString msg) + package final UString format (Formatter format, String msg) { UErrorCode e; uint length; @@ -1101,9 +1133,9 @@ ***********************************************************************/ - final UString toLower (UString dst, inout ULocale locale) + final UString toLower (UString dst, ref ULocale locale) { - uint lower (wchar* dst, uint length, inout UErrorCode e) + uint lower (wchar* dst, uint length, ref UErrorCode e) { return u_strToLower (dst, length, content.ptr, len, ICU.toString(locale.name), e); } @@ -1141,9 +1173,9 @@ ***********************************************************************/ - final UString toUpper (UString dst, inout ULocale locale) + final UString toUpper (UString dst, ref ULocale locale) { - uint upper (wchar* dst, uint length, inout UErrorCode e) + uint upper (wchar* dst, uint length, ref UErrorCode e) { return u_strToUpper (dst, length, content.ptr, len, ICU.toString(locale.name), e); } @@ -1169,7 +1201,7 @@ final UString toFolded (UString dst, CaseOption option = CaseOption.Default) { - uint fold (wchar* dst, uint length, inout UErrorCode e) + uint fold (wchar* dst, uint length, ref UErrorCode e) { return u_strFoldCase (dst, length, content.ptr, len, option, e); } @@ -1381,7 +1413,7 @@ ***********************************************************************/ - final private void pinIndex (inout uint x) + final private void pinIndex (ref uint x) { if (x > len) x = len; @@ -1393,7 +1425,7 @@ ***********************************************************************/ - final private void pinIndices (inout uint start, inout uint length) + final private void pinIndices (ref uint start, ref uint length) { if (start > len) start = len; @@ -1426,68 +1458,22 @@ ***********************************************************************/ - private static void* library; - - /*********************************************************************** - - ***********************************************************************/ - - private static extern (C) - { - wchar* function (wchar*, uint, wchar*, uint) u_strFindFirst; - wchar* function (wchar*, uint, wchar*, uint) u_strFindLast; - wchar* function (wchar*, wchar, uint) u_memchr; - wchar* function (wchar*, wchar, uint) u_memrchr; - int function (wchar*, uint, wchar*, uint, bool) u_strCompare; - int function (wchar*, uint, wchar*, uint, uint, inout UErrorCode) u_strCaseCompare; - dchar function (CharAt, uint*, uint, void*) u_unescapeAt; - uint function (wchar*, uint) u_countChar32; - uint function (wchar*, uint, wchar*, uint, char*, inout UErrorCode) u_strToUpper; - uint function (wchar*, uint, wchar*, uint, char*, inout UErrorCode) u_strToLower; - uint function (wchar*, uint, wchar*, uint, uint, inout UErrorCode) u_strFoldCase; - wchar* function (wchar*, uint, uint*, char*, uint, inout UErrorCode) u_strFromUTF8; - char* function (char*, uint, uint*, wchar*, uint, inout UErrorCode) u_strToUTF8; - } - - /*********************************************************************** - - ***********************************************************************/ - - static FunctionLoader.Bind[] targets = - [ - {cast(void**) &u_strFindFirst, "u_strFindFirst"}, - {cast(void**) &u_strFindLast, "u_strFindLast"}, - {cast(void**) &u_memchr, "u_memchr"}, - {cast(void**) &u_memrchr, "u_memrchr"}, - {cast(void**) &u_strCompare, "u_strCompare"}, - {cast(void**) &u_strCaseCompare, "u_strCaseCompare"}, - {cast(void**) &u_unescapeAt, "u_unescapeAt"}, - {cast(void**) &u_countChar32, "u_countChar32"}, - {cast(void**) &u_strToUpper, "u_strToUpper"}, - {cast(void**) &u_strToLower, "u_strToLower"}, - {cast(void**) &u_strFoldCase, "u_strFoldCase"}, - {cast(void**) &u_strFromUTF8, "u_strFromUTF8"}, - {cast(void**) &u_strToUTF8, "u_strToUTF8"}, - ]; - - /*********************************************************************** - - ***********************************************************************/ - - static this () - { - library = FunctionLoader.bind (icuuc, targets); - //test (); - } - - /*********************************************************************** - - ***********************************************************************/ - - static ~this () - { - FunctionLoader.unbind (library); - } + mixin(genICUNative!("uc" + ,"wchar* function (wchar*, uint, wchar*, uint)", "u_strFindFirst" + ,"wchar* function (wchar*, uint, wchar*, uint)", "u_strFindLast" + ,"wchar* function (wchar*, wchar, uint)", "u_memchr" + ,"wchar* function (wchar*, wchar, uint)", "u_memrchr" + ,"int function (wchar*, uint, wchar*, uint, bool)", "u_strCompare" + ,"int function (wchar*, uint, wchar*, uint, uint, ref UErrorCode)", "u_strCaseCompare" + ,"dchar function (CharAt, uint*, uint, void*)", "u_unescapeAt" + ,"uint function (wchar*, uint)", "u_countChar32" + ,"uint function (wchar*, uint, wchar*, uint, char*, ref UErrorCode)", "u_strToUpper" + ,"uint function (wchar*, uint, wchar*, uint, char*, ref UErrorCode)", "u_strToLower" + ,"uint function (wchar*, uint, wchar*, uint, uint, ref UErrorCode)", "u_strFoldCase" + ,"wchar* function (wchar*, uint, uint*, char*, uint, ref UErrorCode)", "u_strFromUTF8" + ,"wchar* function (wchar*, uint, uint*, dchar*, uint, ref UErrorCode)", "u_strFromUTF32" + ,"char* function (char*, uint, uint*, wchar*, uint, ref UErrorCode)", "u_strToUTF8" + )); /*********************************************************************** @@ -1496,7 +1482,7 @@ //private static void test() //{ // UString s = new UString (r"aaaqw \uabcd eaaa"); - // CString16 x = "dssfsdff"; + // const String16 x = "dssfsdff"; // s ~ x ~ x; // wchar c = s[3]; // s[3] = 'Q';