organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-10 07:39:16 +00:00
Code Issues1 Projects Releases Wiki Activity Actions1

ICU-22954 USet C++ iter samples no UnicodeString

Browse source 
See
This commit is contained in:
Markus Scherer 2025-02-05 21:41:01 +00:00
parent f9ee689d7a
commit 4a7a4c7521
4 changed files with 28 additions and 21 deletions
icu4c/source
common/unicode
uniset.huset.h
test/intltest
usetheaderonlytest.cppusettest.cpp

2
icu4c/source/common/unicode/uniset.h
View file

@ -1189,7 +1189,7 @@ public:
* for (auto el : set) {
* UnicodeString us(el);
* std::string u8;
* printf("set.string length %ld \"%s\"\n", (long)us.length(), us.toUTF8String(u8).c_str());
* printf("set.element length %ld \"%s\"\n", (long)us.length(), us.toUTF8String(u8).c_str());
* }
* \endcode
*

16
icu4c/source/common/unicode/uset.h
View file

@ -1700,9 +1700,11 @@ private:
* using U_HEADER_NESTED_NAMESPACE::USetStrings;
* LocalUSetPointer uset(uset_openPattern(u"[abcçカ🚴{}{abc}{de}]", -1, &errorCode));
* for (auto s : USetStrings(uset.getAlias())) {
* UnicodeString us(s);
* std::string u8;
* printf("uset.string length %ld \"%s\"\n", (long)s.length(), us.toUTF8String(u8).c_str());
* int32_t len32 = s.length();
* char utf8[200];
* u_strToUTF8WithSub(utf8, int32_t{sizeof(utf8) - 1}, nullptr,
* s.data(), len32, 0xFFFD, nullptr, errorCode);
* printf("uset.string length %ld \"%s\"\n", long{len32}, utf8);
* }
* \endcode
*
@ -1854,9 +1856,11 @@ private:
* using U_HEADER_NESTED_NAMESPACE::USetElements;
* LocalUSetPointer uset(uset_openPattern(u"[abcçカ🚴{}{abc}{de}]", -1, &errorCode));
* for (auto el : USetElements(uset.getAlias())) {
* UnicodeString us(el);
* std::string u8;
* printf("uset.string length %ld \"%s\"\n", (long)us.length(), us.toUTF8String(u8).c_str());
* int32_t len32 = el.length();
* char utf8[200];
* u_strToUTF8WithSub(utf8, int32_t{sizeof(utf8) - 1}, nullptr,
* el.data(), len32, 0xFFFD, nullptr, errorCode);
* printf("uset.element length %ld \"%s\"\n", long{len32}, utf8);
* }
* \endcode
*

29
icu4c/source/test/intltest/usetheaderonlytest.cpp
View file

@ -15,6 +15,7 @@
#include "unicode/utypes.h"
#include "unicode/uset.h"
// for commented-out sample code: #include "unicode/ustring.h"
#include "unicode/utf.h"
#include "unicode/utf16.h"
#include "intltest.h"
@ -62,9 +63,9 @@ void USetHeaderOnlyTest::TestUSetCodePointIterator() {
uset_openPattern(u"[abcçカ🚴]", -1, errorCode), &uset_close);
std::u16string result;
for (UChar32 c : USetCodePoints(uset.get())) {
result.append(u" ").append(cpString(c));
// Commented-out sample code for pasting into the API docs.
// printf("uset.codePoint U+%04lx\n", (long)c);
result.append(u" ").append(cpString(c));
}
assertEquals(WHERE, u" a b c ç カ 🚴", result);
@ -95,17 +96,17 @@ void USetHeaderOnlyTest::TestUSetRangeIterator() {
uset_openPattern(u"[abcçカ🚴]", -1, errorCode), &uset_close);
std::u16string result;
for (auto [start, end] : USetRanges(uset.get())) {
result.append(u" ").append(cpString(start)).append(u"-").append(cpString(end));
// Commented-out sample code for pasting into the API docs.
// printf("uset.range U+%04lx..U+%04lx\n", (long)start, (long)end);
result.append(u" ").append(cpString(start)).append(u"-").append(cpString(end));
}
assertEquals(WHERE, u" a-c ç-ç カ-カ 🚴-🚴", result);
result.clear();
for (auto range : USetRanges(uset.get())) {
for (UChar32 c : range) {
result.append(u" ").append(cpString(c));
// Commented-out sample code for pasting into the API docs.
// printf("uset.range.c U+%04lx\n", (long)c);
result.append(u" ").append(cpString(c));
}
result.append(u" |");
}
@ -162,12 +163,13 @@ void USetHeaderOnlyTest::TestUSetStringIterator() {
uset_openPattern(u"[abcçカ🚴{}{abc}{de}]", -1, errorCode), &uset_close);
std::u16string result;
for (auto s : USetStrings(uset.get())) {
// Commented-out sample code for pasting into the API docs.
// Needs U_SHOW_CPLUSPLUS_API=1 for UnicodeString.
// UnicodeString us(s);
// std::string u8;
// printf("uset.string length %ld \"%s\"\n", (long)s.length(), us.toUTF8String(u8).c_str());
result.append(u" \"").append(s).append(u"\"");
// Commented-out sample code for pasting into the API docs.
// int32_t len32 = s.length();
// char utf8[200];
// u_strToUTF8WithSub(utf8, int32_t{sizeof(utf8) - 1}, nullptr,
// s.data(), len32, 0xFFFD, nullptr, errorCode);
// printf("uset.string length %ld \"%s\"\n", long{len32}, utf8);
}
assertEquals(WHERE, uR"( "" "abc" "de")", result);
@ -193,12 +195,13 @@ void USetHeaderOnlyTest::TestUSetElementIterator() {
uset_openPattern(u"[abcçカ🚴{}{abc}{de}]", -1, errorCode), &uset_close);
std::u16string result;
for (auto el : USetElements(uset.get())) {
// Commented-out sample code for pasting into the API docs.
// Needs U_SHOW_CPLUSPLUS_API=1 for UnicodeString.
// UnicodeString us(el);
// std::string u8;
// printf("uset.string length %ld \"%s\"\n", (long)us.length(), us.toUTF8String(u8).c_str());
result.append(u" \"").append(el).append(u"\"");
// Commented-out sample code for pasting into the API docs.
// int32_t len32 = el.length();
// char utf8[200];
// u_strToUTF8WithSub(utf8, int32_t{sizeof(utf8) - 1}, nullptr,
// el.data(), len32, 0xFFFD, nullptr, errorCode);
// printf("uset.element length %ld \"%s\"\n", long{len32}, utf8);
}
assertEquals(WHERE, uR"( "a" "b" "c" "ç" "カ" "🚴" "" "abc" "de")", result);

2
icu4c/source/test/intltest/usettest.cpp
View file

@ -4326,7 +4326,7 @@ void UnicodeSetTest::TestElementIterator() {
for (auto el : set) {
// UnicodeString us(el);
// std::string u8;
// printf("set.string length %ld \"%s\"\n", (long)us.length(), us.toUTF8String(u8).c_str());
// printf("set.element length %ld \"%s\"\n", (long)us.length(), us.toUTF8String(u8).c_str());
result.append(u" \"").append(el).append(u'"');
}
assertEquals(WHERE, uR"( "a" "b" "c" "ç" "カ" "🚴" "" "abc" "de")", result);