diff options
author | stanly <stanly@yandex-team.ru> | 2022-02-10 16:46:49 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:46:49 +0300 |
commit | cde218e65dfef5ce03a48d641fd8f7913cf17b2d (patch) | |
tree | d3349caea4095825a55b5ba24fe758067b29ce6f /util/generic | |
parent | 9f813499b4ef585cb3c2bb93de93ef003daf4fc4 (diff) | |
download | ydb-cde218e65dfef5ce03a48d641fd8f7913cf17b2d.tar.gz |
Restoring authorship annotation for <stanly@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'util/generic')
-rw-r--r-- | util/generic/array_ref.h | 6 | ||||
-rw-r--r-- | util/generic/buffer.cpp | 14 | ||||
-rw-r--r-- | util/generic/intrlist.h | 48 | ||||
-rw-r--r-- | util/generic/iterator.h | 4 | ||||
-rw-r--r-- | util/generic/iterator_range.cpp | 2 | ||||
-rw-r--r-- | util/generic/iterator_range.h | 18 | ||||
-rw-r--r-- | util/generic/iterator_range_ut.cpp | 40 | ||||
-rw-r--r-- | util/generic/ptr_ut.cpp | 20 | ||||
-rw-r--r-- | util/generic/stack.h | 6 | ||||
-rw-r--r-- | util/generic/stack_ut.cpp | 20 | ||||
-rw-r--r-- | util/generic/ut/ya.make | 2 | ||||
-rw-r--r-- | util/generic/vector.h | 28 | ||||
-rw-r--r-- | util/generic/vector_ut.cpp | 44 |
13 files changed, 126 insertions, 126 deletions
diff --git a/util/generic/array_ref.h b/util/generic/array_ref.h index 1ac60ac7d3..811147b212 100644 --- a/util/generic/array_ref.h +++ b/util/generic/array_ref.h @@ -252,12 +252,12 @@ TArrayRef<char> as_writable_bytes(TArrayRef<T> arrayRef) noexcept { template <class Range> constexpr TArrayRef<const typename Range::value_type> MakeArrayRef(const Range& range) { return TArrayRef<const typename Range::value_type>(range); -} - +} + template <class Range> constexpr TArrayRef<typename Range::value_type> MakeArrayRef(Range& range) { return TArrayRef<typename Range::value_type>(range); -} +} template <class Range> constexpr TArrayRef<const typename Range::value_type> MakeConstArrayRef(const Range& range) { diff --git a/util/generic/buffer.cpp b/util/generic/buffer.cpp index b92697e1d0..8fde049b6e 100644 --- a/util/generic/buffer.cpp +++ b/util/generic/buffer.cpp @@ -22,14 +22,14 @@ TBuffer::TBuffer(TBuffer&& b) noexcept Swap(b); } -TBuffer::TBuffer(const char* buf, size_t len) +TBuffer::TBuffer(const char* buf, size_t len) : Data_(nullptr) - , Len_(0) - , Pos_(0) -{ - Append(buf, len); -} - + , Len_(0) + , Pos_(0) +{ + Append(buf, len); +} + TBuffer& TBuffer::operator=(TBuffer&& b) noexcept { y_deallocate(Data_); diff --git a/util/generic/intrlist.h b/util/generic/intrlist.h index b5d3f2051b..5995c75fcf 100644 --- a/util/generic/intrlist.h +++ b/util/generic/intrlist.h @@ -11,7 +11,7 @@ struct TIntrusiveListDefaultTag {}; * two-way linked list */ template <class T, class Tag = TIntrusiveListDefaultTag> -class TIntrusiveListItem { +class TIntrusiveListItem { private: using TListItem = TIntrusiveListItem<T, Tag>; @@ -110,16 +110,16 @@ public: } private: - inline TIntrusiveListItem(const TIntrusiveListItem&) = delete; - inline TIntrusiveListItem& operator=(const TIntrusiveListItem&) = delete; - -private: + inline TIntrusiveListItem(const TIntrusiveListItem&) = delete; + inline TIntrusiveListItem& operator=(const TIntrusiveListItem&) = delete; + +private: TListItem* Next_; TListItem* Prev_; }; template <class T, class Tag> -class TIntrusiveList { +class TIntrusiveList { private: using TListItem = TIntrusiveListItem<T, Tag>; @@ -342,8 +342,8 @@ public: public: inline TIntrusiveList() noexcept = default; - inline ~TIntrusiveList() = default; - + inline ~TIntrusiveList() = default; + inline TIntrusiveList(TIntrusiveList&& right) noexcept { this->Swap(right); } @@ -362,7 +362,7 @@ public: } inline size_t Size() const noexcept { - return std::distance(Begin(), End()); + return std::distance(Begin(), End()); } inline void Remove(TListItem* item) noexcept { @@ -577,10 +577,10 @@ public: } private: - inline TIntrusiveList(const TIntrusiveList&) = delete; - inline TIntrusiveList& operator=(const TIntrusiveList&) = delete; - -private: + inline TIntrusiveList(const TIntrusiveList&) = delete; + inline TIntrusiveList& operator=(const TIntrusiveList&) = delete; + +private: TListItem End_; }; @@ -687,16 +687,16 @@ public: template <class TListItem, class TNode> class TIteratorBase { public: - using TItem = TListItem; - using TReference = TNode&; - using TPointer = TNode*; - - using difference_type = std::ptrdiff_t; - using value_type = TNode; - using pointer = TPointer; - using reference = TReference; - using iterator_category = std::forward_iterator_tag; - + using TItem = TListItem; + using TReference = TNode&; + using TPointer = TNode*; + + using difference_type = std::ptrdiff_t; + using value_type = TNode; + using pointer = TPointer; + using reference = TReference; + using iterator_category = std::forward_iterator_tag; + inline TIteratorBase(TListItem* item) noexcept : Item_(item) { @@ -766,7 +766,7 @@ public: } inline size_t Size() const noexcept { - return std::distance(Begin(), End()); + return std::distance(Begin(), End()); } inline void Clear() noexcept { diff --git a/util/generic/iterator.h b/util/generic/iterator.h index 19e9d20976..f7e718e85d 100644 --- a/util/generic/iterator.h +++ b/util/generic/iterator.h @@ -70,12 +70,12 @@ public: // TODO: private public: static constexpr bool IsNoexceptNext = noexcept(std::declval<TSlave>().Next()); - using difference_type = std::ptrdiff_t; + using difference_type = std::ptrdiff_t; using pointer = decltype(std::declval<TSlave>().Next()); using reference = decltype(*std::declval<TSlave>().Next()); using value_type = std::remove_cv_t<std::remove_reference_t<reference>>; using iterator_category = std::input_iterator_tag; - + inline TIterator() noexcept : Slave_(nullptr) , Cur_() diff --git a/util/generic/iterator_range.cpp b/util/generic/iterator_range.cpp index bd8d7ff81b..97e1d8c3dd 100644 --- a/util/generic/iterator_range.cpp +++ b/util/generic/iterator_range.cpp @@ -1 +1 @@ -#include "iterator_range.h" +#include "iterator_range.h" diff --git a/util/generic/iterator_range.h b/util/generic/iterator_range.h index 9f4d02da29..45db9f055d 100644 --- a/util/generic/iterator_range.h +++ b/util/generic/iterator_range.h @@ -49,9 +49,9 @@ public: using difference_type = typename std::iterator_traits<iterator>::difference_type; using size_type = std::size_t; - TIteratorRange() - : Begin_() - , End_() + TIteratorRange() + : Begin_() + , End_() { } @@ -70,13 +70,13 @@ public: } Y_PURE_FUNCTION bool empty() const { - return Begin_ == End_; - } - - size_type size() const { + return Begin_ == End_; + } + + size_type size() const { return End_ - Begin_; - } - + } + reference operator[](size_t at) const { Y_ASSERT(at < size()); diff --git a/util/generic/iterator_range_ut.cpp b/util/generic/iterator_range_ut.cpp index a7e3670ae1..e859c90b01 100644 --- a/util/generic/iterator_range_ut.cpp +++ b/util/generic/iterator_range_ut.cpp @@ -1,4 +1,4 @@ -#include "iterator_range.h" +#include "iterator_range.h" #include <library/cpp/testing/unittest/registar.h> #include <util/generic/algorithm.h> @@ -6,9 +6,9 @@ Y_UNIT_TEST_SUITE(IteratorRange) { Y_UNIT_TEST(DefaultConstructor) { - TIteratorRange<int*> range; - UNIT_ASSERT(range.empty()); - } + TIteratorRange<int*> range; + UNIT_ASSERT(range.empty()); + } Y_UNIT_TEST(DefaultConstructorSentinel) { TIteratorRange<int*, void*> range; @@ -16,11 +16,11 @@ Y_UNIT_TEST_SUITE(IteratorRange) { } Y_UNIT_TEST(RangeBasedForLoop) { - // compileability test - for (int i : TIteratorRange<int*>()) { - Y_UNUSED(i); - } - } + // compileability test + for (int i : TIteratorRange<int*>()) { + Y_UNUSED(i); + } + } Y_UNIT_TEST(RangeBasedForLoopSentinel) { // compileability test @@ -30,11 +30,11 @@ Y_UNIT_TEST_SUITE(IteratorRange) { } Y_UNIT_TEST(Works) { - const int values[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}; - auto range = MakeIteratorRange(values, values + Y_ARRAY_SIZE(values)); - UNIT_ASSERT_VALUES_EQUAL(range.size(), Y_ARRAY_SIZE(values)); - UNIT_ASSERT(Equal(range.begin(), range.end(), values)); - UNIT_ASSERT(!range.empty()); + const int values[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}; + auto range = MakeIteratorRange(values, values + Y_ARRAY_SIZE(values)); + UNIT_ASSERT_VALUES_EQUAL(range.size(), Y_ARRAY_SIZE(values)); + UNIT_ASSERT(Equal(range.begin(), range.end(), values)); + UNIT_ASSERT(!range.empty()); } Y_UNIT_TEST(WorksSentinel) { @@ -89,10 +89,10 @@ Y_UNIT_TEST_SUITE(IteratorRange) { } Y_UNIT_TEST(CanUseInAlgorithms) { - const int values[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}; - auto range = MakeIteratorRange(values, values + Y_ARRAY_SIZE(values)); - // more like compileability test - // we should be able to use TIteratorRange as a container parameter for standard algorithms - UNIT_ASSERT(AllOf(range, [](int x) { return x > 0; })); - } + const int values[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}; + auto range = MakeIteratorRange(values, values + Y_ARRAY_SIZE(values)); + // more like compileability test + // we should be able to use TIteratorRange as a container parameter for standard algorithms + UNIT_ASSERT(AllOf(range, [](int x) { return x > 0; })); + } } diff --git a/util/generic/ptr_ut.cpp b/util/generic/ptr_ut.cpp index c2dcff23f6..c87d2e6374 100644 --- a/util/generic/ptr_ut.cpp +++ b/util/generic/ptr_ut.cpp @@ -708,7 +708,7 @@ void TPointerTest::TestMakeShared() { UNIT_ASSERT(state == OS_NOT_CREATED || state == OS_DESTROYED); } } - + template <class TPtr> void TestPtrComparison(const TPtr& ptr) { UNIT_ASSERT(ptr == ptr); @@ -719,15 +719,15 @@ void TestPtrComparison(const TPtr& ptr) { void TPointerTest::TestComparison() { THolder<A> ptr1(new A); - TAutoPtr<A> ptr2; - TSimpleSharedPtr<int> ptr3(new int(6)); - TIntrusivePtr<A> ptr4; + TAutoPtr<A> ptr2; + TSimpleSharedPtr<int> ptr3(new int(6)); + TIntrusivePtr<A> ptr4; TIntrusiveConstPtr<A> ptr5 = ptr4; - - UNIT_ASSERT(ptr1 != nullptr); - UNIT_ASSERT(ptr2 == nullptr); - UNIT_ASSERT(ptr3 != nullptr); - UNIT_ASSERT(ptr4 == nullptr); + + UNIT_ASSERT(ptr1 != nullptr); + UNIT_ASSERT(ptr2 == nullptr); + UNIT_ASSERT(ptr3 != nullptr); + UNIT_ASSERT(ptr4 == nullptr); UNIT_ASSERT(ptr5 == nullptr); TestPtrComparison(ptr1); @@ -735,7 +735,7 @@ void TPointerTest::TestComparison() { TestPtrComparison(ptr3); TestPtrComparison(ptr4); TestPtrComparison(ptr5); -} +} template <class T, class TRefCountedPtr> void TPointerTest::TestRefCountedPtrsInHashSetImpl() { diff --git a/util/generic/stack.h b/util/generic/stack.h index dbcbf2b5c9..048de43c9a 100644 --- a/util/generic/stack.h +++ b/util/generic/stack.h @@ -12,7 +12,7 @@ class TStack: public std::stack<T, S> { public: using TBase::TBase; - inline explicit operator bool() const noexcept { - return !this->empty(); - } + inline explicit operator bool() const noexcept { + return !this->empty(); + } }; diff --git a/util/generic/stack_ut.cpp b/util/generic/stack_ut.cpp index 248127d326..d60115caad 100644 --- a/util/generic/stack_ut.cpp +++ b/util/generic/stack_ut.cpp @@ -1,16 +1,16 @@ -#include "stack.h" - +#include "stack.h" + #include <library/cpp/testing/unittest/registar.h> - + Y_UNIT_TEST_SUITE(TYStackTest) { Y_UNIT_TEST(ExplicitBool) { TStack<int> s; - - UNIT_ASSERT(!s); + + UNIT_ASSERT(!s); UNIT_ASSERT(s.empty()); - s.push(100); - s.push(200); + s.push(100); + s.push(200); UNIT_ASSERT(s); - UNIT_ASSERT(!s.empty()); - } -} + UNIT_ASSERT(!s.empty()); + } +} diff --git a/util/generic/ut/ya.make b/util/generic/ut/ya.make index 6eaf24cc5f..c6bb8fe327 100644 --- a/util/generic/ut/ya.make +++ b/util/generic/ut/ya.make @@ -24,7 +24,7 @@ SRCS( generic/intrlist_ut.cpp generic/is_in_ut.cpp generic/iterator_ut.cpp - generic/iterator_range_ut.cpp + generic/iterator_range_ut.cpp generic/lazy_value_ut.cpp generic/list_ut.cpp generic/map_ut.cpp diff --git a/util/generic/vector.h b/util/generic/vector.h index a5b258955a..d6631a8c60 100644 --- a/util/generic/vector.h +++ b/util/generic/vector.h @@ -6,7 +6,7 @@ #include <util/memory/alloc.h> #include <vector> -#include <initializer_list> +#include <initializer_list> template <class T, class A> class TVector: public std::vector<T, TReboundAllocator<A, T>> { @@ -58,15 +58,15 @@ public: } inline TVector(std::initializer_list<T> il) - : TBase(il) - { - } - + : TBase(il) + { + } + inline TVector(std::initializer_list<T> il, const typename TBase::allocator_type& a) - : TBase(il, a) - { - } - + : TBase(il, a) + { + } + inline TVector(const TSelf& src) : TBase(src) { @@ -93,11 +93,11 @@ public: return *this; } - inline TSelf& operator=(std::initializer_list<T> il) { - this->assign(il.begin(), il.end()); - return *this; - } - + inline TSelf& operator=(std::initializer_list<T> il) { + this->assign(il.begin(), il.end()); + return *this; + } + inline explicit operator bool() const noexcept { return !this->empty(); } diff --git a/util/generic/vector_ut.cpp b/util/generic/vector_ut.cpp index 0f6b4037a0..d829831fb6 100644 --- a/util/generic/vector_ut.cpp +++ b/util/generic/vector_ut.cpp @@ -29,7 +29,7 @@ class TYVectorTest: public TTestBase { UNIT_TEST(TestFillInConstructor) UNIT_TEST(TestYResize) UNIT_TEST(TestCrop) - UNIT_TEST(TestInitializeList) + UNIT_TEST(TestInitializeList) UNIT_TEST_SUITE_END(); private: @@ -563,34 +563,34 @@ private: TestYResize<TPod>(); TestYResize<TNonPod>(); } - + void CheckInitializeList(const TVector<int>& v) { for (size_t i = 0; i < v.size(); ++i) { UNIT_ASSERT_EQUAL(v[i], static_cast<int>(i)); - } - } - - void TestInitializeList() { - { + } + } + + void TestInitializeList() { + { TVector<int> v; - v.assign({0, 1, 2}); - CheckInitializeList(v); - } - { + v.assign({0, 1, 2}); + CheckInitializeList(v); + } + { TVector<int> v = {0, 1, 2}; - CheckInitializeList(v); - } - { + CheckInitializeList(v); + } + { TVector<int> v; - v = {0, 1, 2}; - CheckInitializeList(v); - } - { + v = {0, 1, 2}; + CheckInitializeList(v); + } + { TVector<int> v = {0, 3}; - v.insert(v.begin() + 1, {1, 2}); - CheckInitializeList(v); - } - } + v.insert(v.begin() + 1, {1, 2}); + CheckInitializeList(v); + } + } }; UNIT_TEST_SUITE_REGISTRATION(TYVectorTest); |