diff --git a/cpp/Platform.Collections/Arrays/ArrayFiller[TElement, TReturnConstant].h b/cpp/Platform.Collections/Arrays/ArrayFiller[TElement, TReturnConstant].h index 2b4d4744..418ec86f 100644 --- a/cpp/Platform.Collections/Arrays/ArrayFiller[TElement, TReturnConstant].h +++ b/cpp/Platform.Collections/Arrays/ArrayFiller[TElement, TReturnConstant].h @@ -17,6 +17,6 @@ public: TReturnConstant AddAllAndReturnConstant(Interfaces::CArray auto&& elements) { return Arrays::AddAllAndReturnConstant(base::_array, base::_position, elements, _returnConstant); } - public: TReturnConstant AddSkipFirstAndReturnConstant(Interfaces::CArray auto&& elements) { return Arrays::AddSkipFirstAndReturnConstant(base::_array, base::_position, elements, _returnConstant); } + public: TReturnConstant SkipAndAddAndReturnConstant(Interfaces::CArray auto&& elements) { return Arrays::SkipAndAddAndReturnConstant(base::_array, base::_position, elements, _returnConstant); } }; } diff --git a/cpp/Platform.Collections/Arrays/ArrayFiller[TElement].h b/cpp/Platform.Collections/Arrays/ArrayFiller[TElement].h index 21a166a2..ddd0bbb2 100644 --- a/cpp/Platform.Collections/Arrays/ArrayFiller[TElement].h +++ b/cpp/Platform.Collections/Arrays/ArrayFiller[TElement].h @@ -18,6 +18,6 @@ public: bool AddAllAndReturnTrue(Interfaces::CArray auto&& elements) { return Arrays::AddAllAndReturnConstant(_array, _position, elements, true); } - public: bool AddSkipFirstAndReturnTrue(Interfaces::CArray auto&& elements) { return Arrays::AddSkipFirstAndReturnConstant(_array, _position, elements, true); } + public: bool SkipAndAddAndReturnTrue(Interfaces::CArray auto&& elements) { return Arrays::SkipAndAddAndReturnConstant(_array, _position, elements, true); } }; } diff --git a/cpp/Platform.Collections/Arrays/GenericArrayExtensions.h b/cpp/Platform.Collections/Arrays/GenericArrayExtensions.h index 39cc8b16..4e2154ac 100644 --- a/cpp/Platform.Collections/Arrays/GenericArrayExtensions.h +++ b/cpp/Platform.Collections/Arrays/GenericArrayExtensions.h @@ -80,14 +80,14 @@ } template::Item> - static auto AddSkipFirstAndReturnConstant(TArray& array, std::integral auto& position, Interfaces::CArray auto&& elements, auto constant) + static auto SkipAndAddAndReturnConstant(TArray& array, std::integral auto& position, Interfaces::CArray auto&& elements, auto constant) { - AddSkipFirst(array, position, elements, 1); + SkipAndAdd(array, position, elements, 1); return constant; } template::Item> - static void AddSkipFirst(TArray& array, std::integral auto& position, Interfaces::CArray auto&& elements, std::size_t skip) + static void SkipAndAdd(TArray& array, std::integral auto& position, Interfaces::CArray auto&& elements, std::size_t skip) { for (auto&& element : elements | std::views::drop(skip)) { @@ -96,5 +96,5 @@ } template::Item> - static void AddSkipFirst(TArray& array, std::integral auto& position, Interfaces::CArray auto&& elements) { AddSkipFirst(array, position, elements, 1); } + static void SkipAndAdd(TArray& array, std::integral auto& position, Interfaces::CArray auto&& elements) { SkipAndAdd(array, position, elements, 1); } } diff --git a/cpp/Platform.Collections/Lists/IListExtensions.h b/cpp/Platform.Collections/Lists/IListExtensions.h index ab79a9f1..382aad79 100644 --- a/cpp/Platform.Collections/Lists/IListExtensions.h +++ b/cpp/Platform.Collections/Lists/IListExtensions.h @@ -61,20 +61,20 @@ } template - static bool AddSkipFirstAndReturnTrue(TList& list, Interfaces::CArray auto&& elements) + static bool SkipAndAddAndReturnTrue(TList& list, Interfaces::CArray auto&& elements) { - AddSkipFirst(std::forward(elements)); + SkipAndAdd(std::forward(elements)); return true; } template - static void AddSkipFirst(TList& list, Interfaces::CArray auto&& elements) + static void SkipAndAdd(TList& list, Interfaces::CArray auto&& elements) { - AddSkipFirst(list, std::forward(elements), 1); + SkipAndAdd(list, std::forward(elements), 1); } template - static void AddSkipFirst(TList& list, Interfaces::CArray auto&& elements, std::size_t skip) + static void SkipAndAdd(TList& list, Interfaces::CArray auto&& elements, std::size_t skip) { for (auto&& element : elements | std::views::drop(skip)) { diff --git a/cpp/Platform.Collections/Lists/ListFiller.h b/cpp/Platform.Collections/Lists/ListFiller.h index bfe06b14..402edf02 100644 --- a/cpp/Platform.Collections/Lists/ListFiller.h +++ b/cpp/Platform.Collections/Lists/ListFiller.h @@ -19,7 +19,7 @@ public: bool AddAllAndReturnTrue(Interfaces::CArray auto&& elements){ return Lists::AddAllAndReturnTrue(_list, elements); } - public: bool AddSkipFirstAndReturnTrue(Interfaces::CArray auto&& elements) { return Lists::AddSkipFirstAndReturnTrue(_list, elements); } + public: bool SkipAndAddAndReturnTrue(Interfaces::CArray auto&& elements) { return Lists::SkipAndAddAndReturnTrue(_list, elements); } public: TReturnConstant AddAndReturnConstant(auto&& element) { @@ -39,9 +39,9 @@ return _returnConstant; } - public: TReturnConstant AddSkipFirstAndReturnConstant(Interfaces::CArray auto&& elements) + public: TReturnConstant SkipAndAddAndReturnConstant(Interfaces::CArray auto&& elements) { - Lists::AddSkipFirst(_list, elements); + Lists::SkipAndAdd(_list, elements); return _returnConstant; } }; diff --git a/cpp/Platform.Collections/Sets/ISetExtensions.h b/cpp/Platform.Collections/Sets/ISetExtensions.h index 7376e3e1..105f0b5c 100644 --- a/cpp/Platform.Collections/Sets/ISetExtensions.h +++ b/cpp/Platform.Collections/Sets/ISetExtensions.h @@ -41,15 +41,15 @@ } } - static bool AddSkipFirstAndReturnTrue(Interfaces::CSet auto& set, Interfaces::CArray auto&& elements) + static bool SkipAndAddAndReturnTrue(Interfaces::CSet auto& set, Interfaces::CArray auto&& elements) { - AddSkipFirst(set, elements); + SkipAndAdd(set, elements); return true; } - static void AddSkipFirst(Interfaces::CSet auto& set, Interfaces::CArray auto&& elements) { AddSkipFirst(set, elements, 1); } + static void SkipAndAdd(Interfaces::CSet auto& set, Interfaces::CArray auto&& elements) { SkipAndAdd(set, elements, 1); } - static void AddSkipFirst(Interfaces::CSet auto& set, Interfaces::CArray auto&& elements, std::size_t skip) + static void SkipAndAdd(Interfaces::CSet auto& set, Interfaces::CArray auto&& elements, std::size_t skip) { for (auto&& element : elements | std::views::drop(skip)) { diff --git a/cpp/Platform.Collections/Sets/SetFiller.h b/cpp/Platform.Collections/Sets/SetFiller.h index 52fbec48..e5cd30b2 100644 --- a/cpp/Platform.Collections/Sets/SetFiller.h +++ b/cpp/Platform.Collections/Sets/SetFiller.h @@ -18,7 +18,7 @@ public: bool AddAllAndReturnTrue(Interfaces::CArray auto&& elements) { return Sets::AddAllAndReturnTrue(_set, elements); } - public: bool AddSkipFirstAndReturnTrue(Interfaces::CArray auto&& elements) { return Sets::AddSkipFirstAndReturnTrue(_set, elements); } + public: bool SkipAndAddAndReturnTrue(Interfaces::CArray auto&& elements) { return Sets::SkipAndAddAndReturnTrue(_set, elements); } public: TReturnConstant AddAndReturnConstant(auto&& element) { @@ -38,9 +38,9 @@ return _returnConstant; } - public: TReturnConstant AddSkipFirstAndReturnConstant(Interfaces::CArray auto&& elements) + public: TReturnConstant SkipAndAddAndReturnConstant(Interfaces::CArray auto&& elements) { - Sets::AddSkipFirst(_set, elements); + Sets::SkipAndAdd(_set, elements); return _returnConstant; } }; diff --git a/csharp/Platform.Collections/Arrays/ArrayFiller[TElement, TReturnConstant].cs b/csharp/Platform.Collections/Arrays/ArrayFiller[TElement, TReturnConstant].cs index 506b7c2e..4dbaf8f0 100644 --- a/csharp/Platform.Collections/Arrays/ArrayFiller[TElement, TReturnConstant].cs +++ b/csharp/Platform.Collections/Arrays/ArrayFiller[TElement, TReturnConstant].cs @@ -84,6 +84,6 @@ public ArrayFiller(TElement[] array, TReturnConstant returnConstant) : this(arra /// Значение константы. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public TReturnConstant AddSkipFirstAndReturnConstant(IList elements) => _array.AddSkipFirstAndReturnConstant(ref _position, elements, _returnConstant); + public TReturnConstant SkipAndAddAndReturnConstant(IList elements) => _array.SkipAndAddAndReturnConstant(ref _position, elements, _returnConstant); } } diff --git a/csharp/Platform.Collections/Arrays/ArrayFiller[TElement].cs b/csharp/Platform.Collections/Arrays/ArrayFiller[TElement].cs index 3706e438..40577e70 100644 --- a/csharp/Platform.Collections/Arrays/ArrayFiller[TElement].cs +++ b/csharp/Platform.Collections/Arrays/ArrayFiller[TElement].cs @@ -100,6 +100,6 @@ public ArrayFiller(TElement[] array) : this(array, 0) { } /// Значение . /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public bool AddSkipFirstAndReturnTrue(IList elements) => _array.AddSkipFirstAndReturnConstant(ref _position, elements, true); + public bool SkipAndAddAndReturnTrue(IList elements) => _array.SkipAndAddAndReturnConstant(ref _position, elements, true); } } diff --git a/csharp/Platform.Collections/Arrays/GenericArrayExtensions.cs b/csharp/Platform.Collections/Arrays/GenericArrayExtensions.cs index 3f4966c7..d06dc6ff 100644 --- a/csharp/Platform.Collections/Arrays/GenericArrayExtensions.cs +++ b/csharp/Platform.Collections/Arrays/GenericArrayExtensions.cs @@ -266,9 +266,9 @@ public static void AddAll(this T[] array, ref long position, IList element /// Значение константы, переданное в качестве аргумента. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static TReturnConstant AddSkipFirstAndReturnConstant(this TElement[] array, ref long position, IList elements, TReturnConstant returnConstant) + public static TReturnConstant SkipAndAddAndReturnConstant(this TElement[] array, ref long position, IList elements, TReturnConstant returnConstant) { - array.AddSkipFirst(ref position, elements); + array.SkipAndAdd(ref position, elements); return returnConstant; } @@ -281,7 +281,7 @@ public static TReturnConstant AddSkipFirstAndReturnConstantReference to the position from which to start adding elements.Ссылка на позицию, с которой начинается добавление элементов. /// List, whose elements will be added to the array.Список, элементы которого будут добавленны в массив. [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void AddSkipFirst(this T[] array, ref long position, IList elements) => array.AddSkipFirst(ref position, elements, 1); + public static void SkipAndAdd(this T[] array, ref long position, IList elements) => array.SkipAndAdd(ref position, elements, 1); /// /// Adding in array all but the first element, skipping a specified number of positions and increments position value by one. @@ -293,7 +293,7 @@ public static TReturnConstant AddSkipFirstAndReturnConstantList, whose elements will be added to the array.Список, элементы которого будут добавленны в массив. /// Number of elements to skip.Количество пропускаемых элементов. [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void AddSkipFirst(this T[] array, ref long position, IList elements, int skip) + public static void SkipAndAdd(this T[] array, ref long position, IList elements, int skip) { for (var i = skip; i < elements.Count; i++) { diff --git a/csharp/Platform.Collections/Lists/IListExtensions.cs b/csharp/Platform.Collections/Lists/IListExtensions.cs index a39cb34e..f6d296f3 100644 --- a/csharp/Platform.Collections/Lists/IListExtensions.cs +++ b/csharp/Platform.Collections/Lists/IListExtensions.cs @@ -145,9 +145,9 @@ public static void AddAll(this IList list, IList elements) /// Значение true в любом случае. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool AddSkipFirstAndReturnTrue(this IList list, IList elements) + public static bool SkipAndAddAndReturnTrue(this IList list, IList elements) { - list.AddSkipFirst(elements); + list.SkipAndAdd(elements); return true; } @@ -159,7 +159,7 @@ public static bool AddSkipFirstAndReturnTrue(this IList list, IList ele /// The list to add the values to.Список в который нужно добавить значения. /// List of values to add.Список значений которые необходимо добавить. [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void AddSkipFirst(this IList list, IList elements) => list.AddSkipFirst(elements, 1); + public static void SkipAndAdd(this IList list, IList elements) => list.SkipAndAdd(elements, 1); /// /// Adds values to the list skipping a specified number of first elements. @@ -170,7 +170,7 @@ public static bool AddSkipFirstAndReturnTrue(this IList list, IList ele /// List of values to add.Список значений которые необходимо добавить. /// Number of elements to skip.Количество пропускаемых элементов. [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void AddSkipFirst(this IList list, IList elements, int skip) + public static void SkipAndAdd(this IList list, IList elements, int skip) { for (var i = skip; i < elements.Count; i++) { diff --git a/csharp/Platform.Collections/Lists/ListFiller.cs b/csharp/Platform.Collections/Lists/ListFiller.cs index 807f8cad..9fe36bcd 100644 --- a/csharp/Platform.Collections/Lists/ListFiller.cs +++ b/csharp/Platform.Collections/Lists/ListFiller.cs @@ -106,7 +106,7 @@ public ListFiller(List list) : this(list, default) { } /// Значение true в любом случае. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public bool AddSkipFirstAndReturnTrue(IList elements) => _list.AddSkipFirstAndReturnTrue(elements); + public bool SkipAndAddAndReturnTrue(IList elements) => _list.SkipAndAddAndReturnTrue(elements); /// /// Adds an item to the end of the list and return constant. @@ -166,9 +166,9 @@ public TReturnConstant AddAllAndReturnConstant(IList elements) /// Значение константы в любом случае. /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public TReturnConstant AddSkipFirstAndReturnConstant(IList elements) + public TReturnConstant SkipAndAddAndReturnConstant(IList elements) { - _list.AddSkipFirst(elements); + _list.SkipAndAdd(elements); return _returnConstant; } } diff --git a/csharp/Platform.Collections/Sets/ISetExtensions.cs b/csharp/Platform.Collections/Sets/ISetExtensions.cs index 3d53fbb8..692fab6c 100644 --- a/csharp/Platform.Collections/Sets/ISetExtensions.cs +++ b/csharp/Platform.Collections/Sets/ISetExtensions.cs @@ -213,9 +213,9 @@ public static void AddAll(this ISet set, IList elements) /// /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool AddSkipFirstAndReturnTrue(this ISet set, IList elements) + public static bool SkipAndAddAndReturnTrue(this ISet set, IList elements) { - set.AddSkipFirst(elements); + set.SkipAndAdd(elements); return true; } @@ -238,7 +238,7 @@ public static bool AddSkipFirstAndReturnTrue(this ISet set, IList eleme /// /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void AddSkipFirst(this ISet set, IList elements) => set.AddSkipFirst(elements, 1); + public static void SkipAndAdd(this ISet set, IList elements) => set.SkipAndAdd(elements, 1); /// /// @@ -263,7 +263,7 @@ public static bool AddSkipFirstAndReturnTrue(this ISet set, IList eleme /// /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void AddSkipFirst(this ISet set, IList elements, int skip) + public static void SkipAndAdd(this ISet set, IList elements, int skip) { for (var i = skip; i < elements.Count; i++) { diff --git a/csharp/Platform.Collections/Sets/SetFiller.cs b/csharp/Platform.Collections/Sets/SetFiller.cs index cce2a96b..f3ec2ea0 100644 --- a/csharp/Platform.Collections/Sets/SetFiller.cs +++ b/csharp/Platform.Collections/Sets/SetFiller.cs @@ -141,7 +141,7 @@ public SetFiller(ISet set) : this(set, default) { } /// /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public bool AddSkipFirstAndReturnTrue(IList elements) => _set.AddSkipFirstAndReturnTrue(elements); + public bool SkipAndAddAndReturnTrue(IList elements) => _set.SkipAndAddAndReturnTrue(elements); /// /// @@ -221,9 +221,9 @@ public TReturnConstant AddAllAndReturnConstant(IList elements) /// /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public TReturnConstant AddSkipFirstAndReturnConstant(IList elements) + public TReturnConstant SkipAndAddAndReturnConstant(IList elements) { - _set.AddSkipFirst(elements); + _set.SkipAndAdd(elements); return _returnConstant; } }