diff options
author | paxakor <paxakor@yandex-team.ru> | 2022-02-10 16:47:32 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:47:32 +0300 |
commit | 40d35c046ee3a61ee2a581f42499c5ce56ac589a (patch) | |
tree | c0748b5dcbade83af788c0abfa89c0383d6b779c /library/cpp/deprecated/split | |
parent | 7fdbed62e54b804e2c12b86a2c2bab12f61065df (diff) | |
download | ydb-40d35c046ee3a61ee2a581f42499c5ce56ac589a.tar.gz |
Restoring authorship annotation for <paxakor@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'library/cpp/deprecated/split')
-rw-r--r-- | library/cpp/deprecated/split/delim_string_iter.cpp | 16 | ||||
-rw-r--r-- | library/cpp/deprecated/split/delim_string_iter.h | 50 | ||||
-rw-r--r-- | library/cpp/deprecated/split/delim_string_iter_ut.cpp | 10 | ||||
-rw-r--r-- | library/cpp/deprecated/split/split_iterator.h | 4 | ||||
-rw-r--r-- | library/cpp/deprecated/split/split_iterator_ut.cpp | 72 |
5 files changed, 76 insertions, 76 deletions
diff --git a/library/cpp/deprecated/split/delim_string_iter.cpp b/library/cpp/deprecated/split/delim_string_iter.cpp index f1f43ccc2e..af418c5bfb 100644 --- a/library/cpp/deprecated/split/delim_string_iter.cpp +++ b/library/cpp/deprecated/split/delim_string_iter.cpp @@ -1,10 +1,10 @@ -#include "delim_string_iter.h" +#include "delim_string_iter.h" // -// TKeyValueDelimStringIter +// TKeyValueDelimStringIter // -void TKeyValueDelimStringIter::ReadKeyAndValue() { +void TKeyValueDelimStringIter::ReadKeyAndValue() { TStringBuf currentToken(*DelimIter); size_t pos = currentToken.find('='); @@ -17,18 +17,18 @@ void TKeyValueDelimStringIter::ReadKeyAndValue() { } } -TKeyValueDelimStringIter::TKeyValueDelimStringIter(const TStringBuf str, const TStringBuf delim) +TKeyValueDelimStringIter::TKeyValueDelimStringIter(const TStringBuf str, const TStringBuf delim) : DelimIter(str, delim) { if (DelimIter.Valid()) ReadKeyAndValue(); } -bool TKeyValueDelimStringIter::Valid() const { +bool TKeyValueDelimStringIter::Valid() const { return DelimIter.Valid(); } -TKeyValueDelimStringIter& TKeyValueDelimStringIter::operator++() { +TKeyValueDelimStringIter& TKeyValueDelimStringIter::operator++() { ++DelimIter; if (DelimIter.Valid()) ReadKeyAndValue(); @@ -36,10 +36,10 @@ TKeyValueDelimStringIter& TKeyValueDelimStringIter::operator++() { return *this; } -const TStringBuf& TKeyValueDelimStringIter::Key() const { +const TStringBuf& TKeyValueDelimStringIter::Key() const { return ChunkKey; } -const TStringBuf& TKeyValueDelimStringIter::Value() const { +const TStringBuf& TKeyValueDelimStringIter::Value() const { return ChunkValue; } diff --git a/library/cpp/deprecated/split/delim_string_iter.h b/library/cpp/deprecated/split/delim_string_iter.h index 030caaf780..8e4ca171a0 100644 --- a/library/cpp/deprecated/split/delim_string_iter.h +++ b/library/cpp/deprecated/split/delim_string_iter.h @@ -8,7 +8,7 @@ #include <iterator> -class TDelimStringIter { +class TDelimStringIter { public: using value_type = TStringBuf; using difference_type = ptrdiff_t; @@ -16,12 +16,12 @@ public: using reference = const TStringBuf&; using iterator_category = std::forward_iterator_tag; - inline TDelimStringIter(const char* begin, const char* strEnd, TStringBuf delim) - : TDelimStringIter(TStringBuf(begin, strEnd), delim) + inline TDelimStringIter(const char* begin, const char* strEnd, TStringBuf delim) + : TDelimStringIter(TStringBuf(begin, strEnd), delim) { } - inline TDelimStringIter(TStringBuf str, TStringBuf delim) + inline TDelimStringIter(TStringBuf str, TStringBuf delim) : IsValid(true) , Str(str) , Delim(delim) @@ -29,7 +29,7 @@ public: UpdateCurrent(); } - inline TDelimStringIter() + inline TDelimStringIter() : IsValid(false) { } @@ -39,7 +39,7 @@ public: } // NOTE: this is a potentially unsafe operation (no overrun check) - inline TDelimStringIter& operator++() { + inline TDelimStringIter& operator++() { if (Current.end() != Str.end()) { Str.Skip(Current.length() + Delim.length()); UpdateCurrent(); @@ -57,11 +57,11 @@ public: } } - inline bool operator==(const TDelimStringIter& rhs) const { + inline bool operator==(const TDelimStringIter& rhs) const { return (IsValid == rhs.IsValid) && (!IsValid || (Current.begin() == rhs.Current.begin())); } - inline bool operator!=(const TDelimStringIter& rhs) const { + inline bool operator!=(const TDelimStringIter& rhs) const { return !(*this == rhs); } @@ -86,7 +86,7 @@ public: } template <class T> - inline TDelimStringIter& Next(T& t) // Get & advance + inline TDelimStringIter& Next(T& t) // Get & advance { if (!TryNext(t)) ythrow yexception() << "No valid field"; @@ -117,8 +117,8 @@ public: return Str.SubStr(Current.length() + Delim.length()); } - inline TDelimStringIter IterEnd() const { - return TDelimStringIter(); + inline TDelimStringIter IterEnd() const { + return TDelimStringIter(); } private: @@ -147,37 +147,37 @@ struct TDelimStroka { { } - inline TDelimStringIter begin() const { - return TDelimStringIter(S, Delim); + inline TDelimStringIter begin() const { + return TDelimStringIter(S, Delim); } - inline TDelimStringIter end() const { - return TDelimStringIter(); + inline TDelimStringIter end() const { + return TDelimStringIter(); } }; -inline TDelimStringIter begin_delim(const TString& str, TStringBuf delim) { - return TDelimStringIter(str, delim); +inline TDelimStringIter begin_delim(const TString& str, TStringBuf delim) { + return TDelimStringIter(str, delim); } -inline TDelimStringIter begin_delim(TStringBuf str, TStringBuf delim) { - return TDelimStringIter(str.begin(), str.end(), delim); +inline TDelimStringIter begin_delim(TStringBuf str, TStringBuf delim) { + return TDelimStringIter(str.begin(), str.end(), delim); } -inline TDelimStringIter end_delim(const TString& /*str*/, TStringBuf /*delim*/) { - return TDelimStringIter(); +inline TDelimStringIter end_delim(const TString& /*str*/, TStringBuf /*delim*/) { + return TDelimStringIter(); } -class TKeyValueDelimStringIter { +class TKeyValueDelimStringIter { public: - TKeyValueDelimStringIter(const TStringBuf str, const TStringBuf delim); + TKeyValueDelimStringIter(const TStringBuf str, const TStringBuf delim); bool Valid() const; - TKeyValueDelimStringIter& operator++(); + TKeyValueDelimStringIter& operator++(); const TStringBuf& Key() const; const TStringBuf& Value() const; private: - TDelimStringIter DelimIter; + TDelimStringIter DelimIter; TStringBuf ChunkKey, ChunkValue; private: diff --git a/library/cpp/deprecated/split/delim_string_iter_ut.cpp b/library/cpp/deprecated/split/delim_string_iter_ut.cpp index d3a966915f..18a8b2a160 100644 --- a/library/cpp/deprecated/split/delim_string_iter_ut.cpp +++ b/library/cpp/deprecated/split/delim_string_iter_ut.cpp @@ -1,10 +1,10 @@ -#include "delim_string_iter.h" +#include "delim_string_iter.h" #include <util/generic/vector.h> #include <library/cpp/testing/unittest/registar.h> -/// Test that TDelimStringIter build on top of given string and delimeter will produce expected sequence +/// Test that TDelimStringIter build on top of given string and delimeter will produce expected sequence static void AssertStringSplit(const TString& str, const TString& delim, const TVector<TString>& expected) { - TDelimStringIter it(str, delim); + TDelimStringIter it(str, delim); // test iterator invariants for (const auto& expectedString : expected) { @@ -32,7 +32,7 @@ Y_UNIT_TEST_SUITE(TDelimStrokaIterTestSuite) { } Y_UNIT_TEST(Cdr) { - TDelimStringIter it("a\tc\t", "\t"); + TDelimStringIter it("a\tc\t", "\t"); UNIT_ASSERT_STRINGS_EQUAL(*it, "a"); UNIT_ASSERT_STRINGS_EQUAL(it.Cdr(), "c\t"); ++it; @@ -55,7 +55,7 @@ static void AssertKeyValueStringSplit( const TStringBuf str, const TStringBuf delim, const TVector<std::pair<TStringBuf, TStringBuf>>& expected) { - TKeyValueDelimStringIter it(str, delim); + TKeyValueDelimStringIter it(str, delim); for (const auto& expectedKeyValue : expected) { UNIT_ASSERT(it.Valid()); diff --git a/library/cpp/deprecated/split/split_iterator.h b/library/cpp/deprecated/split/split_iterator.h index d6c0ab5fbc..0eacc29228 100644 --- a/library/cpp/deprecated/split/split_iterator.h +++ b/library/cpp/deprecated/split/split_iterator.h @@ -284,7 +284,7 @@ public: return TStringBuf(Split.Str + region.Begin, region.End - region.Begin); } - const TString& NextString() { + const TString& NextString() { if (!CurrentStroka) CurrentStroka = new TString(); TSizeTRegion region = Next(); @@ -313,5 +313,5 @@ void Split(const TSplit& split, TSplitTokens* words) { words->clear(); TSplitIterator<TSplit> it(split); while (!it.Eof()) - words->push_back(it.NextString()); + words->push_back(it.NextString()); } diff --git a/library/cpp/deprecated/split/split_iterator_ut.cpp b/library/cpp/deprecated/split/split_iterator_ut.cpp index de8ddef925..be5069c4be 100644 --- a/library/cpp/deprecated/split/split_iterator_ut.cpp +++ b/library/cpp/deprecated/split/split_iterator_ut.cpp @@ -95,22 +95,22 @@ void TSplitIteratorTest::TestScreenedDelimitersSplit() { const TSplitDelimiters screens("\"[]"); const TScreenedDelimitersSplit splitter(s, delims, screens); TScreenedDelimitersSplit::TIterator it = splitter.Iterator(); - UNIT_ASSERT_EQUAL(it.NextString(), "77.88.58.91"); - UNIT_ASSERT_EQUAL(it.NextString(), "-"); - UNIT_ASSERT_EQUAL(it.NextString(), "-"); - UNIT_ASSERT_EQUAL(it.NextString(), "[28/Aug/2008:00:08:07 +0400]"); - UNIT_ASSERT_EQUAL(it.NextString(), "\"GET /export/mordashka.tgz HTTP/1.1\""); - UNIT_ASSERT_EQUAL(it.NextString(), "304"); - UNIT_ASSERT_EQUAL(it.NextString(), "-"); - UNIT_ASSERT_EQUAL(it.NextString(), "\"-\""); - UNIT_ASSERT_EQUAL(it.NextString(), "\"libwww-perl/5.805\""); - UNIT_ASSERT_EQUAL(it.NextString(), "\"news.yandex.ru,80\""); - UNIT_ASSERT_EQUAL(it.NextString(), "\"-\""); - UNIT_ASSERT_EQUAL(it.NextString(), "\"-\""); - UNIT_ASSERT_EQUAL(it.NextString(), "1219867687"); - UNIT_ASSERT_EQUAL(it.NextString(), "\"0\""); - UNIT_ASSERT_EQUAL(it.NextString(), "3283"); - UNIT_ASSERT_EQUAL(it.NextString(), "2"); + UNIT_ASSERT_EQUAL(it.NextString(), "77.88.58.91"); + UNIT_ASSERT_EQUAL(it.NextString(), "-"); + UNIT_ASSERT_EQUAL(it.NextString(), "-"); + UNIT_ASSERT_EQUAL(it.NextString(), "[28/Aug/2008:00:08:07 +0400]"); + UNIT_ASSERT_EQUAL(it.NextString(), "\"GET /export/mordashka.tgz HTTP/1.1\""); + UNIT_ASSERT_EQUAL(it.NextString(), "304"); + UNIT_ASSERT_EQUAL(it.NextString(), "-"); + UNIT_ASSERT_EQUAL(it.NextString(), "\"-\""); + UNIT_ASSERT_EQUAL(it.NextString(), "\"libwww-perl/5.805\""); + UNIT_ASSERT_EQUAL(it.NextString(), "\"news.yandex.ru,80\""); + UNIT_ASSERT_EQUAL(it.NextString(), "\"-\""); + UNIT_ASSERT_EQUAL(it.NextString(), "\"-\""); + UNIT_ASSERT_EQUAL(it.NextString(), "1219867687"); + UNIT_ASSERT_EQUAL(it.NextString(), "\"0\""); + UNIT_ASSERT_EQUAL(it.NextString(), "3283"); + UNIT_ASSERT_EQUAL(it.NextString(), "2"); } { const TString s = "77.88.58.91 - - [28/Aug/2008:00:08:07 +0400] \"GET /export/mordashka.tgz HTTP/1.1\" 304 - \"-\" \"libwww-perl/5.805\" \"news.yandex.ru,80\" \"-\" \"-\" 1219867687 \"0\" 3283 2"; @@ -118,22 +118,22 @@ void TSplitIteratorTest::TestScreenedDelimitersSplit() { const TSplitDelimiters screens("\"[]"); const TScreenedDelimitersSplit splitter(s.Data(), s.Size(), delims, screens); TScreenedDelimitersSplit::TIterator it = splitter.Iterator(); - UNIT_ASSERT_EQUAL(it.NextString(), "77.88.58.91"); - UNIT_ASSERT_EQUAL(it.NextString(), "-"); - UNIT_ASSERT_EQUAL(it.NextString(), "-"); - UNIT_ASSERT_EQUAL(it.NextString(), "[28/Aug/2008:00:08:07 +0400]"); - UNIT_ASSERT_EQUAL(it.NextString(), "\"GET /export/mordashka.tgz HTTP/1.1\""); - UNIT_ASSERT_EQUAL(it.NextString(), "304"); - UNIT_ASSERT_EQUAL(it.NextString(), "-"); - UNIT_ASSERT_EQUAL(it.NextString(), "\"-\""); - UNIT_ASSERT_EQUAL(it.NextString(), "\"libwww-perl/5.805\""); - UNIT_ASSERT_EQUAL(it.NextString(), "\"news.yandex.ru,80\""); - UNIT_ASSERT_EQUAL(it.NextString(), "\"-\""); - UNIT_ASSERT_EQUAL(it.NextString(), "\"-\""); - UNIT_ASSERT_EQUAL(it.NextString(), "1219867687"); - UNIT_ASSERT_EQUAL(it.NextString(), "\"0\""); - UNIT_ASSERT_EQUAL(it.NextString(), "3283"); - UNIT_ASSERT_EQUAL(it.NextString(), "2"); + UNIT_ASSERT_EQUAL(it.NextString(), "77.88.58.91"); + UNIT_ASSERT_EQUAL(it.NextString(), "-"); + UNIT_ASSERT_EQUAL(it.NextString(), "-"); + UNIT_ASSERT_EQUAL(it.NextString(), "[28/Aug/2008:00:08:07 +0400]"); + UNIT_ASSERT_EQUAL(it.NextString(), "\"GET /export/mordashka.tgz HTTP/1.1\""); + UNIT_ASSERT_EQUAL(it.NextString(), "304"); + UNIT_ASSERT_EQUAL(it.NextString(), "-"); + UNIT_ASSERT_EQUAL(it.NextString(), "\"-\""); + UNIT_ASSERT_EQUAL(it.NextString(), "\"libwww-perl/5.805\""); + UNIT_ASSERT_EQUAL(it.NextString(), "\"news.yandex.ru,80\""); + UNIT_ASSERT_EQUAL(it.NextString(), "\"-\""); + UNIT_ASSERT_EQUAL(it.NextString(), "\"-\""); + UNIT_ASSERT_EQUAL(it.NextString(), "1219867687"); + UNIT_ASSERT_EQUAL(it.NextString(), "\"0\""); + UNIT_ASSERT_EQUAL(it.NextString(), "3283"); + UNIT_ASSERT_EQUAL(it.NextString(), "2"); } } @@ -142,10 +142,10 @@ void TSplitIteratorTest::TestSubstringDelimiter() { static const TSubstringSplitDelimiter delimiter("@@"); const TSubstringSplit splitter(s, delimiter); TSubstringSplit::TIterator it = splitter.Iterator(); - UNIT_ASSERT_EQUAL(it.NextString(), "a"); - UNIT_ASSERT_EQUAL(it.NextString(), "bb"); - UNIT_ASSERT_EQUAL(it.NextString(), "cc@c.d"); - UNIT_ASSERT_EQUAL(it.NextString(), "r"); + UNIT_ASSERT_EQUAL(it.NextString(), "a"); + UNIT_ASSERT_EQUAL(it.NextString(), "bb"); + UNIT_ASSERT_EQUAL(it.NextString(), "cc@c.d"); + UNIT_ASSERT_EQUAL(it.NextString(), "r"); UNIT_ASSERT(it.Eof()); } |