102 lines
4.6 KiB
Diff
102 lines
4.6 KiB
Diff
|
--- a/stdlib/public/stubs/UnicodeNormalization.cpp
|
||
|
|
+++ b/stdlib/public/stubs/UnicodeNormalization.cpp
|
||
|
|
@@ -86,11 +86,8 @@ ASCIICollation() {
|
||
|
|
for (unsigned char c = 0; c < 128; ++c) {
|
||
|
|
UErrorCode ErrorCode = U_ZERO_ERROR;
|
||
|
|
intptr_t NumCollationElts = 0;
|
||
|
|
-#if defined(__CYGWIN__) || defined(_MSC_VER)
|
||
|
|
UChar Buffer[1];
|
||
|
|
-#else
|
||
|
|
- uint16_t Buffer[1];
|
||
|
|
-#endif
|
||
|
|
+
|
||
|
|
Buffer[0] = c;
|
||
|
|
|
||
|
|
UCollationElements *CollationIterator =
|
||
|
|
@@ -127,18 +124,9 @@ swift::_swift_stdlib_unicode_compare_utf16_utf16(const uint16_t *LeftString,
|
||
|
|
int32_t LeftLength,
|
||
|
|
const uint16_t *RightString,
|
||
|
|
int32_t RightLength) {
|
||
|
|
-#if defined(__CYGWIN__) || defined(_MSC_VER)
|
||
|
|
- // ICU UChar type is platform dependent. In Cygwin, it is defined
|
||
|
|
- // as wchar_t which size is 2. It seems that the underlying binary
|
||
|
|
- // representation is same with swift utf16 representation.
|
||
|
|
return ucol_strcoll(GetRootCollator(),
|
||
|
|
reinterpret_cast<const UChar *>(LeftString), LeftLength,
|
||
|
|
reinterpret_cast<const UChar *>(RightString), RightLength);
|
||
|
|
-#else
|
||
|
|
- return ucol_strcoll(GetRootCollator(),
|
||
|
|
- LeftString, LeftLength,
|
||
|
|
- RightString, RightLength);
|
||
|
|
-#endif
|
||
|
|
}
|
||
|
|
|
||
|
|
/// Compares the strings via the Unicode Collation Algorithm on the root locale.
|
||
|
|
@@ -156,12 +144,8 @@ swift::_swift_stdlib_unicode_compare_utf8_utf16(const unsigned char *LeftString,
|
||
|
|
UErrorCode ErrorCode = U_ZERO_ERROR;
|
||
|
|
|
||
|
|
uiter_setUTF8(&LeftIterator, reinterpret_cast<const char *>(LeftString), LeftLength);
|
||
|
|
-#if defined(__CYGWIN__) || defined(_MSC_VER)
|
||
|
|
uiter_setString(&RightIterator, reinterpret_cast<const UChar *>(RightString),
|
||
|
|
RightLength);
|
||
|
|
-#else
|
||
|
|
- uiter_setString(&RightIterator, RightString, RightLength);
|
||
|
|
-#endif
|
||
|
|
|
||
|
|
uint32_t Diff = ucol_strcollIter(GetRootCollator(),
|
||
|
|
&LeftIterator, &RightIterator, &ErrorCode);
|
||
|
|
@@ -199,14 +183,10 @@ swift::_swift_stdlib_unicode_compare_utf8_utf8(const unsigned char *LeftString,
|
||
|
|
void *swift::_swift_stdlib_unicodeCollationIterator_create(
|
||
|
|
const __swift_uint16_t *Str, __swift_uint32_t Length) {
|
||
|
|
UErrorCode ErrorCode = U_ZERO_ERROR;
|
||
|
|
-#if defined(__CYGWIN__) || defined(_MSC_VER)
|
||
|
|
UCollationElements *CollationIterator = ucol_openElements(
|
||
|
|
GetRootCollator(), reinterpret_cast<const UChar *>(Str), Length,
|
||
|
|
&ErrorCode);
|
||
|
|
-#else
|
||
|
|
- UCollationElements *CollationIterator = ucol_openElements(
|
||
|
|
- GetRootCollator(), Str, Length, &ErrorCode);
|
||
|
|
-#endif
|
||
|
|
+
|
||
|
|
if (U_FAILURE(ErrorCode)) {
|
||
|
|
swift::crash("_swift_stdlib_unicodeCollationIterator_create: ucol_openElements() failed.");
|
||
|
|
}
|
||
|
|
@@ -244,17 +224,12 @@ swift::_swift_stdlib_unicode_strToUpper(uint16_t *Destination,
|
||
|
|
const uint16_t *Source,
|
||
|
|
int32_t SourceLength) {
|
||
|
|
UErrorCode ErrorCode = U_ZERO_ERROR;
|
||
|
|
-#if defined(__CYGWIN__) || defined(_MSC_VER)
|
||
|
|
uint32_t OutputLength = u_strToUpper(reinterpret_cast<UChar *>(Destination),
|
||
|
|
DestinationCapacity,
|
||
|
|
reinterpret_cast<const UChar *>(Source),
|
||
|
|
SourceLength,
|
||
|
|
"", &ErrorCode);
|
||
|
|
-#else
|
||
|
|
- uint32_t OutputLength = u_strToUpper(Destination, DestinationCapacity,
|
||
|
|
- Source, SourceLength,
|
||
|
|
- "", &ErrorCode);
|
||
|
|
-#endif
|
||
|
|
+
|
||
|
|
if (U_FAILURE(ErrorCode) && ErrorCode != U_BUFFER_OVERFLOW_ERROR) {
|
||
|
|
swift::crash("u_strToUpper: Unexpected error uppercasing unicode string.");
|
||
|
|
}
|
||
|
|
@@ -271,17 +246,12 @@ swift::_swift_stdlib_unicode_strToLower(uint16_t *Destination,
|
||
|
|
const uint16_t *Source,
|
||
|
|
int32_t SourceLength) {
|
||
|
|
UErrorCode ErrorCode = U_ZERO_ERROR;
|
||
|
|
-#if defined(__CYGWIN__) || defined(_MSC_VER)
|
||
|
|
uint32_t OutputLength = u_strToLower(reinterpret_cast<UChar *>(Destination),
|
||
|
|
DestinationCapacity,
|
||
|
|
reinterpret_cast<const UChar *>(Source),
|
||
|
|
SourceLength,
|
||
|
|
"", &ErrorCode);
|
||
|
|
-#else
|
||
|
|
- uint32_t OutputLength = u_strToLower(Destination, DestinationCapacity,
|
||
|
|
- Source, SourceLength,
|
||
|
|
- "", &ErrorCode);
|
||
|
|
-#endif
|
||
|
|
+
|
||
|
|
if (U_FAILURE(ErrorCode) && ErrorCode != U_BUFFER_OVERFLOW_ERROR) {
|
||
|
|
swift::crash("u_strToLower: Unexpected error lowercasing unicode string.");
|
||
|
|
}
|