comparison com.ibm.icu/src/com/ibm/icu/mangoicu/UNormalize.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
comparison
equal deleted inserted replaced
119:d00e8db0a568 120:536e43f63c81
220 220
221 ***********************************************************************/ 221 ***********************************************************************/
222 222
223 static void normalize (UStringView src, UString dst, Mode mode, Options o = Options.None) 223 static void normalize (UStringView src, UString dst, Mode mode, Options o = Options.None)
224 { 224 {
225 uint fmt (wchar* dst, uint len, inout UErrorCode e) 225 uint fmt (wchar* dst, uint len, ref UErrorCode e)
226 { 226 {
227 return unorm_normalize (src.get.ptr, src.len, mode, o, dst, len, e); 227 return unorm_normalize (src.get.ptr, src.len, mode, o, dst, len, e);
228 } 228 }
229 229
230 dst.format (&fmt, "failed to normalize"); 230 dst.format (&fmt, "failed to normalize");
295 295
296 ***********************************************************************/ 296 ***********************************************************************/
297 297
298 static void concatenate (UStringView left, UStringView right, UString dst, Mode mode, Options o = Options.None) 298 static void concatenate (UStringView left, UStringView right, UString dst, Mode mode, Options o = Options.None)
299 { 299 {
300 uint fmt (wchar* p, uint len, inout UErrorCode e) 300 uint fmt (wchar* p, uint len, ref UErrorCode e)
301 { 301 {
302 return unorm_concatenate (left.get.ptr, left.len, right.get.ptr, right.len, p, len, mode, o, e); 302 return unorm_concatenate (left.get.ptr, left.len, right.get.ptr, right.len, p, len, mode, o, e);
303 } 303 }
304 304
305 dst.format (&fmt, "failed to concatenate"); 305 dst.format (&fmt, "failed to concatenate");
341 complicated by the issues regarding D and DLLs on the 341 complicated by the issues regarding D and DLLs on the
342 Windows platform 342 Windows platform
343 343
344 ***********************************************************************/ 344 ***********************************************************************/
345 345
346 private static void* library; 346 mixin(genICUNative!("uc"
347 347 ,"uint function (wchar*, uint, uint, uint, wchar*, uint, ref UErrorCode)", "unorm_normalize"
348 /*********************************************************************** 348 ,"uint function (wchar*, uint, uint, uint, ref UErrorCode)", "unorm_quickCheckWithOptions"
349 349 ,"byte function (wchar*, uint, uint, uint, ref UErrorCode)", "unorm_isNormalizedWithOptions"
350 ***********************************************************************/ 350 ,"uint function (wchar*, uint, wchar*, uint, wchar*, uint, uint, uint, ref UErrorCode)", "unorm_concatenate"
351 351 ,"uint function (wchar*, uint, wchar*, uint, uint, ref UErrorCode)", "unorm_compare"
352 private static extern (C) 352 ));
353 {
354 uint function (wchar*, uint, uint, uint, wchar*, uint, inout UErrorCode) unorm_normalize;
355 uint function (wchar*, uint, uint, uint, inout UErrorCode) unorm_quickCheckWithOptions;
356 byte function (wchar*, uint, uint, uint, inout UErrorCode) unorm_isNormalizedWithOptions;
357 uint function (wchar*, uint, wchar*, uint, wchar*, uint, uint, uint, inout UErrorCode) unorm_concatenate;
358 uint function (wchar*, uint, wchar*, uint, uint, inout UErrorCode) unorm_compare;
359 }
360
361 /***********************************************************************
362
363 ***********************************************************************/
364
365 static FunctionLoader.Bind[] targets =
366 [
367 {cast(void**) &unorm_normalize, "unorm_normalize"},
368 {cast(void**) &unorm_quickCheckWithOptions, "unorm_quickCheckWithOptions"},
369 {cast(void**) &unorm_isNormalizedWithOptions, "unorm_isNormalizedWithOptions"},
370 {cast(void**) &unorm_concatenate, "unorm_concatenate"},
371 {cast(void**) &unorm_compare, "unorm_compare"},
372 ];
373
374 /***********************************************************************
375
376 ***********************************************************************/
377
378 static this ()
379 {
380 library = FunctionLoader.bind (icuuc, targets);
381 }
382
383 /***********************************************************************
384
385 ***********************************************************************/
386
387 static ~this ()
388 {
389 FunctionLoader.unbind (library);
390 }
391 } 353 }