diff options
author | yuliy <yuliy@yandex-team.ru> | 2022-02-10 16:50:10 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:50:10 +0300 |
commit | df5f2b17d65c239ec8d68fdf518fcbea2bcc0bfe (patch) | |
tree | cc7288225ae23e459fe89ae954054ab490ae214c | |
parent | 7cba2edf1dbe4bc03ee23552d0a418bf48eb3a13 (diff) | |
download | ydb-df5f2b17d65c239ec8d68fdf518fcbea2bcc0bfe.tar.gz |
Restoring authorship annotation for <yuliy@yandex-team.ru>. Commit 1 of 2.
-rw-r--r-- | library/cpp/deprecated/split/delim_string_iter.cpp | 72 | ||||
-rw-r--r-- | library/cpp/deprecated/split/delim_string_iter.h | 20 | ||||
-rw-r--r-- | library/cpp/deprecated/split/delim_string_iter_ut.cpp | 56 |
3 files changed, 74 insertions, 74 deletions
diff --git a/library/cpp/deprecated/split/delim_string_iter.cpp b/library/cpp/deprecated/split/delim_string_iter.cpp index af418c5bfb..8470a8587b 100644 --- a/library/cpp/deprecated/split/delim_string_iter.cpp +++ b/library/cpp/deprecated/split/delim_string_iter.cpp @@ -1,45 +1,45 @@ #include "delim_string_iter.h" - -// + +// // TKeyValueDelimStringIter -// - +// + void TKeyValueDelimStringIter::ReadKeyAndValue() { - TStringBuf currentToken(*DelimIter); - - size_t pos = currentToken.find('='); + TStringBuf currentToken(*DelimIter); + + size_t pos = currentToken.find('='); if (pos == TString::npos) { - ChunkValue.Clear(); - ChunkKey = currentToken; - } else { - ChunkKey = currentToken.SubStr(0, pos); - ChunkValue = currentToken.SubStr(pos + 1); - } -} - + ChunkValue.Clear(); + ChunkKey = currentToken; + } else { + ChunkKey = currentToken.SubStr(0, pos); + ChunkValue = currentToken.SubStr(pos + 1); + } +} + TKeyValueDelimStringIter::TKeyValueDelimStringIter(const TStringBuf str, const TStringBuf delim) - : DelimIter(str, delim) -{ - if (DelimIter.Valid()) - ReadKeyAndValue(); -} - + : DelimIter(str, delim) +{ + if (DelimIter.Valid()) + ReadKeyAndValue(); +} + bool TKeyValueDelimStringIter::Valid() const { - return DelimIter.Valid(); -} - + return DelimIter.Valid(); +} + TKeyValueDelimStringIter& TKeyValueDelimStringIter::operator++() { - ++DelimIter; - if (DelimIter.Valid()) - ReadKeyAndValue(); - - return *this; -} - + ++DelimIter; + if (DelimIter.Valid()) + ReadKeyAndValue(); + + return *this; +} + const TStringBuf& TKeyValueDelimStringIter::Key() const { - return ChunkKey; -} - + return ChunkKey; +} + const TStringBuf& TKeyValueDelimStringIter::Value() const { - return ChunkValue; -} + return ChunkValue; +} diff --git a/library/cpp/deprecated/split/delim_string_iter.h b/library/cpp/deprecated/split/delim_string_iter.h index 8e4ca171a0..445857e7f2 100644 --- a/library/cpp/deprecated/split/delim_string_iter.h +++ b/library/cpp/deprecated/split/delim_string_iter.h @@ -167,19 +167,19 @@ inline TDelimStringIter begin_delim(TStringBuf str, TStringBuf delim) { inline TDelimStringIter end_delim(const TString& /*str*/, TStringBuf /*delim*/) { return TDelimStringIter(); } - + class TKeyValueDelimStringIter { -public: +public: TKeyValueDelimStringIter(const TStringBuf str, const TStringBuf delim); - bool Valid() const; + bool Valid() const; TKeyValueDelimStringIter& operator++(); const TStringBuf& Key() const; const TStringBuf& Value() const; - -private: + +private: TDelimStringIter DelimIter; - TStringBuf ChunkKey, ChunkValue; - -private: - void ReadKeyAndValue(); -}; + TStringBuf ChunkKey, ChunkValue; + +private: + void ReadKeyAndValue(); +}; diff --git a/library/cpp/deprecated/split/delim_string_iter_ut.cpp b/library/cpp/deprecated/split/delim_string_iter_ut.cpp index 18a8b2a160..a0ec436186 100644 --- a/library/cpp/deprecated/split/delim_string_iter_ut.cpp +++ b/library/cpp/deprecated/split/delim_string_iter_ut.cpp @@ -50,50 +50,50 @@ Y_UNIT_TEST_SUITE(TDelimStrokaIterTestSuite) { UNIT_ASSERT_EQUAL(got, expected); } } - -static void AssertKeyValueStringSplit( + +static void AssertKeyValueStringSplit( const TStringBuf str, const TStringBuf delim, const TVector<std::pair<TStringBuf, TStringBuf>>& expected) { TKeyValueDelimStringIter it(str, delim); - - for (const auto& expectedKeyValue : expected) { - UNIT_ASSERT(it.Valid()); - UNIT_ASSERT_STRINGS_EQUAL(it.Key(), expectedKeyValue.first); - UNIT_ASSERT_STRINGS_EQUAL(it.Value(), expectedKeyValue.second); - ++it; - } - UNIT_ASSERT(!it.Valid()); -} - + + for (const auto& expectedKeyValue : expected) { + UNIT_ASSERT(it.Valid()); + UNIT_ASSERT_STRINGS_EQUAL(it.Key(), expectedKeyValue.first); + UNIT_ASSERT_STRINGS_EQUAL(it.Value(), expectedKeyValue.second); + ++it; + } + UNIT_ASSERT(!it.Valid()); +} + Y_UNIT_TEST_SUITE(TKeyValueDelimStringIterTestSuite) { Y_UNIT_TEST(SingleCharacterAsDelimiter) { - AssertKeyValueStringSplit( - "abc=123,cde=qwer", ",", + AssertKeyValueStringSplit( + "abc=123,cde=qwer", ",", {{"abc", "123"}, {"cde", "qwer"}}); - } - + } + Y_UNIT_TEST(MultipleCharactersAsDelimiter) { - AssertKeyValueStringSplit( - "abc=xyz@@qwerty=zxcv", "@@", + AssertKeyValueStringSplit( + "abc=xyz@@qwerty=zxcv", "@@", {{"abc", "xyz"}, {"qwerty", "zxcv"}}); - } - + } + Y_UNIT_TEST(NoDelimiters) { - AssertKeyValueStringSplit( - "abc=zz", ",", + AssertKeyValueStringSplit( + "abc=zz", ",", {{"abc", "zz"}}); - } - + } + Y_UNIT_TEST(EmptyElements) { - AssertKeyValueStringSplit( - "@@abc=zxy@@@@qwerty=y@@", "@@", + AssertKeyValueStringSplit( + "@@abc=zxy@@@@qwerty=y@@", "@@", {{"", ""}, {"abc", "zxy"}, {"", ""}, {"qwerty", "y"}, {"", ""}}); - } -} + } +} |