Mercurial > projects > dwt-addons
diff dwtx/dwtxhelper/mangoicu/USet.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/USet.d Sun Jul 06 23:30:07 2008 +0200 +++ b/dwtx/dwtxhelper/mangoicu/USet.d Mon Jul 07 15:53:07 2008 +0200 @@ -82,10 +82,10 @@ *******************************************************************************/ -module dwtx.dwthelper.mangoicu.USet; +module dwtx.dwtxhelper.mangoicu.USet; -private import dwtx.dwthelper.mangoicu.ICU, - dwtx.dwthelper.mangoicu.UString; +private import dwtx.dwtxhelper.mangoicu.ICU, + dwtx.dwtxhelper.mangoicu.UString; /******************************************************************************* @@ -152,9 +152,9 @@ ***********************************************************************/ - this (UText pattern, Options o = Options.None) + this (UStringView pattern, Options o = Options.None) { - Error e; + UErrorCode e; handle = uset_openPatternOptions (pattern.get.ptr, pattern.len, o, e); testError (e, "failed to open pattern-based charset"); @@ -192,9 +192,9 @@ ***********************************************************************/ - void applyPattern (UText pattern, Options o = Options.None) + void applyPattern (UStringView pattern, Options o = Options.None) { - Error e; + UErrorCode e; uset_applyPattern (handle, pattern.get.ptr, pattern.len, o, e); testError (e, "failed to apply pattern"); @@ -210,7 +210,7 @@ void toPattern (UString dst, bool escape) { - uint fmt (wchar* p, uint len, inout Error e) + uint fmt (wchar* p, uint len, inout UErrorCode e) { return uset_toPattern (handle, p, len, escape, e); } @@ -265,7 +265,7 @@ ***********************************************************************/ - void addString (UText t) + void addString (UStringView t) { uset_addString (handle, t.get.ptr, t.len); } @@ -301,7 +301,7 @@ ***********************************************************************/ - void removeString (UText t) + void removeString (UStringView t) { uset_removeString (handle, t.get.ptr, t.len); } @@ -372,7 +372,7 @@ ***********************************************************************/ - bool containsString (UText t) + bool containsString (UStringView t) { return uset_containsString (handle, t.get.ptr, t.len) != 0; } @@ -405,9 +405,9 @@ { Handle function (wchar start, wchar end) uset_open; void function (Handle) uset_close; - Handle function (wchar* pattern, uint patternLength, uint options, inout Error e) uset_openPatternOptions; - uint function (Handle, wchar* pattern, uint patternLength, uint options, inout Error e) uset_applyPattern; - uint function (Handle, wchar* result, uint resultCapacity, byte escapeUnprintable, inout Error e) uset_toPattern; + Handle function (wchar* pattern, uint patternLength, uint options, inout UErrorCode e) uset_openPatternOptions; + uint function (Handle, wchar* pattern, uint patternLength, uint options, inout UErrorCode e) uset_applyPattern; + uint function (Handle, wchar* result, uint resultCapacity, byte escapeUnprintable, inout UErrorCode e) uset_toPattern; void function (Handle, wchar c) uset_add; void function (Handle, Handle additionalSet) uset_addAll; void function (Handle, wchar start, wchar end) uset_addRange;