From 8cbc307de0221f84c80c42dcbe07d40727537e2c Mon Sep 17 00:00:00 2001 From: yazevnul Date: Thu, 10 Feb 2022 16:46:46 +0300 Subject: Restoring authorship annotation for . Commit 1 of 2. --- library/cpp/unicode/normalization/custom_encoder.cpp | 6 +++--- library/cpp/unicode/normalization/generated/composition.cpp | 2 +- library/cpp/unicode/normalization/normalization.cpp | 2 +- library/cpp/unicode/normalization/normalization.h | 12 ++++++------ library/cpp/unicode/normalization/ut/normalization_ut.cpp | 10 +++++----- 5 files changed, 16 insertions(+), 16 deletions(-) (limited to 'library/cpp/unicode/normalization') diff --git a/library/cpp/unicode/normalization/custom_encoder.cpp b/library/cpp/unicode/normalization/custom_encoder.cpp index c6f186405f1..72279027910 100644 --- a/library/cpp/unicode/normalization/custom_encoder.cpp +++ b/library/cpp/unicode/normalization/custom_encoder.cpp @@ -15,7 +15,7 @@ void TCustomEncoder::addToTable(wchar32 ucode, unsigned char code, const CodePag if (Table[plane][pos] == 0) { Table[plane][pos] = code; } else { - Y_ASSERT(target && *target->Names); + Y_ASSERT(target && *target->Names); if (static_cast(Table[plane][pos]) > 127 && code) { Cerr << "WARNING: Only lower part of ASCII should have duplicate encodings " << target->Names[0] @@ -37,7 +37,7 @@ bool isGoodDecomp(wchar32 rune, wchar32 decomp) { } void TCustomEncoder::Create(const CodePage* target, bool extended) { - Y_ASSERT(target); + Y_ASSERT(target); DefaultChar = (const char*)target->DefaultChar; @@ -61,7 +61,7 @@ void TCustomEncoder::Create(const CodePage* target, bool extended) { wchar32 dw = w; while (IsComposed(dw) && Code(dw) == 0) { const wchar32* decomp_p = NUnicode::Decomposition(dw); - Y_ASSERT(decomp_p != nullptr); + Y_ASSERT(decomp_p != nullptr); dw = decomp_p[0]; if (std::char_traits::length(decomp_p) > 1 && (dw == (wchar32)' ' || dw == (wchar32)'(')) diff --git a/library/cpp/unicode/normalization/generated/composition.cpp b/library/cpp/unicode/normalization/generated/composition.cpp index 7cc4dc7b756..8a93147d09c 100644 --- a/library/cpp/unicode/normalization/generated/composition.cpp +++ b/library/cpp/unicode/normalization/generated/composition.cpp @@ -947,4 +947,4 @@ const NUnicode::NPrivate::TComposition::TRawData NUnicode::NPrivate::TCompositio { 0x115B9, 0x115AF, 0x115BB }, }; // TRawData -const size_t NUnicode::NPrivate::TComposition::RawDataSize = Y_ARRAY_SIZE(NUnicode::NPrivate::TComposition::RawData); +const size_t NUnicode::NPrivate::TComposition::RawDataSize = Y_ARRAY_SIZE(NUnicode::NPrivate::TComposition::RawData); diff --git a/library/cpp/unicode/normalization/normalization.cpp b/library/cpp/unicode/normalization/normalization.cpp index 7da72115143..de7625abeae 100644 --- a/library/cpp/unicode/normalization/normalization.cpp +++ b/library/cpp/unicode/normalization/normalization.cpp @@ -56,7 +56,7 @@ NUnicode::NPrivate::TComposition::TComposition() { while (*decompBegin) { wchar32 tail = *(decompBegin++); wchar32 comp = ComposeHangul(lead, tail); - Y_ASSERT(comp != 0); + Y_ASSERT(comp != 0); Data[TKey(lead, tail)] = comp; diff --git a/library/cpp/unicode/normalization/normalization.h b/library/cpp/unicode/normalization/normalization.h index 4f5f57881c3..f458e85b7e6 100644 --- a/library/cpp/unicode/normalization/normalization.h +++ b/library/cpp/unicode/normalization/normalization.h @@ -136,7 +136,7 @@ namespace NUnicode { class TCompositor { public: inline void DoComposition(TBuffer& buffer) { - Y_UNUSED(buffer); + Y_UNUSED(buffer); } }; @@ -182,7 +182,7 @@ namespace NUnicode { } } while (oneMoreTurnPlease); - Y_ASSERT(DecompositionCombining(lead) == 0); + Y_ASSERT(DecompositionCombining(lead) == 0); buffer[0] = TSymbol(lead, 0); } }; @@ -280,7 +280,7 @@ namespace NUnicode { const wchar32* decompBegin = Decompositor.Decomposition(c); if (decompBegin) { while (*decompBegin) { - Y_ASSERT(Decompositor.Decomposition(*decompBegin) == nullptr); + Y_ASSERT(Decompositor.Decomposition(*decompBegin) == nullptr); AddCharNoDecomposition(*(decompBegin++), out); } return; @@ -377,8 +377,8 @@ inline TBasicString Normalize(const TBasicString& str) { ::NUnicode::TNormalizer dec; return dec.Normalize(str); } - + template inline TBasicString Normalize(const TBasicStringBuf str) { - return Normalize(str.data(), str.size()); -} + return Normalize(str.data(), str.size()); +} diff --git a/library/cpp/unicode/normalization/ut/normalization_ut.cpp b/library/cpp/unicode/normalization/ut/normalization_ut.cpp index 54d4940a268..6f9eb3ef6c7 100644 --- a/library/cpp/unicode/normalization/ut/normalization_ut.cpp +++ b/library/cpp/unicode/normalization/ut/normalization_ut.cpp @@ -4,7 +4,7 @@ #include -Y_UNIT_TEST_SUITE(TUnicodeNormalizationTest) { +Y_UNIT_TEST_SUITE(TUnicodeNormalizationTest) { template void TestInit() { NUnicode::TNormalizer normalizer; @@ -14,19 +14,19 @@ Y_UNIT_TEST_SUITE(TUnicodeNormalizationTest) { normalizer.Normalize(w); } - Y_UNIT_TEST(TestInitNFD) { + Y_UNIT_TEST(TestInitNFD) { TestInit(); } - Y_UNIT_TEST(TestInitNFC) { + Y_UNIT_TEST(TestInitNFC) { TestInit(); } - Y_UNIT_TEST(TestInitNFKD) { + Y_UNIT_TEST(TestInitNFKD) { TestInit(); } - Y_UNIT_TEST(TestInitNFKC) { + Y_UNIT_TEST(TestInitNFKC) { TestInit(); } } -- cgit v1.3