diff options
author | pervyshev <pervyshev@yandex-team.ru> | 2022-02-10 16:52:09 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:52:09 +0300 |
commit | bf3df3990bac093c3910c664e310f4600da7c1e8 (patch) | |
tree | ab7fbbf3253d4c0e2793218f09378908beb025fb /util | |
parent | ccad5350efcb83fa360b6b79b0b854374d84eec3 (diff) | |
download | ydb-bf3df3990bac093c3910c664e310f4600da7c1e8.tar.gz |
Restoring authorship annotation for <pervyshev@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'util')
-rw-r--r-- | util/generic/strbuf.h | 20 | ||||
-rw-r--r-- | util/generic/strbuf_ut.cpp | 36 |
2 files changed, 28 insertions, 28 deletions
diff --git a/util/generic/strbuf.h b/util/generic/strbuf.h index db25e9feba..70b9360d58 100644 --- a/util/generic/strbuf.h +++ b/util/generic/strbuf.h @@ -239,7 +239,7 @@ public: inline void RSplit(TCharType delim, TdSelf& l, TdSelf& r) const noexcept { RSplitTemplate(delim, l, r); } - + inline void Split(TdSelf delim, TdSelf& l, TdSelf& r) const noexcept { SplitTemplate(delim, l, r); } @@ -257,8 +257,8 @@ private: const TdSelf tok = SubStr(pos + len); l = Head(pos); r = tok; - } - + } + public: // In all methods below with @pos parameter, @pos is supposed to be // a result of string find()/rfind()/find_first() or other similiar functions, @@ -384,11 +384,11 @@ public: } TdSelf RSplitOff(TCharType delim) { - TdSelf tok; - RSplit(delim, tok, *this); - return tok; - } - + TdSelf tok; + RSplit(delim, tok, *this); + return tok; + } + bool NextTok(TCharType delim, TdSelf& tok) { return NextTokTemplate(delim, tok); } @@ -423,8 +423,8 @@ public: TdSelf RNextTok(TCharType delim) { return RNextTokTemplate(delim); - } - + } + TdSelf NextTok(TdSelf delim) { return NextTokTemplate(delim); } diff --git a/util/generic/strbuf_ut.cpp b/util/generic/strbuf_ut.cpp index 794479657b..69cde785af 100644 --- a/util/generic/strbuf_ut.cpp +++ b/util/generic/strbuf_ut.cpp @@ -224,47 +224,47 @@ Y_UNIT_TEST_SUITE(TStrBufTest) { Y_UNIT_TEST(TestRFind) { TStringBuf buf1 = "123123456"; - UNIT_ASSERT_EQUAL(buf1.rfind('3'), 5); - UNIT_ASSERT_EQUAL(buf1.rfind('4'), 6); - UNIT_ASSERT_EQUAL(buf1.rfind('7'), TStringBuf::npos); + UNIT_ASSERT_EQUAL(buf1.rfind('3'), 5); + UNIT_ASSERT_EQUAL(buf1.rfind('4'), 6); + UNIT_ASSERT_EQUAL(buf1.rfind('7'), TStringBuf::npos); TStringBuf buf2; - UNIT_ASSERT_EQUAL(buf2.rfind('3'), TStringBuf::npos); + UNIT_ASSERT_EQUAL(buf2.rfind('3'), TStringBuf::npos); TStringBuf buf3 = TStringBuf("123123456", 6); UNIT_ASSERT_EQUAL(buf3.rfind('3'), 5); - UNIT_ASSERT_EQUAL(buf3.rfind('4'), TStringBuf::npos); - UNIT_ASSERT_EQUAL(buf3.rfind('7'), TStringBuf::npos); + UNIT_ASSERT_EQUAL(buf3.rfind('4'), TStringBuf::npos); + UNIT_ASSERT_EQUAL(buf3.rfind('7'), TStringBuf::npos); TStringBuf buf4 = TStringBuf("123123456", 5); UNIT_ASSERT_EQUAL(buf4.rfind('3'), 2); } - + Y_UNIT_TEST(TestRNextTok) { - TStringBuf buf1("a.b.c"); + TStringBuf buf1("a.b.c"); UNIT_ASSERT_EQUAL(buf1.RNextTok('.'), TStringBuf("c")); UNIT_ASSERT_EQUAL(buf1, TStringBuf("a.b")); - - TStringBuf buf2("a"); + + TStringBuf buf2("a"); UNIT_ASSERT_EQUAL(buf2.RNextTok('.'), TStringBuf("a")); - UNIT_ASSERT_EQUAL(buf2, TStringBuf()); + UNIT_ASSERT_EQUAL(buf2, TStringBuf()); TStringBuf buf3("ab cd ef"), tok; UNIT_ASSERT(buf3.RNextTok(' ', tok) && tok == "ef" && buf3 == "ab cd"); UNIT_ASSERT(buf3.RNextTok(' ', tok) && tok == "cd" && buf3 == "ab"); UNIT_ASSERT(buf3.RNextTok(' ', tok) && tok == "ab" && buf3 == ""); UNIT_ASSERT(!buf3.RNextTok(' ', tok) && tok == "ab" && buf3 == ""); // not modified - } - + } + Y_UNIT_TEST(TestRSplitOff) { - TStringBuf buf1("a.b.c"); + TStringBuf buf1("a.b.c"); UNIT_ASSERT_EQUAL(buf1.RSplitOff('.'), TStringBuf("a.b")); UNIT_ASSERT_EQUAL(buf1, TStringBuf("c")); - - TStringBuf buf2("a"); - UNIT_ASSERT_EQUAL(buf2.RSplitOff('.'), TStringBuf()); + + TStringBuf buf2("a"); + UNIT_ASSERT_EQUAL(buf2.RSplitOff('.'), TStringBuf()); UNIT_ASSERT_EQUAL(buf2, TStringBuf("a")); - } + } Y_UNIT_TEST(TestCBeginCEnd) { const char helloThere[] = "Hello there"; |