summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--source/tanya/container/list.d2
-rw-r--r--source/tanya/container/queue.d192
-rw-r--r--source/tanya/container/vector.d12
3 files changed, 141 insertions, 65 deletions
diff --git a/source/tanya/container/list.d b/source/tanya/container/list.d
index 33aae96..3e83ee4 100644
--- a/source/tanya/container/list.d
+++ b/source/tanya/container/list.d
@@ -111,7 +111,7 @@ class SList(T)
/**
* Returns: $(D_KEYWORD true) if the list is empty.
*/
- @property bool empty() const
+ @property bool empty() inout const
{
return first.next is null;
}
diff --git a/source/tanya/container/queue.d b/source/tanya/container/queue.d
index 9695899..ef09da2 100644
--- a/source/tanya/container/queue.d
+++ b/source/tanya/container/queue.d
@@ -6,7 +6,7 @@
* Copyright: Eugene Wissner 2016.
* License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
* Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
+ * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
*/
module tanya.container.queue;
@@ -37,19 +37,38 @@ class Queue(T)
*/
~this()
{
- foreach (e; this)
+ clear();
+ }
+
+ /**
+ * Removes all elements from the queue.
+ */
+ void clear()
+ {
+ while (!empty)
{
- static if (isFinalizable!T)
- {
- dispose(allocator, e);
- }
+ popFront();
}
}
+ ///
+ unittest
+ {
+ auto q = theAllocator.make!(Queue!int);
+
+ assert(q.empty);
+ q.insertBack(8);
+ q.insertBack(9);
+ q.clear();
+ assert(q.empty);
+
+ theAllocator.dispose(q);
+ }
+
/**
* Returns: First element.
*/
- @property ref T front()
+ @property ref inout(T) front() inout
in
{
assert(!empty);
@@ -64,10 +83,8 @@ class Queue(T)
*
* Params:
* x = New element.
- *
- * Returns: $(D_KEYWORD this).
*/
- typeof(this) insertBack(T x)
+ void insertBack(T x)
{
Entry* temp = make!Entry(allocator);
@@ -82,108 +99,145 @@ class Queue(T)
rear.next = temp;
rear = rear.next;
}
-
- return this;
}
+ /// Ditto.
alias insert = insertBack;
///
unittest
{
auto q = make!(Queue!int)(theAllocator);
- int[2] values = [8, 9];
- q.insertBack(values[0]);
- assert(q.front is values[0]);
- q.insertBack(values[1]);
- assert(q.front is values[0]);
+ assert(q.empty);
+ q.insertBack(8);
+ assert(q.front == 8);
+ q.insertBack(9);
+ assert(q.front == 8);
dispose(theAllocator, q);
}
/**
- * Inserts a new element.
- *
- * Params:
- * x = New element.
- *
- * Returns: $(D_KEYWORD this).
+ * Returns: $(D_KEYWORD true) if the queue is empty.
*/
- typeof(this) opOpAssign(string Op)(ref T x)
- if (Op == "~")
+ @property bool empty() inout const
{
- return insertBack(x);
+ return first.next is null;
}
///
unittest
{
auto q = make!(Queue!int)(theAllocator);
- int value = 5;
+ int value = 7;
assert(q.empty);
-
- q ~= value;
-
- assert(q.front == value);
+ q.insertBack(value);
assert(!q.empty);
dispose(theAllocator, q);
}
/**
- * Returns: $(D_KEYWORD true) if the queue is empty.
+ * Move the position to the next element.
*/
- @property bool empty() const @safe pure nothrow
+ void popFront()
+ in
{
- return first.next is null;
+ assert(!empty);
+ }
+ body
+ {
+ auto n = first.next.next;
+
+ dispose(allocator, first.next);
+ first.next = n;
}
///
unittest
{
auto q = make!(Queue!int)(theAllocator);
- int value = 7;
- assert(q.empty);
- q.insertBack(value);
- assert(!q.empty);
+ q.insertBack(8);
+ q.insertBack(9);
+ assert(q.front == 8);
+ q.popFront();
+ assert(q.front == 9);
dispose(theAllocator, q);
}
/**
- * Move position to the next element.
+ * $(D_KEYWORD foreach) iteration.
*
- * Returns: $(D_KEYWORD this).
+ * Params:
+ * dg = $(D_KEYWORD foreach) body.
*/
- typeof(this) popFront()
- in
+ int opApply(scope int delegate(ref size_t i, ref T) dg)
{
- assert(!empty);
+ int result;
+
+ for (size_t i = 0; !empty; ++i)
+ {
+ if ((result = dg(i, front)) != 0)
+ {
+ return result;
+ }
+ popFront();
+ }
+ return result;
}
- body
- {
- auto n = first.next.next;
- dispose(allocator, first.next);
- first.next = n;
+ /// Ditto.
+ int opApply(scope int delegate(ref T) dg)
+ {
+ int result;
- return this;
+ while (!empty)
+ {
+ if ((result = dg(front)) != 0)
+ {
+ return result;
+ }
+ popFront();
+ }
+ return result;
}
///
unittest
{
- auto q = make!(Queue!int)(theAllocator);
- int[2] values = [8, 9];
+ auto q = theAllocator.make!(Queue!int);
- q.insertBack(values[0]);
- q.insertBack(values[1]);
- assert(q.front is values[0]);
- q.popFront();
- assert(q.front is values[1]);
+ size_t j;
+ q.insertBack(5);
+ q.insertBack(4);
+ q.insertBack(9);
+ foreach (i, e; q)
+ {
+ assert(i != 2 || e == 9);
+ assert(i != 1 || e == 4);
+ assert(i != 0 || e == 5);
+ ++j;
+ }
+ assert(j == 3);
+ assert(q.empty);
+
+ j = 0;
+ q.insertBack(5);
+ q.insertBack(4);
+ q.insertBack(9);
+ foreach (e; q)
+ {
+ assert(j != 2 || e == 9);
+ assert(j != 1 || e == 4);
+ assert(j != 0 || e == 5);
+ ++j;
+ }
+ assert(j == 3);
+ assert(q.empty);
dispose(theAllocator, q);
}
@@ -206,13 +260,33 @@ class Queue(T)
/// The last element of the list.
protected Entry* rear;
- private IAllocator allocator;
+ /// The allocator.
+ protected IAllocator allocator;
}
///
unittest
{
- auto q = make!(Queue!int)(theAllocator);
+ auto q = theAllocator.make!(Queue!int);
+
+ q.insertBack(5);
+ assert(!q.empty);
+
+ q.insertBack(4);
+ assert(q.front == 5);
+
+ q.insertBack(9);
+ assert(q.front == 5);
+
+ q.popFront();
+ assert(q.front == 4);
+
+ foreach (i, ref e; q)
+ {
+ assert(i != 0 || e == 4);
+ assert(i != 1 || e == 9);
+ }
+ assert(q.empty);
- dispose(theAllocator, q);
+ theAllocator.dispose(q);
}
diff --git a/source/tanya/container/vector.d b/source/tanya/container/vector.d
index eb7c28e..90793ad 100644
--- a/source/tanya/container/vector.d
+++ b/source/tanya/container/vector.d
@@ -55,12 +55,12 @@ class Vector(T)
return this;
}
- @property bool empty() const
+ @property bool empty() inout const
{
return start >= end;
}
- @property size_t length() const
+ @property size_t length() inout const
{
return end - start;
}
@@ -261,13 +261,13 @@ class Vector(T)
/**
* Returns: Vector length.
*/
- @property size_t length() const
+ @property size_t length() inout const
{
return vector.length;
}
/// Ditto.
- size_t opDollar() const
+ size_t opDollar() inout const
{
return length;
}
@@ -301,7 +301,7 @@ class Vector(T)
/**
* Returns: $(D_KEYWORD true) if the vector is empty.
*/
- @property bool empty() const
+ @property bool empty() inout const
{
return vector.length == 0;
}
@@ -776,4 +776,6 @@ unittest
assert(v.front == 5);
assert(v[1] == 15);
assert(v.back == 8);
+
+ theAllocator.dispose(v);
}
generated by cgit v1.2.3 (git 2.26.2) at 2026-06-26 20:22:34 +0000