Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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); }
};
}
2 changes: 1 addition & 1 deletion cpp/Platform.Collections/Arrays/ArrayFiller[TElement].h
Original file line number Diff line number Diff line change
Expand Up @@ -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); }
};
}
8 changes: 4 additions & 4 deletions cpp/Platform.Collections/Arrays/GenericArrayExtensions.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,14 @@
}

template<Interfaces::CArray TArray, typename TItem = typename Interfaces::Array<TArray>::Item>
static auto AddSkipFirstAndReturnConstant(TArray& array, std::integral auto& position, Interfaces::CArray<TItem> auto&& elements, auto constant)
static auto SkipAndAddAndReturnConstant(TArray& array, std::integral auto& position, Interfaces::CArray<TItem> auto&& elements, auto constant)
{
AddSkipFirst(array, position, elements, 1);
SkipAndAdd(array, position, elements, 1);
return constant;
}

template<Interfaces::CArray TArray, typename TItem = typename Interfaces::Array<TArray>::Item>
static void AddSkipFirst(TArray& array, std::integral auto& position, Interfaces::CArray<TItem> auto&& elements, std::size_t skip)
static void SkipAndAdd(TArray& array, std::integral auto& position, Interfaces::CArray<TItem> auto&& elements, std::size_t skip)
{
for (auto&& element : elements | std::views::drop(skip))
{
Expand All @@ -96,5 +96,5 @@
}

template<Interfaces::CArray TArray, typename TItem = typename Interfaces::Array<TArray>::Item>
static void AddSkipFirst(TArray& array, std::integral auto& position, Interfaces::CArray<TItem> auto&& elements) { AddSkipFirst(array, position, elements, 1); }
static void SkipAndAdd(TArray& array, std::integral auto& position, Interfaces::CArray<TItem> auto&& elements) { SkipAndAdd(array, position, elements, 1); }
}
10 changes: 5 additions & 5 deletions cpp/Platform.Collections/Lists/IListExtensions.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,20 +61,20 @@
}

template<Interfaces::CList TList>
static bool AddSkipFirstAndReturnTrue(TList& list, Interfaces::CArray auto&& elements)
static bool SkipAndAddAndReturnTrue(TList& list, Interfaces::CArray auto&& elements)
{
AddSkipFirst(std::forward<decltype(elements)>(elements));
SkipAndAdd(std::forward<decltype(elements)>(elements));
return true;
}

template<Interfaces::CList TList>
static void AddSkipFirst(TList& list, Interfaces::CArray auto&& elements)
static void SkipAndAdd(TList& list, Interfaces::CArray auto&& elements)
{
AddSkipFirst(list, std::forward<decltype(elements)>(elements), 1);
SkipAndAdd(list, std::forward<decltype(elements)>(elements), 1);
}

template<Interfaces::CList TList>
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))
{
Expand Down
6 changes: 3 additions & 3 deletions cpp/Platform.Collections/Lists/ListFiller.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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;
}
};
Expand Down
8 changes: 4 additions & 4 deletions cpp/Platform.Collections/Sets/ISetExtensions.h
Original file line number Diff line number Diff line change
Expand Up @@ -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))
{
Expand Down
6 changes: 3 additions & 3 deletions cpp/Platform.Collections/Sets/SetFiller.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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;
}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@ public ArrayFiller(TElement[] array, TReturnConstant returnConstant) : this(arra
/// <para>Значение константы.</para>
/// </returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public TReturnConstant AddSkipFirstAndReturnConstant(IList<TElement> elements) => _array.AddSkipFirstAndReturnConstant(ref _position, elements, _returnConstant);
public TReturnConstant SkipAndAddAndReturnConstant(IList<TElement> elements) => _array.SkipAndAddAndReturnConstant(ref _position, elements, _returnConstant);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,6 @@ public ArrayFiller(TElement[] array) : this(array, 0) { }
/// <para>Значение <see langword="true"/>.</para>
/// </returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public bool AddSkipFirstAndReturnTrue(IList<TElement> elements) => _array.AddSkipFirstAndReturnConstant(ref _position, elements, true);
public bool SkipAndAddAndReturnTrue(IList<TElement> elements) => _array.SkipAndAddAndReturnConstant(ref _position, elements, true);
}
}
8 changes: 4 additions & 4 deletions csharp/Platform.Collections/Arrays/GenericArrayExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,9 @@ public static void AddAll<T>(this T[] array, ref long position, IList<T> element
/// <para>Значение константы, переданное в качестве аргумента.</para>
/// </returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static TReturnConstant AddSkipFirstAndReturnConstant<TElement, TReturnConstant>(this TElement[] array, ref long position, IList<TElement> elements, TReturnConstant returnConstant)
public static TReturnConstant SkipAndAddAndReturnConstant<TElement, TReturnConstant>(this TElement[] array, ref long position, IList<TElement> elements, TReturnConstant returnConstant)
{
array.AddSkipFirst(ref position, elements);
array.SkipAndAdd(ref position, elements);
return returnConstant;
}

Expand All @@ -281,7 +281,7 @@ public static TReturnConstant AddSkipFirstAndReturnConstant<TElement, TReturnCon
/// <param name="position"><para>Reference to the position from which to start adding elements.</para><para>Ссылка на позицию, с которой начинается добавление элементов.</para></param>
/// <param name="elements"><para>List, whose elements will be added to the array.</para><para>Список, элементы которого будут добавленны в массив.</para></param>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void AddSkipFirst<T>(this T[] array, ref long position, IList<T> elements) => array.AddSkipFirst(ref position, elements, 1);
public static void SkipAndAdd<T>(this T[] array, ref long position, IList<T> elements) => array.SkipAndAdd(ref position, elements, 1);

/// <summary>
/// <para>Adding in array all but the first element, skipping a specified number of positions and increments position value by one.</para>
Expand All @@ -293,7 +293,7 @@ public static TReturnConstant AddSkipFirstAndReturnConstant<TElement, TReturnCon
/// <param name="elements"><para>List, whose elements will be added to the array.</para><para>Список, элементы которого будут добавленны в массив.</para></param>
/// <param name="skip"><para>Number of elements to skip.</para><para>Количество пропускаемых элементов.</para></param>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void AddSkipFirst<T>(this T[] array, ref long position, IList<T> elements, int skip)
public static void SkipAndAdd<T>(this T[] array, ref long position, IList<T> elements, int skip)
{
for (var i = skip; i < elements.Count; i++)
{
Expand Down
8 changes: 4 additions & 4 deletions csharp/Platform.Collections/Lists/IListExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,9 @@ public static void AddAll<T>(this IList<T> list, IList<T> elements)
/// <para>Значение true в любом случае.</para>
/// </returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static bool AddSkipFirstAndReturnTrue<T>(this IList<T> list, IList<T> elements)
public static bool SkipAndAddAndReturnTrue<T>(this IList<T> list, IList<T> elements)
{
list.AddSkipFirst(elements);
list.SkipAndAdd(elements);
return true;
}

Expand All @@ -159,7 +159,7 @@ public static bool AddSkipFirstAndReturnTrue<T>(this IList<T> list, IList<T> ele
/// <param name="list"><para>The list to add the values to.</para><para>Список в который нужно добавить значения.</para></param>
/// <param name="elements"><para>List of values to add.</para><para>Список значений которые необходимо добавить.</para></param>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void AddSkipFirst<T>(this IList<T> list, IList<T> elements) => list.AddSkipFirst(elements, 1);
public static void SkipAndAdd<T>(this IList<T> list, IList<T> elements) => list.SkipAndAdd(elements, 1);

/// <summary>
/// <para>Adds values to the list skipping a specified number of first elements.</para>
Expand All @@ -170,7 +170,7 @@ public static bool AddSkipFirstAndReturnTrue<T>(this IList<T> list, IList<T> ele
/// <param name="elements"><para>List of values to add.</para><para>Список значений которые необходимо добавить.</para></param>
/// <param name="skip"><para>Number of elements to skip.</para><para>Количество пропускаемых элементов.</para></param>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void AddSkipFirst<T>(this IList<T> list, IList<T> elements, int skip)
public static void SkipAndAdd<T>(this IList<T> list, IList<T> elements, int skip)
{
for (var i = skip; i < elements.Count; i++)
{
Expand Down
6 changes: 3 additions & 3 deletions csharp/Platform.Collections/Lists/ListFiller.cs
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public ListFiller(List<TElement> list) : this(list, default) { }
/// <para>Значение true в любом случае.</para>
/// </returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public bool AddSkipFirstAndReturnTrue(IList<TElement> elements) => _list.AddSkipFirstAndReturnTrue(elements);
public bool SkipAndAddAndReturnTrue(IList<TElement> elements) => _list.SkipAndAddAndReturnTrue(elements);

/// <summary>
/// <para>Adds an item to the end of the list and return constant.</para>
Expand Down Expand Up @@ -166,9 +166,9 @@ public TReturnConstant AddAllAndReturnConstant(IList<TElement> elements)
/// <para>Значение константы в любом случае.</para>
/// </returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public TReturnConstant AddSkipFirstAndReturnConstant(IList<TElement> elements)
public TReturnConstant SkipAndAddAndReturnConstant(IList<TElement> elements)
{
_list.AddSkipFirst(elements);
_list.SkipAndAdd(elements);
return _returnConstant;
}
}
Expand Down
8 changes: 4 additions & 4 deletions csharp/Platform.Collections/Sets/ISetExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,9 @@ public static void AddAll<T>(this ISet<T> set, IList<T> elements)
/// <para></para>
/// </returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static bool AddSkipFirstAndReturnTrue<T>(this ISet<T> set, IList<T> elements)
public static bool SkipAndAddAndReturnTrue<T>(this ISet<T> set, IList<T> elements)
{
set.AddSkipFirst(elements);
set.SkipAndAdd(elements);
return true;
}

Expand All @@ -238,7 +238,7 @@ public static bool AddSkipFirstAndReturnTrue<T>(this ISet<T> set, IList<T> eleme
/// <para></para>
/// </param>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void AddSkipFirst<T>(this ISet<T> set, IList<T> elements) => set.AddSkipFirst(elements, 1);
public static void SkipAndAdd<T>(this ISet<T> set, IList<T> elements) => set.SkipAndAdd(elements, 1);

/// <summary>
/// <para>
Expand All @@ -263,7 +263,7 @@ public static bool AddSkipFirstAndReturnTrue<T>(this ISet<T> set, IList<T> eleme
/// <para></para>
/// </param>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void AddSkipFirst<T>(this ISet<T> set, IList<T> elements, int skip)
public static void SkipAndAdd<T>(this ISet<T> set, IList<T> elements, int skip)
{
for (var i = skip; i < elements.Count; i++)
{
Expand Down
6 changes: 3 additions & 3 deletions csharp/Platform.Collections/Sets/SetFiller.cs
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public SetFiller(ISet<TElement> set) : this(set, default) { }
/// <para></para>
/// </returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public bool AddSkipFirstAndReturnTrue(IList<TElement> elements) => _set.AddSkipFirstAndReturnTrue(elements);
public bool SkipAndAddAndReturnTrue(IList<TElement> elements) => _set.SkipAndAddAndReturnTrue(elements);

/// <summary>
/// <para>
Expand Down Expand Up @@ -221,9 +221,9 @@ public TReturnConstant AddAllAndReturnConstant(IList<TElement> elements)
/// <para></para>
/// </returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public TReturnConstant AddSkipFirstAndReturnConstant(IList<TElement> elements)
public TReturnConstant SkipAndAddAndReturnConstant(IList<TElement> elements)
{
_set.AddSkipFirst(elements);
_set.SkipAndAdd(elements);
return _returnConstant;
}
}
Expand Down
Loading