aboutsummaryrefslogtreecommitdiffstats
path: root/util/charset
diff options
context:
space:
mode:
authoreeight <eeight@yandex-team.ru>2022-02-10 16:46:18 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:46:18 +0300
commit475c0a46f28166e83fd263badc7546377cddcabe (patch)
tree39c5a49b8aaad78fe390b6f1f2886bdbda40f3e7 /util/charset
parenta6e0145a095c7bb3770d6e07aee301de5c73f96e (diff)
downloadydb-475c0a46f28166e83fd263badc7546377cddcabe.tar.gz
Restoring authorship annotation for <eeight@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'util/charset')
-rw-r--r--util/charset/wide.cpp2
-rw-r--r--util/charset/wide.h2
-rw-r--r--util/charset/wide_ut.cpp114
-rw-r--r--util/charset/ya.make8
4 files changed, 63 insertions, 63 deletions
diff --git a/util/charset/wide.cpp b/util/charset/wide.cpp
index a287438ddd..ddf898c1a0 100644
--- a/util/charset/wide.cpp
+++ b/util/charset/wide.cpp
@@ -1,6 +1,6 @@
#include "wide.h"
-#include <util/generic/mem_copy.h>
+#include <util/generic/mem_copy.h>
#include <util/string/strip.h>
namespace {
diff --git a/util/charset/wide.h b/util/charset/wide.h
index 04e6928aab..3de0b14ca7 100644
--- a/util/charset/wide.h
+++ b/util/charset/wide.h
@@ -3,7 +3,7 @@
#include "recode_result.h"
#include "unidata.h"
#include "utf8.h"
-#include "wide_specific.h"
+#include "wide_specific.h"
#include <util/generic/algorithm.h>
#include <util/generic/string.h>
diff --git a/util/charset/wide_ut.cpp b/util/charset/wide_ut.cpp
index d8f3233e73..579d75a52d 100644
--- a/util/charset/wide_ut.cpp
+++ b/util/charset/wide_ut.cpp
@@ -3,8 +3,8 @@
#include <library/cpp/testing/unittest/registar.h>
-#include <util/string/reverse.h>
-
+#include <util/string/reverse.h>
+
#include <algorithm>
namespace {
@@ -613,9 +613,9 @@ public:
s = w;
Collapse(s);
UNIT_ASSERT(s == w);
-#ifndef TSTRING_IS_STD_STRING
+#ifndef TSTRING_IS_STD_STRING
UNIT_ASSERT(s.c_str() == w.c_str()); // Collapse() does not change the string at all
-#endif
+#endif
}
s = ASCIIToWide(" 123 456 ");
Collapse(s);
@@ -641,9 +641,9 @@ public:
s = w;
Collapse(s);
UNIT_ASSERT(s == w);
-#ifndef TSTRING_IS_STD_STRING
+#ifndef TSTRING_IS_STD_STRING
UNIT_ASSERT(s.c_str() == w.c_str()); // Collapse() does not change the string at all
-#endif
+#endif
}
s = ASCIIToWide(" ");
Collapse(s);
@@ -774,21 +774,21 @@ public:
s = w;
Strip(s);
UNIT_ASSERT(s == w);
-#ifndef TSTRING_IS_STD_STRING
+#ifndef TSTRING_IS_STD_STRING
UNIT_ASSERT(s.c_str() == w.c_str()); // Strip() does not change the string at all
-#endif
+#endif
s = w;
StripLeft(s);
UNIT_ASSERT(s == w);
-#ifndef TSTRING_IS_STD_STRING
+#ifndef TSTRING_IS_STD_STRING
UNIT_ASSERT(s.c_str() == w.c_str()); // Strip() does not change the string at all
-#endif
+#endif
s = w;
StripRight(s);
UNIT_ASSERT(s == w);
-#ifndef TSTRING_IS_STD_STRING
+#ifndef TSTRING_IS_STD_STRING
UNIT_ASSERT(s.c_str() == w.c_str()); // Strip() does not change the string at all
-#endif
+#endif
}
void TestIsSpace() {
@@ -865,7 +865,7 @@ public:
wchar16 upperCase[n];
std::copy(wideCyrillicAlphabet, wideCyrillicAlphabet + n, upperCase);
ToLower(upperCase, n);
- UNIT_ASSERT(TWtringBuf(upperCase, n) == TWtringBuf(wideCyrillicAlphabet + n, n));
+ UNIT_ASSERT(TWtringBuf(upperCase, n) == TWtringBuf(wideCyrillicAlphabet + n, n));
}
void TestToUpper() {
@@ -873,7 +873,7 @@ public:
wchar16 lowerCase[n];
std::copy(wideCyrillicAlphabet + n, wideCyrillicAlphabet + n * 2, lowerCase);
ToUpper(lowerCase, n);
- UNIT_ASSERT(TWtringBuf(lowerCase, n) == TWtringBuf(wideCyrillicAlphabet, n));
+ UNIT_ASSERT(TWtringBuf(lowerCase, n) == TWtringBuf(wideCyrillicAlphabet, n));
}
void TestWideString() {
@@ -912,7 +912,7 @@ public:
const TUtf16String reversed = UTF32ToWide(buffer.data(), buffer.size());
temp = original;
- ReverseInPlace(temp);
+ ReverseInPlace(temp);
UNIT_ASSERT(temp == reversed);
}
@@ -1099,9 +1099,9 @@ public:
UNIT_ASSERT(!ToLower(s));
UNIT_ASSERT(s == lower);
-#ifndef TSTRING_IS_STD_STRING
+#ifndef TSTRING_IS_STD_STRING
UNIT_ASSERT(s.data() == copy.data());
-#endif
+#endif
UNIT_ASSERT(!ToLower(writableCopy.Detach(), writableCopy.size()));
UNIT_ASSERT(writableCopy == lower);
@@ -1120,9 +1120,9 @@ public:
UNIT_ASSERT(!ToLower(s));
UNIT_ASSERT(s == lower);
-#ifndef TSTRING_IS_STD_STRING
+#ifndef TSTRING_IS_STD_STRING
UNIT_ASSERT(s.data() == copy.data());
-#endif
+#endif
UNIT_ASSERT(!ToLower(writableCopy.Detach(), writableCopy.size()));
UNIT_ASSERT(writableCopy == lower);
@@ -1140,9 +1140,9 @@ public:
UNIT_ASSERT(!ToLower(s, 100500));
UNIT_ASSERT(s == lower);
-#ifndef TSTRING_IS_STD_STRING
+#ifndef TSTRING_IS_STD_STRING
UNIT_ASSERT(s.data() == copy.data());
-#endif
+#endif
UNIT_ASSERT(ToLowerRet(copy, 100500) == lower);
UNIT_ASSERT(ToLowerRet(TWtringBuf(copy), 100500) == lower);
@@ -1154,9 +1154,9 @@ public:
UNIT_ASSERT(!ToLower(s, 100500, 1111));
UNIT_ASSERT(s == lower);
-#ifndef TSTRING_IS_STD_STRING
+#ifndef TSTRING_IS_STD_STRING
UNIT_ASSERT(s.data() == copy.data());
-#endif
+#endif
UNIT_ASSERT(ToLowerRet(copy, 100500, 1111) == lower);
UNIT_ASSERT(ToLowerRet(TWtringBuf(copy), 100500, 1111) == lower);
@@ -1187,9 +1187,9 @@ public:
UNIT_ASSERT(!ToLower(s));
UNIT_ASSERT(s == lower);
-#ifndef TSTRING_IS_STD_STRING
+#ifndef TSTRING_IS_STD_STRING
UNIT_ASSERT(s.data() == copy.data());
-#endif
+#endif
UNIT_ASSERT(!ToLower(writableCopy.Detach(), writableCopy.size()));
UNIT_ASSERT(writableCopy == lower);
@@ -1208,9 +1208,9 @@ public:
UNIT_ASSERT(!ToLower(s));
UNIT_ASSERT(s == lower);
-#ifndef TSTRING_IS_STD_STRING
+#ifndef TSTRING_IS_STD_STRING
UNIT_ASSERT(s.data() == copy.data());
-#endif
+#endif
UNIT_ASSERT(!ToLower(writableCopy.Detach(), writableCopy.size()));
UNIT_ASSERT(writableCopy == lower);
@@ -1257,9 +1257,9 @@ public:
UNIT_ASSERT(!ToLower(s, 2));
UNIT_ASSERT(s == lower);
-#ifndef TSTRING_IS_STD_STRING
+#ifndef TSTRING_IS_STD_STRING
UNIT_ASSERT(s.data() == copy.data());
-#endif
+#endif
UNIT_ASSERT(ToLowerRet(copy, 2) == lower);
UNIT_ASSERT(ToLowerRet(TWtringBuf(copy), 2) == lower);
@@ -1282,9 +1282,9 @@ public:
UNIT_ASSERT(!ToLower(s, 3, 1));
UNIT_ASSERT(s == copy);
-#ifndef TSTRING_IS_STD_STRING
+#ifndef TSTRING_IS_STD_STRING
UNIT_ASSERT(s.data() == copy.data());
-#endif
+#endif
UNIT_ASSERT(ToLowerRet(copy, 3, 1) == lower);
UNIT_ASSERT(ToLowerRet(TWtringBuf(copy), 3, 1) == lower);
@@ -1296,9 +1296,9 @@ public:
UNIT_ASSERT(!ToLower(s, 3, 100500));
UNIT_ASSERT(s == copy);
-#ifndef TSTRING_IS_STD_STRING
+#ifndef TSTRING_IS_STD_STRING
UNIT_ASSERT(s.data() == copy.data());
-#endif
+#endif
UNIT_ASSERT(ToLowerRet(copy, 3, 100500) == lower);
UNIT_ASSERT(ToLowerRet(TWtringBuf(copy), 3, 100500) == lower);
@@ -1314,9 +1314,9 @@ public:
UNIT_ASSERT(!ToUpper(s));
UNIT_ASSERT(s == upper);
-#ifndef TSTRING_IS_STD_STRING
+#ifndef TSTRING_IS_STD_STRING
UNIT_ASSERT(s.data() == copy.data());
-#endif
+#endif
UNIT_ASSERT(!ToUpper(writableCopy.Detach(), writableCopy.size()));
UNIT_ASSERT(writableCopy == upper);
@@ -1335,9 +1335,9 @@ public:
UNIT_ASSERT(!ToUpper(s));
UNIT_ASSERT(s == upper);
-#ifndef TSTRING_IS_STD_STRING
+#ifndef TSTRING_IS_STD_STRING
UNIT_ASSERT(s.data() == copy.data());
-#endif
+#endif
UNIT_ASSERT(!ToUpper(writableCopy.Detach(), writableCopy.size()));
UNIT_ASSERT(writableCopy == upper);
@@ -1356,9 +1356,9 @@ public:
UNIT_ASSERT(!ToUpper(s, 100500));
UNIT_ASSERT(s == upper);
-#ifndef TSTRING_IS_STD_STRING
+#ifndef TSTRING_IS_STD_STRING
UNIT_ASSERT(s.data() == copy.data());
-#endif
+#endif
UNIT_ASSERT(!ToUpper(writableCopy.Detach(), writableCopy.size()));
UNIT_ASSERT(writableCopy == upper);
@@ -1376,9 +1376,9 @@ public:
UNIT_ASSERT(!ToUpper(s, 100500, 1111));
UNIT_ASSERT(s == upper);
-#ifndef TSTRING_IS_STD_STRING
+#ifndef TSTRING_IS_STD_STRING
UNIT_ASSERT(s.data() == copy.data());
-#endif
+#endif
UNIT_ASSERT(ToUpperRet(copy, 100500, 1111) == upper);
UNIT_ASSERT(ToUpperRet(TWtringBuf(copy), 100500, 1111) == upper);
@@ -1409,9 +1409,9 @@ public:
UNIT_ASSERT(!ToUpper(s));
UNIT_ASSERT(s == copy);
-#ifndef TSTRING_IS_STD_STRING
+#ifndef TSTRING_IS_STD_STRING
UNIT_ASSERT(s.data() == copy.data());
-#endif
+#endif
UNIT_ASSERT(!ToUpper(writableCopy.Detach(), writableCopy.size()));
UNIT_ASSERT(writableCopy == upper);
@@ -1531,9 +1531,9 @@ public:
UNIT_ASSERT(!ToTitle(s));
UNIT_ASSERT(s == title);
-#ifndef TSTRING_IS_STD_STRING
+#ifndef TSTRING_IS_STD_STRING
UNIT_ASSERT(s.data() == copy.data());
-#endif
+#endif
UNIT_ASSERT(!ToTitle(writableCopy.Detach(), writableCopy.size()));
UNIT_ASSERT(writableCopy == title);
@@ -1552,9 +1552,9 @@ public:
UNIT_ASSERT(!ToTitle(s));
UNIT_ASSERT(s == title);
-#ifndef TSTRING_IS_STD_STRING
+#ifndef TSTRING_IS_STD_STRING
UNIT_ASSERT(s.data() == copy.data());
-#endif
+#endif
UNIT_ASSERT(!ToTitle(writableCopy.Detach(), writableCopy.size()));
UNIT_ASSERT(writableCopy == title);
@@ -1572,9 +1572,9 @@ public:
UNIT_ASSERT(!ToTitle(s, 100500));
UNIT_ASSERT(s == title);
-#ifndef TSTRING_IS_STD_STRING
+#ifndef TSTRING_IS_STD_STRING
UNIT_ASSERT(s.data() == copy.data());
-#endif
+#endif
UNIT_ASSERT(ToTitleRet(copy) == title);
UNIT_ASSERT(ToTitleRet(TWtringBuf(copy)) == title);
@@ -1586,9 +1586,9 @@ public:
UNIT_ASSERT(!ToTitle(s, 100500, 1111));
UNIT_ASSERT(s == title);
-#ifndef TSTRING_IS_STD_STRING
+#ifndef TSTRING_IS_STD_STRING
UNIT_ASSERT(s.data() == copy.data());
-#endif
+#endif
UNIT_ASSERT(ToTitleRet(copy) == title);
UNIT_ASSERT(ToTitleRet(TWtringBuf(copy)) == title);
@@ -1619,9 +1619,9 @@ public:
UNIT_ASSERT(!ToTitle(s));
UNIT_ASSERT(s == title);
-#ifndef TSTRING_IS_STD_STRING
+#ifndef TSTRING_IS_STD_STRING
UNIT_ASSERT(s.data() == copy.data());
-#endif
+#endif
UNIT_ASSERT(!ToTitle(writableCopy.Detach(), writableCopy.size()));
UNIT_ASSERT(writableCopy == title);
@@ -1658,9 +1658,9 @@ public:
UNIT_ASSERT(!ToTitle(s));
UNIT_ASSERT(s == title);
-#ifndef TSTRING_IS_STD_STRING
+#ifndef TSTRING_IS_STD_STRING
UNIT_ASSERT(s.data() == copy.data());
-#endif
+#endif
UNIT_ASSERT(!ToTitle(writableCopy.Detach(), writableCopy.size()));
UNIT_ASSERT(writableCopy == title);
@@ -1707,9 +1707,9 @@ public:
UNIT_ASSERT(!ToTitle(s, 2));
UNIT_ASSERT(s == title);
-#ifndef TSTRING_IS_STD_STRING
+#ifndef TSTRING_IS_STD_STRING
UNIT_ASSERT(s.data() == copy.data());
-#endif
+#endif
UNIT_ASSERT(ToTitleRet(copy, 2) == title);
UNIT_ASSERT(ToTitleRet(TWtringBuf(copy), 2) == title);
diff --git a/util/charset/ya.make b/util/charset/ya.make
index 26d38cb10b..de467c7f6a 100644
--- a/util/charset/ya.make
+++ b/util/charset/ya.make
@@ -5,10 +5,10 @@ SUBSCRIBER(g:util-subscribers)
NO_UTIL()
-IF (TSTRING_IS_STD_STRING)
- CFLAGS(GLOBAL -DTSTRING_IS_STD_STRING)
-ENDIF()
-
+IF (TSTRING_IS_STD_STRING)
+ CFLAGS(GLOBAL -DTSTRING_IS_STD_STRING)
+ENDIF()
+
JOIN_SRCS(
all_charset.cpp
generated/unidata.cpp