debian-packages/dyaml
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed new ranges not being random-access ranges.

Browse source 
Forgot to add 'length' property.
This commit is contained in:
Michail Pevnev 2017-08-01 14:37:28 +03:00
parent 2b6c417006
commit c123e6afee
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/dyaml/node.d
View file

@ -1067,9 +1067,9 @@ struct Node
} }
/* Input range functionality. */ /* Input range functionality. */
bool empty() { return position >= subnodes.length; } bool empty() @property { return position >= subnodes.length; }
void popFront() { position++; } void popFront() { position++; }
T front() T front() @property
{ {
static if (is(Unqual!T == Node)) static if (is(Unqual!T == Node))
return subnodes[position]; return subnodes[position];
@ -1091,6 +1091,7 @@ struct Node
} }
/* Random-access range functionality. */ /* Random-access range functionality. */
size_t length() const @property { return subnodes.length; }
T opIndex(size_t index) T opIndex(size_t index)
{ {
static if (is(Unqual!T == Node)) static if (is(Unqual!T == Node))
@ -1098,6 +1099,11 @@ struct Node
else else
return subnodes[index].as!T; return subnodes[index].as!T;
} }
static assert(isInputRange!Range);
static assert(isForwardRange!Range);
static assert(isBidirectionalRange!Range);
static assert(isRandomAccessRange!Range);
} }
return Range(get!(Node[])); return Range(get!(Node[]));
} }
@ -1149,7 +1155,13 @@ struct Node
Pair back() { return pairs[$ - 1]; } Pair back() { return pairs[$ - 1]; }
/* Random-access range functionality. */ /* Random-access range functionality. */
size_t length() const @property { return pairs.length; }
Pair opIndex(size_t index) { return pairs[index]; } Pair opIndex(size_t index) { return pairs[index]; }
static assert(isInputRange!Range);
static assert(isForwardRange!Range);
static assert(isBidirectionalRange!Range);
static assert(isRandomAccessRange!Range);
} }
return Range(get!(Node.Pair[])); return Range(get!(Node.Pair[]));
} }