Mercurial > projects > dwt-addons
diff dwtx/dwtxhelper/mangoicu/UNormalize.d @ 91:11e8159caf7a
make the mango icu fork work.
| author | Frank Benoit <benoit@tionex.de> |
|---|---|
| date | Mon, 07 Jul 2008 15:53:07 +0200 |
| parents | 040da1cb0d76 |
| children | f05207c07a98 |
line wrap: on
line diff
--- a/dwtx/dwtxhelper/mangoicu/UNormalize.d Sun Jul 06 23:30:07 2008 +0200 +++ b/dwtx/dwtxhelper/mangoicu/UNormalize.d Mon Jul 07 15:53:07 2008 +0200 @@ -82,11 +82,11 @@ *******************************************************************************/ -module dwtx.dwthelper.mangoicu.UNormalize; +module dwtx.dwtxhelper.mangoicu.UNormalize; -private import dwtx.dwthelper.mangoicu.ICU, - dwtx.dwthelper.mangoicu.UString, - dwtx.dwthelper.mangoicu.ULocale; +private import dwtx.dwtxhelper.mangoicu.ICU, + dwtx.dwtxhelper.mangoicu.UString, + dwtx.dwtxhelper.mangoicu.ULocale; /******************************************************************************* @@ -220,9 +220,9 @@ ***********************************************************************/ - static void normalize (UText src, UString dst, Mode mode, Options o = Options.None) + static void normalize (UStringView src, UString dst, Mode mode, Options o = Options.None) { - uint fmt (wchar* dst, uint len, inout Error e) + uint fmt (wchar* dst, uint len, inout UErrorCode e) { return unorm_normalize (src.get.ptr, src.len, mode, o, dst, len, e); } @@ -245,9 +245,9 @@ ***********************************************************************/ - static Check check (UText t, Mode mode, Options o = Options.None) + static Check check (UStringView t, Mode mode, Options o = Options.None) { - Error e; + UErrorCode e; Check c = cast(Check) unorm_quickCheckWithOptions (t.get.ptr, t.len, mode, o, e); testError (e, "failed to perform normalization check"); @@ -266,9 +266,9 @@ ***********************************************************************/ - static bool isNormalized (UText t, Mode mode, Options o = Options.None) + static bool isNormalized (UStringView t, Mode mode, Options o = Options.None) { - Error e; + UErrorCode e; byte b = unorm_isNormalizedWithOptions (t.get.ptr, t.len, mode, o, e); testError (e, "failed to perform normalization test"); @@ -295,9 +295,9 @@ ***********************************************************************/ - static void concatenate (UText left, UText right, UString dst, Mode mode, Options o = Options.None) + static void concatenate (UStringView left, UStringView right, UString dst, Mode mode, Options o = Options.None) { - uint fmt (wchar* p, uint len, inout Error e) + uint fmt (wchar* p, uint len, inout UErrorCode e) { return unorm_concatenate (left.get.ptr, left.len, right.get.ptr, right.len, p, len, mode, o, e); } @@ -325,9 +325,9 @@ ***********************************************************************/ - static int compare (UText left, UText right, Options o = Options.None) + static int compare (UStringView left, UStringView right, Options o = Options.None) { - Error e; + UErrorCode e; int i = unorm_compare (left.get.ptr, left.len, right.get.ptr, right.len, o, e); testError (e, "failed to compare"); @@ -351,11 +351,11 @@ private static extern (C) { - uint function (wchar*, uint, uint, uint, wchar*, uint, inout Error) unorm_normalize; - uint function (wchar*, uint, uint, uint, inout Error) unorm_quickCheckWithOptions; - byte function (wchar*, uint, uint, uint, inout Error) unorm_isNormalizedWithOptions; - uint function (wchar*, uint, wchar*, uint, wchar*, uint, uint, uint, inout Error) unorm_concatenate; - uint function (wchar*, uint, wchar*, uint, uint, inout Error) unorm_compare; + uint function (wchar*, uint, uint, uint, wchar*, uint, inout UErrorCode) unorm_normalize; + uint function (wchar*, uint, uint, uint, inout UErrorCode) unorm_quickCheckWithOptions; + byte function (wchar*, uint, uint, uint, inout UErrorCode) unorm_isNormalizedWithOptions; + uint function (wchar*, uint, wchar*, uint, wchar*, uint, uint, uint, inout UErrorCode) unorm_concatenate; + uint function (wchar*, uint, wchar*, uint, uint, inout UErrorCode) unorm_compare; } /***********************************************************************