diff options
author | sobols <sobols@yandex-team.ru> | 2022-02-10 16:47:08 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:47:08 +0300 |
commit | 09961b69c61f471ddd594e0fd877df62a8021562 (patch) | |
tree | 54a7b60a9526a7104557a033eb0a8d70d64b604c /util/string | |
parent | 4ce8835206f981afa4a61915a49a21fb750416ec (diff) | |
download | ydb-09961b69c61f471ddd594e0fd877df62a8021562.tar.gz |
Restoring authorship annotation for <sobols@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'util/string')
-rw-r--r-- | util/string/cast.cpp | 4 | ||||
-rw-r--r-- | util/string/cast_ut.cpp | 62 | ||||
-rw-r--r-- | util/string/escape.cpp | 10 | ||||
-rw-r--r-- | util/string/escape_ut.cpp | 6 | ||||
-rw-r--r-- | util/string/split_ut.cpp | 22 | ||||
-rw-r--r-- | util/string/strip_ut.cpp | 4 | ||||
-rw-r--r-- | util/string/subst_ut.cpp | 8 | ||||
-rw-r--r-- | util/string/type_ut.cpp | 24 | ||||
-rw-r--r-- | util/string/vector_ut.cpp | 2 |
9 files changed, 71 insertions, 71 deletions
diff --git a/util/string/cast.cpp b/util/string/cast.cpp index aa1e65a8e9..75e80dbd3c 100644 --- a/util/string/cast.cpp +++ b/util/string/cast.cpp @@ -455,8 +455,8 @@ using TWCharIType = std::conditional_t<std::is_signed<wchar_t>::value, i64, ui64 DEF_INT_SPEC_I(char, TCharIType) DEF_INT_SPEC_I(wchar_t, TWCharIType) -DEF_INT_SPEC_I(wchar16, ui64) // wchar16 is always unsigned -DEF_INT_SPEC_I(wchar32, ui64) // wchar32 is always unsigned +DEF_INT_SPEC_I(wchar16, ui64) // wchar16 is always unsigned +DEF_INT_SPEC_I(wchar32, ui64) // wchar32 is always unsigned #undef DEF_INT_SPEC #undef DEF_INT_SPEC_I diff --git a/util/string/cast_ut.cpp b/util/string/cast_ut.cpp index 033450c38c..1c124aeb4e 100644 --- a/util/string/cast_ut.cpp +++ b/util/string/cast_ut.cpp @@ -350,13 +350,13 @@ Y_UNIT_TEST_SUITE(TCastTest) { #endif Y_UNIT_TEST(TestWide) { - TUtf16String iw = u"-100500"; + TUtf16String iw = u"-100500"; int iv = 0; UNIT_ASSERT_VALUES_EQUAL(TryFromString(iw, iv), true); UNIT_ASSERT_VALUES_EQUAL(iv, -100500); ui64 uv = 0; - TUtf16String uw = u"21474836470"; + TUtf16String uw = u"21474836470"; UNIT_ASSERT_VALUES_EQUAL(TryFromString(uw, uv), true); UNIT_ASSERT_VALUES_EQUAL(uv, 21474836470ull); @@ -413,7 +413,7 @@ Y_UNIT_TEST_SUITE(TCastTest) { int res2 = 0; const int def2 = -6; - TUtf16String s3 = u"-100500"; + TUtf16String s3 = u"-100500"; UNIT_ASSERT_VALUES_EQUAL(TryFromStringWithDefault(s3, res2, def2), true); UNIT_ASSERT_VALUES_EQUAL(res2, -100500); @@ -424,7 +424,7 @@ Y_UNIT_TEST_SUITE(TCastTest) { UNIT_ASSERT_VALUES_EQUAL(FromStringWithDefault(s3, def2), -100500); UNIT_ASSERT_VALUES_EQUAL(FromStringWithDefault<size_t>(s3), size_t()); - TUtf16String s4 = u"-f100500"; + TUtf16String s4 = u"-f100500"; UNIT_ASSERT_VALUES_EQUAL(TryFromStringWithDefault(s4, res2, def2), false); UNIT_ASSERT_VALUES_EQUAL(res2, def2); @@ -456,12 +456,12 @@ Y_UNIT_TEST_SUITE(TCastTest) { UNIT_ASSERT_DOUBLES_EQUAL((float)FromString(TString("10E-5")), 10E-5, EPS); UNIT_ASSERT_VALUES_EQUAL((bool)FromString("da"), true); UNIT_ASSERT_VALUES_EQUAL((bool)FromString("no"), false); - UNIT_ASSERT_VALUES_EQUAL((short)FromString(u"9000"), 9000); - UNIT_ASSERT_VALUES_EQUAL((int)FromString(u"-100500"), -100500); - UNIT_ASSERT_VALUES_EQUAL((unsigned long long)FromString(TWtringBuf(u"42", 1)), 4); + UNIT_ASSERT_VALUES_EQUAL((short)FromString(u"9000"), 9000); + UNIT_ASSERT_VALUES_EQUAL((int)FromString(u"-100500"), -100500); + UNIT_ASSERT_VALUES_EQUAL((unsigned long long)FromString(TWtringBuf(u"42", 1)), 4); int integer = FromString("125"); - ui16 wideCharacterCode = FromString(u"125"); - UNIT_ASSERT_VALUES_EQUAL(integer, wideCharacterCode); + ui16 wideCharacterCode = FromString(u"125"); + UNIT_ASSERT_VALUES_EQUAL(integer, wideCharacterCode); } static void CheckMessage(TFromStringException& exc, const TString& phrase) { @@ -530,7 +530,7 @@ Y_UNIT_TEST_SUITE(TCastTest) { UNIT_ASSERT_VALUES_EQUAL(empty, out); } { - const auto hello = u"hello"; + const auto hello = u"hello"; TWtringBuf out; UNIT_ASSERT(TryFromString(hello, out)); UNIT_ASSERT_VALUES_EQUAL(hello, out); @@ -578,25 +578,25 @@ Y_UNIT_TEST_SUITE(TCastTest) { UNIT_ASSERT_VALUES_EQUAL(ToString(87423.2031250000001), "87423.20313"); UNIT_ASSERT_VALUES_EQUAL(FloatToString(1.0e60, PREC_POINT_DIGITS_STRIP_ZEROES, 0), "1e+60"); } - - Y_UNIT_TEST(TestChar) { - // Given a character ch, ToString(ch) returns - // the decimal representation of its integral value - - // char - UNIT_ASSERT_VALUES_EQUAL(ToString('\0'), "0"); - UNIT_ASSERT_VALUES_EQUAL(ToString('0'), "48"); - - // wchar16 - UNIT_ASSERT_VALUES_EQUAL(ToString(u'\0'), "0"); - UNIT_ASSERT_VALUES_EQUAL(ToString(u'0'), "48"); - UNIT_ASSERT_VALUES_EQUAL(ToString(u'я'), "1103"); - UNIT_ASSERT_VALUES_EQUAL(ToString(u'\uFFFF'), "65535"); - - // wchar32 - UNIT_ASSERT_VALUES_EQUAL(ToString(U'\0'), "0"); - UNIT_ASSERT_VALUES_EQUAL(ToString(U'0'), "48"); - UNIT_ASSERT_VALUES_EQUAL(ToString(U'я'), "1103"); - UNIT_ASSERT_VALUES_EQUAL(ToString(U'\U0001F600'), "128512"); // 'GRINNING FACE' (U+1F600) - } + + Y_UNIT_TEST(TestChar) { + // Given a character ch, ToString(ch) returns + // the decimal representation of its integral value + + // char + UNIT_ASSERT_VALUES_EQUAL(ToString('\0'), "0"); + UNIT_ASSERT_VALUES_EQUAL(ToString('0'), "48"); + + // wchar16 + UNIT_ASSERT_VALUES_EQUAL(ToString(u'\0'), "0"); + UNIT_ASSERT_VALUES_EQUAL(ToString(u'0'), "48"); + UNIT_ASSERT_VALUES_EQUAL(ToString(u'я'), "1103"); + UNIT_ASSERT_VALUES_EQUAL(ToString(u'\uFFFF'), "65535"); + + // wchar32 + UNIT_ASSERT_VALUES_EQUAL(ToString(U'\0'), "0"); + UNIT_ASSERT_VALUES_EQUAL(ToString(U'0'), "48"); + UNIT_ASSERT_VALUES_EQUAL(ToString(U'я'), "1103"); + UNIT_ASSERT_VALUES_EQUAL(ToString(U'\U0001F600'), "128512"); // 'GRINNING FACE' (U+1F600) + } }; diff --git a/util/string/escape.cpp b/util/string/escape.cpp index cd09a7dbd0..e448d4cf1a 100644 --- a/util/string/escape.cpp +++ b/util/string/escape.cpp @@ -179,7 +179,7 @@ template TUtf16String& EscapeCImpl<TUtf16String::TChar>(const TUtf16String::TCha namespace { template <class TStr> - inline void AppendUnicode(TStr& s, wchar32 v) { + inline void AppendUnicode(TStr& s, wchar32 v) { char buf[10]; size_t sz = 0; @@ -187,7 +187,7 @@ namespace { s.AppendNoAlias(buf, sz); } - inline void AppendUnicode(TUtf16String& s, wchar32 v) { + inline void AppendUnicode(TUtf16String& s, wchar32 v) { WriteSymbol(v, s); } @@ -264,12 +264,12 @@ static TStr& DoUnescapeC(const TChar* p, size_t sz, TStr& res) { res.append('\v'); break; case 'u': { - ui16 cp[2]; + ui16 cp[2]; if (ParseHex<4>(p + 1, pe, cp[0])) { if (Y_UNLIKELY(cp[0] >= 0xD800 && cp[0] <= 0xDBFF && ParseHex<4>(p + 7, pe, cp[1]) && p[5] == '\\' && p[6] == 'u')) { - const wchar16 wbuf[] = {wchar16(cp[0]), wchar16(cp[1])}; - AppendUnicode(res, ReadSymbol(wbuf, wbuf + 2)); + const wchar16 wbuf[] = {wchar16(cp[0]), wchar16(cp[1])}; + AppendUnicode(res, ReadSymbol(wbuf, wbuf + 2)); p += 10; } else { AppendUnicode(res, (wchar32)cp[0]); diff --git a/util/string/escape_ut.cpp b/util/string/escape_ut.cpp index cd38ecffd3..110546be71 100644 --- a/util/string/escape_ut.cpp +++ b/util/string/escape_ut.cpp @@ -90,9 +90,9 @@ Y_UNIT_TEST_SUITE(TEscapeCTest) { UNIT_ASSERT_VALUES_EQUAL(source, actual2); } - UNIT_ASSERT_VALUES_EQUAL(u"http://ya.ru/\\x17\\n\\u1234", EscapeC(u"http://ya.ru/\x17\n\u1234")); - UNIT_ASSERT_VALUES_EQUAL(u"h", EscapeC(u'h')); - UNIT_ASSERT_VALUES_EQUAL(u"\\xFF", EscapeC(wchar16(255))); + UNIT_ASSERT_VALUES_EQUAL(u"http://ya.ru/\\x17\\n\\u1234", EscapeC(u"http://ya.ru/\x17\n\u1234")); + UNIT_ASSERT_VALUES_EQUAL(u"h", EscapeC(u'h')); + UNIT_ASSERT_VALUES_EQUAL(u"\\xFF", EscapeC(wchar16(255))); } Y_UNIT_TEST(TestEscapeTrigraphs) { diff --git a/util/string/split_ut.cpp b/util/string/split_ut.cpp index 43e59f2d75..a1ae92779a 100644 --- a/util/string/split_ut.cpp +++ b/util/string/split_ut.cpp @@ -131,8 +131,8 @@ Y_UNIT_TEST_SUITE(SplitStringTest) { } Y_UNIT_TEST(TestWideSingleDelimiter) { - TUtf16String data(u"qw ab qwabcab"); - TUtf16String canonic[] = {u"qw", u"ab", TUtf16String(), u"qwabcab"}; + TUtf16String data(u"qw ab qwabcab"); + TUtf16String canonic[] = {u"qw", u"ab", TUtf16String(), u"qwabcab"}; TVector<TUtf16String> good(canonic, canonic + 4); TCharDelimiter<const wchar16> delim(' '); @@ -188,10 +188,10 @@ Y_UNIT_TEST_SUITE(SplitStringTest) { } Y_UNIT_TEST(TestWideStringDelimiter) { - TUtf16String data(u"qw ab qwababcab"); - TUtf16String canonic[] = {u"qw ", u" qw", TUtf16String(), u"c", TUtf16String()}; + TUtf16String data(u"qw ab qwababcab"); + TUtf16String canonic[] = {u"qw ", u" qw", TUtf16String(), u"c", TUtf16String()}; TVector<TUtf16String> good(canonic, canonic + 5); - TUtf16String wideDelim(u"ab"); + TUtf16String wideDelim(u"ab"); TStringDelimiter<const wchar16> delim(wideDelim.data()); TestDelimiterOnString<TContainerConsumer>(good, data.data(), delim); @@ -209,20 +209,20 @@ Y_UNIT_TEST_SUITE(SplitStringTest) { } Y_UNIT_TEST(TestWideSetDelimiter) { - TUtf16String data(u"qw ab qwababccab"); - TUtf16String canonic[] = {u"q", u" ab q", u"abab", TUtf16String(), u"ab"}; + TUtf16String data(u"qw ab qwababccab"); + TUtf16String canonic[] = {u"q", u" ab q", u"abab", TUtf16String(), u"ab"}; TVector<TUtf16String> good(canonic, canonic + 5); - TUtf16String wideDelim(u"wc"); + TUtf16String wideDelim(u"wc"); TSetDelimiter<const wchar16> delim(wideDelim.data()); TestDelimiterOnString<TContainerConsumer>(good, data.data(), delim); } Y_UNIT_TEST(TestWideSetDelimiterRange) { - TUtf16String data(u"qw ab qwababccab"); - TUtf16String canonic[] = {u"q", u" ab q", u"abab", TUtf16String(), u"ab"}; + TUtf16String data(u"qw ab qwababccab"); + TUtf16String canonic[] = {u"q", u" ab q", u"abab", TUtf16String(), u"ab"}; TVector<TUtf16String> good(1); - TUtf16String wideDelim(u"wc"); + TUtf16String wideDelim(u"wc"); TSetDelimiter<const wchar16> delim(wideDelim.data()); TVector<TUtf16String> test; diff --git a/util/string/strip_ut.cpp b/util/string/strip_ut.cpp index d1029d1498..34adeb9a19 100644 --- a/util/string/strip_ut.cpp +++ b/util/string/strip_ut.cpp @@ -103,8 +103,8 @@ Y_UNIT_TEST_SUITE(TStripStringTest) { UNIT_ASSERT_EQUAL( StripString( TWtringBuf(u"/abc/"), - EqualsStripAdapter(u'/')), - u"abc"); + EqualsStripAdapter(u'/')), + u"abc"); } Y_UNIT_TEST(TestCollapse) { diff --git a/util/string/subst_ut.cpp b/util/string/subst_ut.cpp index 21eccef779..284d54c095 100644 --- a/util/string/subst_ut.cpp +++ b/util/string/subst_ut.cpp @@ -161,9 +161,9 @@ Y_UNIT_TEST_SUITE(TStringSubst) { } Y_UNIT_TEST(TestSubstCharGlobal) { - TUtf16String w = u"abcdabcd"; + TUtf16String w = u"abcdabcd"; SubstGlobal(w, wchar16('b'), wchar16('B'), 3); - UNIT_ASSERT_EQUAL(w, u"abcdaBcd"); + UNIT_ASSERT_EQUAL(w, u"abcdaBcd"); TString s = "aaa"; SubstGlobal(s, 'a', 'b', 1); @@ -171,9 +171,9 @@ Y_UNIT_TEST_SUITE(TStringSubst) { } Y_UNIT_TEST(TestSubstCharGlobalRet) { - const TUtf16String w1 = u"abcdabcd"; + const TUtf16String w1 = u"abcdabcd"; const TUtf16String w2 = SubstGlobalCopy(w1, wchar16('b'), wchar16('B'), 3); - UNIT_ASSERT_EQUAL(w2, u"abcdaBcd"); + UNIT_ASSERT_EQUAL(w2, u"abcdaBcd"); const TString s1 = "aaa"; const TString s2 = SubstGlobalCopy(s1, 'a', 'b', 1); diff --git a/util/string/type_ut.cpp b/util/string/type_ut.cpp index 03e7af62bd..890f7062d9 100644 --- a/util/string/type_ut.cpp +++ b/util/string/type_ut.cpp @@ -47,11 +47,11 @@ Y_UNIT_TEST_SUITE(TStringClassify) { UNIT_ASSERT(!IsNumber("foobar")); UNIT_ASSERT(!IsNumber("")); - UNIT_ASSERT(IsNumber(u"0")); - UNIT_ASSERT(IsNumber(u"12345678901234567890")); - UNIT_ASSERT(!IsNumber(u"1234567890a")); - UNIT_ASSERT(!IsNumber(u"12345xx67890a")); - UNIT_ASSERT(!IsNumber(u"foobar")); + UNIT_ASSERT(IsNumber(u"0")); + UNIT_ASSERT(IsNumber(u"12345678901234567890")); + UNIT_ASSERT(!IsNumber(u"1234567890a")); + UNIT_ASSERT(!IsNumber(u"12345xx67890a")); + UNIT_ASSERT(!IsNumber(u"foobar")); } Y_UNIT_TEST(TestIsHexNumber) { @@ -64,13 +64,13 @@ Y_UNIT_TEST_SUITE(TStringClassify) { UNIT_ASSERT(!IsHexNumber("foobar")); UNIT_ASSERT(!IsHexNumber(TString())); - UNIT_ASSERT(IsHexNumber(u"0")); - UNIT_ASSERT(IsHexNumber(u"aaaadddAAAAA")); - UNIT_ASSERT(IsHexNumber(u"0123456789ABCDEFabcdef")); - UNIT_ASSERT(IsHexNumber(u"12345678901234567890")); - UNIT_ASSERT(IsHexNumber(u"1234567890a")); - UNIT_ASSERT(!IsHexNumber(u"12345xx67890a")); - UNIT_ASSERT(!IsHexNumber(u"foobar")); + UNIT_ASSERT(IsHexNumber(u"0")); + UNIT_ASSERT(IsHexNumber(u"aaaadddAAAAA")); + UNIT_ASSERT(IsHexNumber(u"0123456789ABCDEFabcdef")); + UNIT_ASSERT(IsHexNumber(u"12345678901234567890")); + UNIT_ASSERT(IsHexNumber(u"1234567890a")); + UNIT_ASSERT(!IsHexNumber(u"12345xx67890a")); + UNIT_ASSERT(!IsHexNumber(u"foobar")); UNIT_ASSERT(!IsHexNumber(TUtf16String())); } } diff --git a/util/string/vector_ut.cpp b/util/string/vector_ut.cpp index 817120f268..2bedd38534 100644 --- a/util/string/vector_ut.cpp +++ b/util/string/vector_ut.cpp @@ -30,7 +30,7 @@ Y_UNIT_TEST_SUITE(TStringJoinTest) { } Y_UNIT_TEST(TestJoinWStrings) { - const TUtf16String str = u"Яндекс"; + const TUtf16String str = u"Яндекс"; const TVector<TUtf16String> v(1, str); UNIT_ASSERT_EQUAL(JoinStrings(v, TUtf16String()), str); |