Skip to content

stubs: match ICU signature for unorm2_normalize (NFC) #14734

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 26, 2018
Merged

stubs: match ICU signature for unorm2_normalize (NFC) #14734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions stdlib/public/SwiftShims/UnicodeShims.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,8 +440,8 @@ __swift_stdlib_unorm2_getNFCInstance(__swift_stdlib_UErrorCode *);
SWIFT_RUNTIME_STDLIB_INTERFACE
__swift_int32_t
__swift_stdlib_unorm2_normalize(const __swift_stdlib_UNormalizer2 *,
const __swift_uint16_t *, __swift_int32_t,
__swift_uint16_t *, __swift_int32_t,
const __swift_stdlib_UChar *, __swift_int32_t,
__swift_stdlib_UChar *, __swift_int32_t,
__swift_stdlib_UErrorCode *);

SWIFT_RUNTIME_STDLIB_INTERFACE
Expand Down
13 changes: 11 additions & 2 deletions stdlib/public/stubs/UnicodeNormalization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ UBool u_isdefined(UChar32);
#include <unicode/uiter.h>
#include <unicode/ubrk.h>
#include <unicode/uchar.h>
#include <unicode/uvernum.h>

#pragma clang diagnostic pop

Expand Down Expand Up @@ -288,11 +289,19 @@ swift::__swift_stdlib_unorm2_getNFCInstance(__swift_stdlib_UErrorCode *err) {
}

int32_t swift::__swift_stdlib_unorm2_normalize(
const __swift_stdlib_UNormalizer2 *norm, const __swift_uint16_t *src,
__swift_int32_t len, __swift_uint16_t *dst, __swift_int32_t capacity,
const __swift_stdlib_UNormalizer2 *norm, const __swift_stdlib_UChar *src,
__swift_int32_t len, __swift_stdlib_UChar *dst, __swift_int32_t capacity,
__swift_stdlib_UErrorCode *err) {
// TODO remove this compatibility when we require ICU >= 60 on Linux
#if defined(__APPLE__) || U_ICU_VERSION_MAJOR_NUM >= 60
return unorm2_normalize(ptr_cast<UNormalizer2>(norm), src, len, dst, capacity,
ptr_cast<UErrorCode>(err));
#else
return unorm2_normalize(ptr_cast<UNormalizer2>(norm),
reinterpret_cast<const UChar *>(src), len,
reinterpret_cast<UChar *>(dst), capacity,
ptr_cast<UErrorCode>(err));
#endif
}

__swift_int32_t swift::__swift_stdlib_unorm2_spanQuickCheckYes(
Expand Down