Skip to content
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

Jump to bottom

Fix predicate template implementations in std.traits and std.range #842

Merged
merged 3 commits into from Feb 15, 2014
Merged

Fix predicate template implementations in std.traits and std.range #842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f822e7a
Remove package function `defaultInit`
9rnsr Jan 25, 2014
6f43a92
Fix predicate template implementations in std.traits and std.range
9rnsr Oct 6, 2012
768907a
Add a test case isAssignable!(void[1], void[1])
9rnsr Oct 6, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 17 additions & 19 deletions std/range.d
View file
Open in desktop
Expand Up @@ -522,7 +522,7 @@ template isInputRange(R)
enum bool isInputRange = is(typeof(
(inout int = 0)
{
R r = void; // can define a range object
R r = R.init; // can define a range object
if (r.empty) {} // can test for empty
r.popFront(); // can invoke popFront()
auto h = r.front; // can get the front of the range
Expand Down Expand Up @@ -1050,8 +1050,8 @@ template isOutputRange(R, E)
enum bool isOutputRange = is(typeof(
(inout int = 0)
{
R r = void;
E e = void;
R r = R.init;
E e = E.init;
put(r, e);
}));
}
Expand Down Expand Up @@ -1124,7 +1124,7 @@ template isForwardRange(R)
enum bool isForwardRange = isInputRange!R && is(typeof(
(inout int = 0)
{
R r1 = void;
R r1 = R.init;
static assert (is(typeof(r1.save) == R));
}));
}
Expand Down Expand Up @@ -1164,7 +1164,7 @@ template isBidirectionalRange(R)
enum bool isBidirectionalRange = isForwardRange!R && is(typeof(
(inout int = 0)
{
R r = void;
R r = R.init;
r.popBack();
auto t = r.back;
auto w = r.front;
Expand Down Expand Up @@ -1247,7 +1247,7 @@ template isRandomAccessRange(R)
{
static assert(isBidirectionalRange!R ||
isForwardRange!R && isInfinite!R);
R r = void;
R r = R.init;
auto e = r[1];
static assert(is(typeof(e) == typeof(r.front)));
static assert(!isNarrowString!R);
Expand Down Expand Up @@ -1308,8 +1308,6 @@ unittest
{
@disable this();

@disable static @property R init();

@property bool empty() const { return false; }
@property int front() const { return 0; }
void popFront() {}
Expand Down Expand Up @@ -1344,19 +1342,19 @@ template hasMobileElements(R)
enum bool hasMobileElements = is(typeof(
(inout int = 0)
{
R r = void;
R r = R.init;
return moveFront(r);
}))
&& (!isBidirectionalRange!R || is(typeof(
(inout int = 0)
{
R r = void;
R r = R.init;
return moveBack(r);
})))
&& (!isRandomAccessRange!R || is(typeof(
(inout int = 0)
{
R r = void;
R r = R.init;
return moveAt(r, 0);
})));
}
Expand Down Expand Up @@ -1470,8 +1468,8 @@ $(D ElementType).
*/
template ElementEncodingType(R)
{
static if (isNarrowString!R)
alias ElementEncodingType = typeof(*lvalueOf!R.ptr);
static if (isNarrowString!R && is(R : E[], E))
alias ElementEncodingType = E;
else
alias ElementEncodingType = ElementType!R;
}
Expand Down Expand Up @@ -1541,7 +1539,7 @@ template hasSwappableElements(R)
enum bool hasSwappableElements = isForwardRange!R && is(typeof(
(inout int = 0)
{
R r = void;
R r = R.init;
swap(r.front, r.front); // can swap elements of the range
}));
}
Expand Down Expand Up @@ -1572,7 +1570,7 @@ template hasAssignableElements(R)
enum bool hasAssignableElements = isForwardRange!R && is(typeof(
(inout int = 0)
{
R r = void;
R r = R.init;
static assert(isForwardRange!(R)); // range is forward
auto e = r.front;
r.front = e; // can assign elements of the range
Expand All @@ -1598,7 +1596,7 @@ template hasLvalueElements(R)
(inout int = 0)
{
void checkRef(ref ElementType!R stuff) {}
R r = void;
R r = R.init;
static assert(is(typeof(checkRef(r.front))));
}));
}
Expand Down Expand Up @@ -1644,7 +1642,7 @@ template hasLength(R)
enum bool hasLength = !isNarrowString!R && is(typeof(
(inout int = 0)
{
R r = void;
R r = R.init;
static assert(is(typeof(r.length) : ulong));
}));
}
Expand Down Expand Up @@ -1746,7 +1744,7 @@ template hasSlicing(R)
enum bool hasSlicing = isForwardRange!R && !isNarrowString!R && is(typeof(
(inout int = 0)
{
R r = void;
R r = R.init;

static if(isInfinite!R)
typeof(take(r, 1)) s = r[1 .. 2];
Expand Down Expand Up @@ -4589,7 +4587,7 @@ unittest //10845
assert(equal(cycle(a).take(10), [0, 1, 2, 0, 1, 2, 0, 1, 2, 0]));
}

private alias lengthType(R) = typeof((inout int = 0){ R r = void; return r.length; }());
private alias lengthType(R) = typeof(R.init.length.init);

/**
Iterate several ranges in lockstep. The element type is a proxy tuple
Expand Down
11 changes: 2 additions & 9 deletions std/traits.d
View file
Open in desktop
Expand Up @@ -236,15 +236,6 @@ private
}
package
{
/* Get an expression typed as T, like T.init */
template defaultInit(T)
{
static if (!is(typeof({ T v = void; }))) // inout(U)
@property T defaultInit(T v = T.init);
else
@property T defaultInit();
}

// Add specific qualifier to the given type T
template MutableOf(T) { alias MutableOf = T ; }
template InoutOf(T) { alias InoutOf = inout(T) ; }
Expand Down Expand Up @@ -4076,6 +4067,8 @@ unittest
static assert( isAssignable!(int, shared int));
static assert( isAssignable!(shared int));

static assert( isAssignable!(void[1], void[1]));

struct S { @disable this(); this(int n){} }
static assert( isAssignable!(S, S));

Expand Down