Skip to content

Fix #58 - typeIndex gives inconsistent results for differently-qualified versions of same object #59

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
pbackus merged 2 commits into from
Mar 19, 2021
Merged

Fix #58 - typeIndex gives inconsistent results for differently-qualified versions of same object #59

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff0fd28
Refactor tests to allow non-unique typeIndex
pbackus Mar 19, 2021
a550c57
Have typeIndex return the tag
pbackus Mar 19, 2021
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
55 changes: 41 additions & 14 deletions src/sumtype.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,16 +672,9 @@ public:
* If the `SumType` is qualified, then its qualifiers are applied to
* [Types] before determining the index.
*/
size_t typeIndex(this This)()
size_t typeIndex() const
{
import std.traits: CopyTypeQualifiers;

alias Qualify(T) = CopyTypeQualifiers!(This, T);
alias QualifiedTypes = Map!(Qualify, Types);

return this.match!((ref value) =>
IndexOf!(typeof(value), QualifiedTypes)
);
return tag;
}
}

Expand Down Expand Up @@ -1320,8 +1313,17 @@ version (D_BetterC) {} else
@safe unittest {
alias MySum = SumType!(int, float);

assert(MySum(42).typeIndex == IndexOf!(int, MySum.Types));
assert(MySum(3.14).typeIndex == IndexOf!(float, MySum.Types));
static bool isIndexOf(Target, Types...)(size_t i)
{
switch (i) {
static foreach (tid, T; Types)
case tid: return is(T == Target);
default: return false;
}
}

assert(isIndexOf!(int, MySum.Types)(MySum(42).typeIndex));
assert(isIndexOf!(float, MySum.Types)(MySum(3.14).typeIndex));
}

// Type index for qualified SumTypes
Expand All @@ -1330,12 +1332,37 @@ version (D_BetterC) {} else
@safe unittest {
alias MySum = SumType!(const(int[]), int[]);

static bool isIndexOf(Target, Types...)(size_t i)
{
switch (i) {
static foreach (tid, T; Types)
case tid: return is(T == Target);
default: return false;
}
}

int[] ma = [1, 2, 3];
// Construct as mutable and convert to const to get mismatched type + tag
const x = MySum(ma);
auto x = MySum(ma);
const y = MySum(ma);
auto z = const(MySum)(ma);

assert(isIndexOf!(int[], MySum.Types)(x.typeIndex));
assert(isIndexOf!(const(int[]), Map!(ConstOf, MySum.Types))(y.typeIndex));
assert(isIndexOf!(const(int[]), Map!(ConstOf, MySum.Types))(z.typeIndex));
}

// Type index for differently-qualified versions of the same SumType
// Disabled in BetterC due to use of dynamic arrays
version (D_BetterC) {} else
@safe unittest {
alias MySum = SumType!(const(int[]), int[]);

int[] ma = [1, 2, 3];
auto x = MySum(ma);
const y = x;

assert(MySum(ma).typeIndex == IndexOf!(int[], MySum.Types));
assert(x.typeIndex == IndexOf!(const(int[]), Map!(ConstOf, MySum.Types)));
assert(x.typeIndex == y.typeIndex);
}

/// True if `T` is an instance of the `SumType` template, otherwise false.
Expand Down