Skip to content

workaround for LDC issue issue 2121 #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 20, 2017
Merged

workaround for LDC issue issue 2121 #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 33 additions & 6 deletions source/mir/ndslice/slice.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,8 +625,10 @@ struct Slice(SliceKind kind, size_t[] packs, Iterator)
enum PureIndexLength(Slices...) = Filter!(isIndex, Slices).length;

enum isPureSlice(Slices...) =
Slices.length <= packs[0]
Slices.length == 0
|| Slices.length <= packs[0]
&& PureIndexLength!Slices < packs[0]
&& Filter!(isIndex, Slices).length < Slices.length
&& allSatisfy!(templateOr!(isIndex, is_Slice), Slices);

enum isFullPureSlice(Slices...) =
Expand All @@ -653,7 +655,7 @@ struct Slice(SliceKind kind, size_t[] packs, Iterator)
return _stride!dimension * (_lengths[dimension] - 1);
}

size_t indexStride(size_t I)(size_t[I] _indexes...) @safe const
size_t indexStride(size_t I)(size_t[I] _indexes) @safe const
{
static if (_indexes.length)
{
Expand Down Expand Up @@ -1550,7 +1552,14 @@ struct Slice(SliceKind kind, size_t[] packs, Iterator)
/++
$(BOLD Fully defined index)
+/
auto ref opIndex(size_t I)(size_t[I] _indexes...) @trusted
auto ref opIndex(Indexes...)(Indexes indexes) @safe
if (Indexes.length && Indexes.length <= packs[0] && allSatisfy!(isIndex, Indexes))
{
return this.opIndex!(indexes.length)([indexes]);
}

// ditto
auto ref opIndex(size_t I)(size_t[I] _indexes) @trusted
if (I && I <= packs[0])
{
static if (I == N)
Expand Down Expand Up @@ -2054,7 +2063,13 @@ struct Slice(SliceKind kind, size_t[] packs, Iterator)
/++
Assignment of a value (e.g. a number) to a $(B fully defined index).
+/
auto ref opIndexAssign(T)(auto ref T value, size_t[N] _indexes...) @trusted
auto ref opIndexAssign(T, Indexes...)(auto ref T value, Indexes indexes) @safe
if (Indexes.length == packs[0] && allSatisfy!(isIndex, Indexes))
{
return this.opIndexAssign!(T)(value, [indexes]);
}
/// ditto
auto ref opIndexAssign(T)(auto ref T value, size_t[packs[0]] _indexes) @trusted
{
// check assign safety
static auto ref fun(ref DeepElemType t, ref T v) @safe
Expand Down Expand Up @@ -2088,7 +2103,13 @@ struct Slice(SliceKind kind, size_t[] packs, Iterator)
/++
Op Assignment `op=` of a value (e.g. a number) to a $(B fully defined index).
+/
auto ref opIndexOpAssign(string op, T)(auto ref T value, size_t[N] _indexes...) @trusted
auto ref opIndexOpAssign(string op, T, Indexes...)(auto ref T value, Indexes indexes) @safe
if (Indexes.length == packs[0] && allSatisfy!(isIndex, Indexes))
{
return this.opIndexOpAssign!(op, T)(value, [indexes]);
}
/// ditto
auto ref opIndexOpAssign(string op, T)(auto ref T value, size_t[N] _indexes) @trusted
{
// check op safety
static auto ref fun(ref DeepElemType t, ref T v) @safe
Expand Down Expand Up @@ -2319,7 +2340,13 @@ struct Slice(SliceKind kind, size_t[] packs, Iterator)
/++
Increment `++` and Decrement `--` operators for a $(B fully defined index).
+/
auto ref opIndexUnary(string op)(size_t[N] _indexes...)
auto ref opIndexOpAssign(string op, Indexes...)(Indexes indexes) @safe
if (Indexes.length == packs[0] && allSatisfy!(isIndex, Indexes))
{
return this.opIndexUnary!(op)([indexes]);
}
/// ditto
auto ref opIndexUnary(string op)(size_t[packs[0]] _indexes...)
@trusted
// @@@workaround@@@ for Issue 16473
//if (op == `++` || op == `--`)
Expand Down