Update latest supported compiler

Implement DuplexTransport and SocketTransport separately.

.gitignore

@@ -5,6 +5,7 @@
 .dub
 __test__*__
 __test__*__.core
+/tanya-test-library
 
 /docs/
 /docs.json

.travis.yml

@@ -2,12 +2,15 @@ sudo: false
 
 os:
  - linux
+ - osx
 
 language: d
 
 d:
+ - dmd-2.073.2
  - dmd-2.072.2
  - dmd-2.071.2
+ - dmd-2.070.2
 
 env: 
  matrix:

README.md

@@ -13,48 +13,45 @@ Garbage Collector heap. Everything in the library is usable in @nogc code.
 Tanya extends Phobos functionality and provides alternative implementations for
 data structures and utilities that depend on the Garbage Collector in Phobos.
 
+* [Bug tracker](https://issues.caraus.io/projects/tanya)
+* [Documentation](https://docs.caraus.io/tanya)
+
 ## Overview
 
 Tanya consists of the following packages:
 
 * `async`: Event loop (epoll, kqueue and IOCP).
 * `container`: Queue, Vector, Singly linked list, buffers.
-* `crypto`: Work in progress TLS implementation.
+* `math`: Arbitrary precision integer and a set of functions.
-* `math`: Multiple precision integer and a set of functions.
 * `memory`: Tools for manual memory management (allocator, reference counting,
 helper functions).
 * `network`: URL-Parsing, sockets.
 
 ### Supported compilers
 
+* dmd 2.073.2
 * dmd 2.072.2
 * dmd 2.071.2
+* dmd 2.070.2
 
 ### Current status
 
-The library is currently under development, but some parts of it can already be
+The library is currently under development, but the API is becoming gradually
-used.
+stable.
 
-`network` and `async` exist for quite some time and could be better tested than
+`container`s are being extended to support ranges. Also following modules are
-other components.
+coming soon:
+* UTF-8 string.
+* Hash table.
 
-Containers were newly reworked and the API won't change significantly, but will
+`math` package contains an arbitrary precision integer implementation that
-be only extended. The same is true for the `memory` package.
+needs more test cases, better performance and some additional features
-
+(constructing from a string and an ubyte array, and converting it back).
-`math` package contains an arbitrary precision integer implementation that has
-a stable API (that mostly consists of operator overloads), but still needs
-testing and work on its performance.
-
-I'm currently mostly working on `crypto` that is not a complete cryptographic
-suite, but contains (will contain) algorithm implementations required by TLS.
 
 ### Further characteristics
 
 * Tanya is a native D library.
 
-* Documentation and usage examples can be found in the source code.
-Online documentation will be published soon.
-
 * Tanya is cross-platform. The development happens on a 64-bit Linux, but it
 is being tested on Windows and FreeBSD as well.
 

dub.json

@@ -1,6 +1,6 @@
 {
 	"name": "tanya",
-	"description": "D library with event loop",
+	"description": "General purpose, @nogc library",
 	"license": "MPL-2.0",
 	"copyright": "(c) Eugene Wissner <info@caraus.de>",
 	"authors": [

source/tanya/async/event/epoll.d

@@ -3,10 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  */
 module tanya.async.event.epoll;
 
@@ -18,6 +18,7 @@ import tanya.async.event.selector;
 import tanya.async.loop;
 import tanya.async.transport;
 import tanya.async.watcher;
+import tanya.container.vector;
 import tanya.memory;
 import tanya.memory.mmappool;
 import tanya.network.socket;
@@ -33,10 +34,10 @@ extern (C) nothrow @nogc
 	int epoll_wait (int epfd, epoll_event *events, int maxevents, int timeout);
 }
 
-class EpollLoop : SelectorLoop
+final class EpollLoop : SelectorLoop
 {
 	protected int fd;
-	private epoll_event[] events;
+	private Vector!epoll_event events;
 
 	/**
 	 * Initializes the loop.
@@ -45,18 +46,17 @@ class EpollLoop : SelectorLoop
 	{
 		if ((fd = epoll_create1(EPOLL_CLOEXEC)) < 0)
 		{
-			throw MmapPool.instance.make!BadLoopException("epoll initialization failed");
+			throw defaultAllocator.make!BadLoopException("epoll initialization failed");
 		}
 		super();
-		MmapPool.instance.resizeArray(events, maxEvents);
+		events = Vector!epoll_event(maxEvents, MmapPool.instance);
 	}
 
 	/**
-	 * Free loop internals.
+	 * Frees loop internals.
 	 */
 	~this() @nogc
 	{
-		MmapPool.instance.dispose(events);
 		close(fd);
 	}
 
@@ -70,14 +70,9 @@ class EpollLoop : SelectorLoop
 	 *
 	 * Returns: $(D_KEYWORD true) if the operation was successful.
 	 */
-	protected override bool reify(ConnectionWatcher watcher,
+	protected override bool reify(SocketWatcher watcher,
 	                              EventMask oldEvents,
 	                              EventMask events) @nogc
-	in
-	{
-		assert(watcher !is null);
-	}
-	body
 	{
 		int op = EPOLL_CTL_DEL;
 		epoll_event ev;
@@ -97,8 +92,8 @@ class EpollLoop : SelectorLoop
 
 		ev.data.fd = watcher.socket.handle;
 		ev.events = (events & (Event.read | Event.accept) ? EPOLLIN | EPOLLPRI : 0)
-				  | (events & Event.write ? EPOLLOUT : 0)
+		          | (events & Event.write ? EPOLLOUT : 0)
-				  | EPOLLET;
+		          | EPOLLET;
 
 		return epoll_ctl(fd, op, watcher.socket.handle, &ev) == 0;
 	}
@@ -110,7 +105,7 @@ class EpollLoop : SelectorLoop
 	{
 		// Don't block
 		immutable timeout = cast(immutable int) blockTime.total!"msecs";
-		auto eventCount = epoll_wait(fd, events.ptr, maxEvents, timeout);
+		auto eventCount = epoll_wait(fd, events.get().ptr, maxEvents, timeout);
 
 		if (eventCount < 0)
 		{
@@ -123,29 +118,30 @@ class EpollLoop : SelectorLoop
 
 		for (auto i = 0; i < eventCount; ++i)
 		{
-			auto io = cast(IOWatcher) connections[events[i].data.fd];
+			auto transport = cast(StreamTransport) connections[events[i].data.fd];
 
-			if (io is null)
+			if (transport is null)
 			{
-				acceptConnections(connections[events[i].data.fd]);
+				auto connection = cast(ConnectionWatcher) connections[events[i].data.fd];
+				assert(connection !is null);
+
+				acceptConnections(connection);
 			}
 			else if (events[i].events & EPOLLERR)
 			{
-				kill(io, null);
+				kill(transport);
+				continue;
 			}
 			else if (events[i].events & (EPOLLIN | EPOLLPRI | EPOLLHUP))
 			{
-				auto transport = cast(SelectorStreamTransport) io.transport;
-				assert(transport !is null);
-
 				SocketException exception;
 				try
 				{
 					ptrdiff_t received;
 					do
 					{
-						received = transport.socket.receive(io.output[]);
+						received = transport.socket.receive(transport.output[]);
-						io.output += received;
+						transport.output += received;
 					}
 					while (received);
 				}
@@ -155,18 +151,16 @@ class EpollLoop : SelectorLoop
 				}
 				if (transport.socket.disconnected)
 				{
-					kill(io, exception);
+					kill(transport, exception);
+					continue;
 				}
-				else if (io.output.length)
+				else if (transport.output.length)
 				{
-					swapPendings.enqueue(io);
+					pendings.enqueue(transport);
 				}
 			}
-			else if (events[i].events & EPOLLOUT)
+			if (events[i].events & EPOLLOUT)
 			{
-				auto transport = cast(SelectorStreamTransport) io.transport;
-				assert(transport !is null);
-
 				transport.writeReady = true;
 				if (transport.input.length)
 				{

source/tanya/async/event/iocp.d

@@ -3,10 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  */
 module tanya.async.event.iocp;
 
@@ -26,32 +26,68 @@ import core.sys.windows.winbase;
 import core.sys.windows.windef;
 import core.sys.windows.winsock2;
 
-class IOCPStreamTransport : StreamTransport
+/**
+ * Transport for stream sockets.
+ */
+final class StreamTransport : SocketWatcher, DuplexTransport, SocketTransport
 {
-	private OverlappedConnectedSocket socket_;
+	private SocketException exception;
+
+	private ReadBuffer!ubyte output;
 
 	private WriteBuffer!ubyte input;
 
+	private Protocol protocol_;
+
+	private bool closing;
+
 	/**
 	 * Creates new completion port transport.
+	 *
 	 * Params:
 	 * 	socket = Socket.
+	 *
+	 * Precondition: $(D_INLINECODE socket !is null)
 	 */
 	this(OverlappedConnectedSocket socket) @nogc
-	in
+	{
+		super(socket);
+		output = ReadBuffer!ubyte(8192, 1024, MmapPool.instance);
+		input = WriteBuffer!ubyte(8192, MmapPool.instance);
+		active = true;
+	}
+
+	/**
+	 * Returns: Socket.
+	 *
+	 * Postcondition: $(D_INLINECODE socket !is null)
+	 */
+	override @property OverlappedConnectedSocket socket() pure nothrow @safe @nogc
+	out (socket)
 	{
 		assert(socket !is null);
 	}
 	body
 	{
-		socket_ = socket;
+		return cast(OverlappedConnectedSocket) socket_;
-		input = WriteBuffer!ubyte(8192, MmapPool.instance);
 	}
 
-	@property inout(OverlappedConnectedSocket) socket()
+	/**
-	inout pure nothrow @safe @nogc
+	 * Returns $(D_PARAM true) if the transport is closing or closed.
+	 */
+	bool isClosing() const pure nothrow @safe @nogc
 	{
-		return socket_;
+		return closing;
+	}
+
+	/**
+	 * Close the transport.
+	 *
+	 * Buffered data will be flushed.  No more data will be received.
+	 */
+	void close() pure nothrow @safe @nogc
+	{
+		closing = true;
 	}
 
 	/**
@@ -62,26 +98,74 @@ class IOCPStreamTransport : StreamTransport
 	 */
 	void write(ubyte[] data) @nogc
 	{
-		immutable empty = input.length == 0;
 		input ~= data;
-		if (empty)
+	}
+
+	/**
+	 * Returns: Application protocol.
+	 */
+	@property Protocol protocol() pure nothrow @safe @nogc
+	{
+		return protocol_;
+	}
+
+	/**
+	 * Switches the protocol.
+	 *
+	 * The protocol is deallocated by the event loop, it should currently be
+	 * allocated with $(D_PSYMBOL MmapPool).
+	 *
+	 * Params:
+	 * 	protocol = Application protocol.
+	 *
+	 * Precondition: $(D_INLINECODE protocol !is null)
+	 */
+	@property void protocol(Protocol protocol) pure nothrow @safe @nogc
+	in
+	{
+		assert(protocol !is null);
+	}
+	body
+	{
+		protocol_ = protocol;
+	}
+
+	/**
+	 * Invokes the watcher callback.
+	 */
+	override void invoke() @nogc
+	{
+		if (output.length)
 		{
-			SocketState overlapped;
+			immutable empty = input.length == 0;
-			try
+			protocol.received(output[0 .. $]);
+			output.clear();
+			if (empty)
 			{
-				overlapped = MmapPool.instance.make!SocketState;
+				SocketState overlapped;
-				socket.beginSend(input[], overlapped);
+				try
-			}
+				{
-			catch (SocketException e)
+					overlapped = MmapPool.instance.make!SocketState;
-			{
+					socket.beginSend(input[], overlapped);
-				MmapPool.instance.dispose(overlapped);
+				}
-				MmapPool.instance.dispose(e);
+				catch (SocketException e)
+				{
+					MmapPool.instance.dispose(overlapped);
+					MmapPool.instance.dispose(e);
+				}
 			}
 		}
+		else
+		{
+			protocol.disconnected(exception);
+			MmapPool.instance.dispose(protocol_);
+			defaultAllocator.dispose(exception);
+			active = false;
+		}
 	}
 }
 
-class IOCPLoop : Loop
+final class IOCPLoop : Loop
 {
 	protected HANDLE completionPort;
 
@@ -112,7 +196,7 @@ class IOCPLoop : Loop
 	 *
 	 * Returns: $(D_KEYWORD true) if the operation was successful.
 	 */
-	override protected bool reify(ConnectionWatcher watcher,
+	override protected bool reify(SocketWatcher watcher,
 								  EventMask oldEvents,
 								  EventMask events) @nogc
 	{
@@ -145,10 +229,7 @@ class IOCPLoop : Loop
 		if (!(oldEvents & Event.read) && (events & Event.read)
 			|| !(oldEvents & Event.write) && (events & Event.write))
 		{
-			auto io = cast(IOWatcher) watcher;
+			auto transport = cast(StreamTransport) watcher;
-			assert(io !is null);
-
-			auto transport = cast(IOCPStreamTransport) io.transport;
 			assert(transport !is null);
 
 			if (CreateIoCompletionPort(cast(HANDLE) transport.socket.handle,
@@ -165,7 +246,7 @@ class IOCPLoop : Loop
 				try
 				{
 					overlapped = MmapPool.instance.make!SocketState;
-					transport.socket.beginReceive(io.output[], overlapped);
+					transport.socket.beginReceive(transport.output[], overlapped);
 				}
 				catch (SocketException e)
 				{
@@ -178,6 +259,20 @@ class IOCPLoop : Loop
 		return true;
 	}
 
+	private void kill(StreamTransport transport,
+	                  SocketException exception = null) @nogc
+	in
+	{
+		assert(transport !is null);
+	}
+	body
+	{
+		transport.socket.shutdown();
+		defaultAllocator.dispose(transport.socket);
+		transport.exception = exception;
+		pendings.enqueue(transport);
+	}
+
 	/**
 	 * Does the actual polling.
 	 */
@@ -215,29 +310,26 @@ class IOCPLoop : Loop
 				assert(listener !is null);
 
 				auto socket = listener.endAccept(overlapped);
-				auto transport = MmapPool.instance.make!IOCPStreamTransport(socket);
+				auto transport = MmapPool.instance.make!StreamTransport(socket);
-				auto io = MmapPool.instance.make!IOWatcher(transport, connection.protocol);
 
-				connection.incoming.enqueue(io);
+				connection.incoming.enqueue(transport);
 
-				reify(io, EventMask(Event.none), EventMask(Event.read, Event.write));
+				reify(transport, EventMask(Event.none), EventMask(Event.read, Event.write));
 
-				swapPendings.enqueue(connection);
+				pendings.enqueue(connection);
 				listener.beginAccept(overlapped);
 				break;
 			case OverlappedSocketEvent.read:
-				auto io = cast(IOWatcher) (cast(void*) key);
+				auto transport = cast(StreamTransport) (cast(void*) key);
-				assert(io !is null);
+				assert(transport !is null);
-				if (!io.active)
+
+				if (!transport.active)
 				{
-					MmapPool.instance.dispose(io);
+					MmapPool.instance.dispose(transport);
 					MmapPool.instance.dispose(overlapped);
 					return;
 				}
 
-				auto transport = cast(IOCPStreamTransport) io.transport;
-				assert(transport !is null);
-
 				int received;
 				SocketException exception;
 				try
@@ -250,42 +342,43 @@ class IOCPLoop : Loop
 				}
 				if (transport.socket.disconnected)
 				{
-					// We want to get one last notification to destroy the watcher
+					// We want to get one last notification to destroy the watcher.
-					transport.socket.beginReceive(io.output[], overlapped);
+					transport.socket.beginReceive(transport.output[], overlapped);
-					kill(io, exception);
+					kill(transport, exception);
 				}
 				else if (received > 0)
 				{
-					immutable full = io.output.free == received;
+					immutable full = transport.output.free == received;
 
-					io.output += received;
+					transport.output += received;
-					// Receive was interrupted because the buffer is full. We have to continue
+					// Receive was interrupted because the buffer is full. We have to continue.
 					if (full)
 					{
-						transport.socket.beginReceive(io.output[], overlapped);
+						transport.socket.beginReceive(transport.output[], overlapped);
 					}
-					swapPendings.enqueue(io);
+					pendings.enqueue(transport);
 				}
 				break;
 			case OverlappedSocketEvent.write:
-				auto io = cast(IOWatcher) (cast(void*) key);
+				auto transport = cast(StreamTransport) (cast(void*) key);
-				assert(io !is null);
-
-				auto transport = cast(IOCPStreamTransport) io.transport;
 				assert(transport !is null);
 
 				transport.input += transport.socket.endSend(overlapped);
-				if (transport.input.length)
+				if (transport.input.length > 0)
 				{
 					transport.socket.beginSend(transport.input[], overlapped);
 				}
 				else
 				{
-					transport.socket.beginReceive(io.output[], overlapped);
+					transport.socket.beginReceive(transport.output[], overlapped);
+					if (transport.isClosing())
+					{
+						kill(transport);
+					}
 				}
 				break;
 			default:
 				assert(false, "Unknown event");
 		}
 	}
-}
+}

source/tanya/async/event/kqueue.d

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * 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)
@@ -41,8 +41,19 @@ else version (DragonFlyBSD)
 
 version (MacBSD):
 
-import core.stdc.stdint;    // intptr_t, uintptr_t
+import core.stdc.errno;
 import core.sys.posix.time; // timespec
+import core.sys.posix.unistd;
+import core.time;
+import std.algorithm.comparison;
+import tanya.async.event.selector;
+import tanya.async.loop;
+import tanya.async.transport;
+import tanya.async.watcher;
+import tanya.container.vector;
+import tanya.memory;
+import tanya.memory.mmappool;
+import tanya.network.socket;
 
 void EV_SET(kevent_t* kevp, typeof(kevent_t.tupleof) args) pure nothrow @nogc
 {
@@ -102,32 +113,19 @@ extern(C) int kevent(int kq, const kevent_t *changelist, int nchanges,
                      kevent_t *eventlist, int nevents, const timespec *timeout)
                      nothrow @nogc;
 
-import tanya.async.event.selector;
+final class KqueueLoop : SelectorLoop
-import tanya.async.loop;
-import tanya.async.transport;
-import tanya.async.watcher;
-import tanya.memory;
-import tanya.memory.mmappool;
-import tanya.network.socket;
-import core.stdc.errno;
-import core.sys.posix.unistd;
-import core.sys.posix.sys.time;
-import core.time;
-import std.algorithm.comparison;
-
-class KqueueLoop : SelectorLoop
 {
 	protected int fd;
-	private kevent_t[] events;
+	private Vector!kevent_t events;
-	private kevent_t[] changes;
+	private Vector!kevent_t changes;
 	private size_t changeCount;
 
 	/**
 	 * Returns: Maximal event count can be got at a time
 	 *          (should be supported by the backend).
 	 */
-	override protected @property inout(uint) maxEvents()
+	override protected @property uint maxEvents()
-	inout const pure nothrow @safe @nogc
+	const pure nothrow @safe @nogc
 	{
 		return cast(uint) events.length;
 	}
@@ -138,19 +136,18 @@ class KqueueLoop : SelectorLoop
 
 		if ((fd = kqueue()) == -1)
 		{
-			throw MmapPool.instance.make!BadLoopException("epoll initialization failed");
+			throw make!BadLoopException(defaultAllocator,
+			                            "kqueue initialization failed");
 		}
-		MmapPool.instance.resizeArray(events, 64);
+		events = Vector!kevent_t(64, MmapPool.instance);
-		MmapPool.instance.resizeArray(changes, 64);
+		changes = Vector!kevent_t(64, MmapPool.instance);
 	}
 
 	/**
-	 * Free loop internals.
+	 * Frees loop internals.
 	 */
 	~this() @nogc
 	{
-		MmapPool.instance.dispose(events);
-		MmapPool.instance.dispose(changes);
 		close(fd);
 	}
 
@@ -158,15 +155,15 @@ class KqueueLoop : SelectorLoop
 	{
 		if (changes.length <= changeCount)
 		{
-			MmapPool.instance.resizeArray(changes, changeCount + maxEvents);
+			changes.length = changeCount + maxEvents;
 		}
 		EV_SET(&changes[changeCount],
-			   cast(ulong) socket,
+		       cast(ulong) socket,
-			   filter,
+		       filter,
-			   flags,
+		       flags,
-			   0U,
+		       0U,
-			   0L,
+		       0L,
-			   null);
+		       null);
 		++changeCount;
 	}
 
@@ -180,7 +177,7 @@ class KqueueLoop : SelectorLoop
 	 *
 	 * Returns: $(D_KEYWORD true) if the operation was successful.
 	 */
-	override protected bool reify(ConnectionWatcher watcher,
+	override protected bool reify(SocketWatcher watcher,
 	                              EventMask oldEvents,
 	                              EventMask events) @nogc
 	{
@@ -216,10 +213,15 @@ class KqueueLoop : SelectorLoop
 
 		if (changeCount > maxEvents) 
 		{
-			MmapPool.instance.resizeArray(events, changes.length);
+			events.length = changes.length;
 		}
 
-		auto eventCount = kevent(fd, changes.ptr, cast(int) changeCount, events.ptr, maxEvents, &ts);
+		auto eventCount = kevent(fd,
+		                         changes.get().ptr,
+		                         cast(int) changeCount,
+		                         events.get().ptr,
+		                         maxEvents,
+		                         &ts);
 		changeCount = 0;
 
 		if (eventCount < 0)
@@ -235,29 +237,29 @@ class KqueueLoop : SelectorLoop
 		{
 			assert(connections.length > events[i].ident);
 
-			IOWatcher io = cast(IOWatcher) connections[events[i].ident];
+			auto transport = cast(StreamTransport) connections[events[i].ident];
 			// If it is a ConnectionWatcher. Accept connections.
-			if (io is null)
+			if (transport is null)
 			{
-				acceptConnections(connections[events[i].ident]);
+				auto connection = cast(ConnectionWatcher) connections[events[i].ident];
+				assert(connection !is null);
+
+				acceptConnections(connection);
 			}
 			else if (events[i].flags & EV_ERROR)
 			{
-				kill(io, null);
+				kill(transport);
 			}
 			else if (events[i].filter == EVFILT_READ)
 			{
-				auto transport = cast(SelectorStreamTransport) io.transport;
-				assert(transport !is null);
-
 				SocketException exception;
 				try
 				{
 					ptrdiff_t received;
 					do
 					{
-						received = transport.socket.receive(io.output[]);
+						received = transport.socket.receive(transport.output[]);
-						io.output += received;
+						transport.output += received;
 					}
 					while (received);
 				}
@@ -267,18 +269,15 @@ class KqueueLoop : SelectorLoop
 				}
 				if (transport.socket.disconnected)
 				{
-					kill(io, exception);
+					kill(transport, exception);
 				}
-				else if (io.output.length)
+				else if (transport.output.length)
 				{
-					swapPendings.enqueue(io);
+					pendings.enqueue(transport);
 				}
 			}
 			else if (events[i].filter == EVFILT_WRITE)
 			{
-				auto transport = cast(SelectorStreamTransport) io.transport;
-				assert(transport !is null);
-
 				transport.writeReady = true;
 				if (transport.input.length)
 				{
@@ -307,9 +306,9 @@ class KqueueLoop : SelectorLoop
 	 *
 	 * Returns: $(D_KEYWORD true) if the operation could be successfully
 	 *          completed or scheduled, $(D_KEYWORD false) otherwise (the
-	 *          transport is be destroyed then).
+	 *          transport will be destroyed then).
 	 */
-	protected override bool feed(SelectorStreamTransport transport,
+	protected override bool feed(StreamTransport transport,
 	                             SocketException exception = null) @nogc
 	{
 		if (!super.feed(transport, exception))

source/tanya/async/event/selector.d

@@ -3,58 +3,160 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  */
 module tanya.async.event.selector;
 
 version (Posix):
 
 import tanya.async.loop;
+import tanya.async.protocol;
 import tanya.async.transport;
 import tanya.async.watcher;
 import tanya.container.buffer;
+import tanya.container.vector;
 import tanya.memory;
 import tanya.memory.mmappool;
 import tanya.network.socket;
-import core.sys.posix.netinet.in_;
-import core.stdc.errno;
 
 /**
  * Transport for stream sockets.
  */
-class SelectorStreamTransport : StreamTransport
+package class StreamTransport : SocketWatcher, DuplexTransport, SocketTransport
 {
-	private ConnectedSocket socket_;
+	private SelectorLoop loop;
+
+	private SocketException exception;
+
+	package ReadBuffer!ubyte output;
 
-	/// Input buffer.
 	package WriteBuffer!ubyte input;
 
-	private SelectorLoop loop;
+	private Protocol protocol_;
+
+	private bool closing;
 
 	/// Received notification that the underlying socket is write-ready.
 	package bool writeReady;
 
 	/**
 	 * Params:
-	 * 	loop     = Event loop.
+	 * 	loop   = Event loop.
-	 * 	socket   = Socket.
+	 * 	socket = Socket.
+	 *
+	 * Precondition: $(D_INLINECODE loop !is null && socket !is null)
 	 */
 	this(SelectorLoop loop, ConnectedSocket socket) @nogc
+	in 
 	{
-		socket_ = socket;
+		assert(loop !is null);
+	}
+	body
+	{
+		super(socket);
 		this.loop = loop;
+		output = ReadBuffer!ubyte(8192, 1024, MmapPool.instance);
 		input = WriteBuffer!ubyte(8192, MmapPool.instance);
+		active = true;
 	}
 
 	/**
-	 * Returns: Transport socket.
+	 * Returns: Socket.
+	 *
+	 * Postcondition: $(D_INLINECODE socket !is null)
 	 */
-	inout(ConnectedSocket) socket() inout pure nothrow @safe @nogc
+	override @property ConnectedSocket socket() pure nothrow @safe @nogc
+	out (socket)
 	{
-		return socket_;
+		assert(socket !is null);
+	}
+	body
+	{
+		return cast(ConnectedSocket) socket_;
+	}
+
+	private @property void socket(ConnectedSocket socket) pure nothrow @safe @nogc
+	in
+	{
+		assert(socket !is null);
+	}
+	body
+	{
+		socket_ = socket;
+	}
+
+	/**
+	 * Returns: Application protocol.
+	 */
+	@property Protocol protocol() pure nothrow @safe @nogc
+	{
+		return protocol_;
+	}
+
+	/**
+	 * Switches the protocol.
+	 *
+	 * The protocol is deallocated by the event loop, it should currently be
+	 * allocated with $(D_PSYMBOL MmapPool).
+	 *
+	 * Params:
+	 * 	protocol = Application protocol.
+	 *
+	 * Precondition: $(D_INLINECODE protocol !is null)
+	 */
+	@property void protocol(Protocol protocol) pure nothrow @safe @nogc
+	in
+	{
+		assert(protocol !is null);
+	}
+	body
+	{
+		protocol_ = protocol;
+	}
+
+	/**
+	 * Returns $(D_PARAM true) if the transport is closing or closed.
+	 */
+	bool isClosing() const pure nothrow @safe @nogc
+	{
+		return closing;
+	}
+
+	/**
+	 * Close the transport.
+	 *
+	 * Buffered data will be flushed.  No more data will be received.
+	 */
+	void close() @nogc
+	{
+		closing = true;
+		loop.reify(this, EventMask(Event.read, Event.write), EventMask(Event.write));
+	}
+
+	/**
+	 * Invokes the watcher callback.
+	 */
+	override void invoke() @nogc
+	{
+		if (output.length)
+		{
+			protocol.received(output[0 .. $]);
+			output.clear();
+			if (isClosing() && input.length == 0)
+			{
+				loop.kill(this);
+			}
+		}
+		else
+		{
+			protocol.disconnected(exception);
+			MmapPool.instance.dispose(protocol_);
+			defaultAllocator.dispose(exception);
+			active = false;
+		}
 	}
 
 	/**
@@ -103,28 +205,60 @@ class SelectorStreamTransport : StreamTransport
 abstract class SelectorLoop : Loop
 {
 	/// Pending connections.
-	protected ConnectionWatcher[] connections;
+	protected Vector!SocketWatcher connections;
 
 	this() @nogc
 	{
 		super();
-		MmapPool.instance.resizeArray(connections, maxEvents);
+		connections = Vector!SocketWatcher(maxEvents, MmapPool.instance);
 	}
 
 	~this() @nogc
 	{
 		foreach (ref connection; connections)
 		{
-			// We want to free only IOWatchers. ConnectionWatcher are created by the
+			// We want to free only the transports. ConnectionWatcher are created by the
 			// user and should be freed by himself.
-			auto io = cast(IOWatcher) connection;
+			if (cast(StreamTransport) connection !is null)
-			if (io !is null)
 			{
-				MmapPool.instance.dispose(io);
+				MmapPool.instance.dispose(connection);
-				connection = null;
 			}
 		}
-		MmapPool.instance.dispose(connections);
+	}
+
+	/**
+	 * Should be called if the backend configuration changes.
+	 *
+	 * Params:
+	 * 	watcher   = Watcher.
+	 * 	oldEvents = The events were already set.
+	 * 	events    = The events should be set.
+	 *
+	 * Returns: $(D_KEYWORD true) if the operation was successful.
+	 */
+	override abstract protected bool reify(SocketWatcher watcher,
+	                                       EventMask oldEvents,
+	                                       EventMask events) @nogc;
+
+	/**
+	 * Kills the watcher and closes the connection.
+	 *
+	 * Params:
+	 * 	transport = Transport.
+	 * 	exception = Occurred exception.
+	 */
+	protected void kill(StreamTransport transport,
+	                    SocketException exception = null) @nogc
+	in
+	{
+		assert(transport !is null);
+	}
+	body
+	{
+		transport.socket.shutdown();
+		defaultAllocator.dispose(transport.socket);
+		transport.exception = exception;
+		pendings.enqueue(transport);
 	}
 
 	/**
@@ -139,8 +273,13 @@ abstract class SelectorLoop : Loop
 	 *          completed or scheduled, $(D_KEYWORD false) otherwise (the
 	 *          transport will be destroyed then).
 	 */
-	protected bool feed(SelectorStreamTransport transport,
+	protected bool feed(StreamTransport transport,
 	                    SocketException exception = null) @nogc
+	in
+	{
+		assert(transport !is null);
+	}
+	body
 	{
 		while (transport.input.length && transport.writeReady)
 		{
@@ -164,12 +303,13 @@ abstract class SelectorLoop : Loop
 		}
 		if (exception !is null)
 		{
-			auto watcher = cast(IOWatcher) connections[transport.socket.handle];
+			kill(transport, exception);
-			assert(watcher !is null);
-
-			kill(watcher, exception);
 			return false;
 		}
+		if (transport.input.length == 0 && transport.isClosing())
+		{
+			kill(transport);
+		}
 		return true;
 	}
 
@@ -188,7 +328,7 @@ abstract class SelectorLoop : Loop
 
 		if (connections.length <= watcher.socket)
 		{
-			MmapPool.instance.resizeArray(connections, watcher.socket.handle + maxEvents / 2);
+			connections.length = watcher.socket.handle + maxEvents / 2;
 		}
 		connections[watcher.socket.handle] = watcher;
 
@@ -225,35 +365,33 @@ abstract class SelectorLoop : Loop
 				break;
 			}
 
-			IOWatcher io;
+			StreamTransport transport;
-			auto transport = MmapPool.instance.make!SelectorStreamTransport(this, client);
 
 			if (connections.length > client.handle)
 			{
-				io = cast(IOWatcher) connections[client.handle];
+				transport = cast(StreamTransport) connections[client.handle];
 			}
 			else
 			{
-				MmapPool.instance.resizeArray(connections, client.handle + maxEvents / 2);
+				connections.length = client.handle + maxEvents / 2;
 			}
-			if (io is null)
+			if (transport is null)
 			{
-				io = MmapPool.instance.make!IOWatcher(transport,
+				transport = MmapPool.instance.make!StreamTransport(this, client);
-				                                      connection.protocol);
+				connections[client.handle] = transport;
-				connections[client.handle] = io;
 			}
 			else
 			{
-				io(transport, connection.protocol);
+				transport.socket = client;
 			}
 
-			reify(io, EventMask(Event.none), EventMask(Event.read, Event.write));
+			reify(transport, EventMask(Event.none), EventMask(Event.read, Event.write));
-			connection.incoming.enqueue(io);
+			connection.incoming.enqueue(transport);
 		}
 
 		if (!connection.incoming.empty)
 		{
-			swapPendings.enqueue(connection);
+			pendings.enqueue(connection);
 		}
 	}
 }

source/tanya/async/iocp.d

@@ -3,10 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  */
 module tanya.async.iocp;
 

source/tanya/async/loop.d

@@ -3,10 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  *
  * ---
  * import tanya.async;
@@ -17,7 +17,7 @@
  * {
  * 	private DuplexTransport transport;
  *
- * 	void received(ubyte[] data) @nogc
+ * 	void received(in ubyte[] data) @nogc
  * 	{
  * 		transport.write(data);
  * 	}
@@ -27,7 +27,7 @@
  * 		this.transport = transport;
  * 	}
  *
- * 	void disconnected(SocketException e = null) @nogc
+ * 	void disconnected(SocketException e) @nogc
  * 	{
  * 	}
  * }
@@ -68,7 +68,6 @@ import core.time;
 import std.algorithm.iteration;
 import std.algorithm.mutation;
 import std.typecons;
-import tanya.async.protocol;
 import tanya.async.transport;
 import tanya.async.watcher;
 import tanya.container.buffer;
@@ -130,18 +129,17 @@ alias EventMask = BitFlags!Event;
  */
 abstract class Loop
 {
-	/// Pending watchers.
+	private bool done;
-	protected Queue!Watcher* pendings;
 
-	/// Ditto.
+	/// Pending watchers.
-	protected Queue!Watcher* swapPendings;
+	protected Queue!Watcher pendings;
 
 	/**
 	 * Returns: Maximal event count can be got at a time
 	 *          (should be supported by the backend).
 	 */
-	protected @property inout(uint) maxEvents()
+	protected @property uint maxEvents()
-	inout const pure nothrow @safe @nogc
+	const pure nothrow @safe @nogc
 	{
 		return 128U;
 	}
@@ -151,8 +149,7 @@ abstract class Loop
 	 */
 	this() @nogc
 	{
-		pendings = MmapPool.instance.make!(Queue!Watcher)(MmapPool.instance);
+		pendings = Queue!Watcher(MmapPool.instance);
-		swapPendings = MmapPool.instance.make!(Queue!Watcher)(MmapPool.instance);
 	}
 
 	/**
@@ -160,17 +157,10 @@ abstract class Loop
 	 */
 	~this() @nogc
 	{
-		foreach (w; *pendings)
+		foreach (w; pendings)
 		{
 			MmapPool.instance.dispose(w);
 		}
-		MmapPool.instance.dispose(pendings);
-
-		foreach (w; *swapPendings)
-		{
-			MmapPool.instance.dispose(w);
-		}
-		MmapPool.instance.dispose(swapPendings);
 	}
 
 	/**
@@ -178,19 +168,18 @@ abstract class Loop
 	 */
 	void run() @nogc
 	{
-		done_ = false;
+		done = false;
 		do
 		{
 			poll();
 
 			// Invoke pendings
-			foreach (ref w; *swapPendings)
+			foreach (ref w; pendings)
 			{
 				w.invoke();
 			}
-			swap(pendings, swapPendings);
 		}
-		while (!done_);
+		while (!done);
 	}
 
 	/**
@@ -198,7 +187,7 @@ abstract class Loop
 	 */
 	void unloop() @safe pure nothrow @nogc
 	{
-		done_ = true;
+		done = true;
 	}
 
 	/**
@@ -214,6 +203,7 @@ abstract class Loop
 			return;
 		}
 		watcher.active = true;
+
 		reify(watcher, EventMask(Event.none), EventMask(Event.accept));
 	}
 
@@ -244,9 +234,9 @@ abstract class Loop
 	 *
 	 * Returns: $(D_KEYWORD true) if the operation was successful.
 	 */
-	abstract protected bool reify(ConnectionWatcher watcher,
+	abstract protected bool reify(SocketWatcher watcher,
-								  EventMask oldEvents,
+	                              EventMask oldEvents,
-								  EventMask events) @nogc;
+	                              EventMask events) @nogc;
 
 	/**
 	 * Returns: The blocking time.
@@ -255,7 +245,7 @@ abstract class Loop
 	inout @safe pure nothrow @nogc
 	{
 		// Don't block if we have to do.
-		return swapPendings.empty ? blockTime_ : Duration.zero;
+		return pendings.empty ? blockTime_ : Duration.zero;
 	}
 
 	/**
@@ -276,26 +266,11 @@ abstract class Loop
 		blockTime_ = blockTime;
 	}
 
-	/**
-	 * Kills the watcher and closes the connection.
-	 */
-	protected void kill(IOWatcher watcher, SocketException exception) @nogc
-	{
-		watcher.socket.shutdown();
-		defaultAllocator.dispose(watcher.socket);
-		MmapPool.instance.dispose(watcher.transport);
-		watcher.exception = exception;
-		swapPendings.enqueue(watcher);
-	}
-
 	/**
 	 * Does the actual polling.
 	 */
 	abstract protected void poll() @nogc;
 
-	/// Whether the event loop should be stopped.
-	private bool done_;
-
 	/// Maximal block time.
 	protected Duration blockTime_ = 1.dur!"minutes";
 }

source/tanya/async/package.d

@@ -3,10 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  */
 module tanya.async;
 

source/tanya/async/protocol.d

@@ -3,10 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  */
 module tanya.async.protocol;
 
@@ -22,7 +22,7 @@ interface Protocol
 	 * Params:
 	 * 	data = Read data.
 	 */
-	void received(ubyte[] data) @nogc;
+	void received(in ubyte[] data) @nogc;
 
 	/**
 	 * Called when a connection is made.
@@ -39,7 +39,7 @@ interface Protocol
 	 * 	exception = $(D_PSYMBOL Exception) if an error caused
 	 * 	            the disconnect, $(D_KEYWORD null) otherwise.
 	 */
-	void disconnected(SocketException exception = null) @nogc;
+	void disconnected(SocketException exception) @nogc;
 }
 
 /**

source/tanya/async/transport.d

@@ -3,13 +3,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  */
 module tanya.async.transport;
 
+import tanya.async.protocol;
 import tanya.network.socket;
 
 /**
@@ -45,6 +46,46 @@ interface WriteTransport : Transport
  */
 interface DuplexTransport : ReadTransport, WriteTransport
 {
+	/**
+	 * Returns: Application protocol.
+	 *
+	 * Postcondition: $(D_INLINECODE protocol !is null)
+	 */
+	@property Protocol protocol() pure nothrow @safe @nogc
+	out (protocol)
+	{
+		assert(protocol !is null);
+	}
+
+	/**
+	 * Switches the protocol.
+	 *
+	 * The protocol is deallocated by the event loop, it should currently be
+	 * allocated with $(D_PSYMBOL MmapPool).
+	 *
+	 * Params:
+	 * 	protocol = Application protocol.
+	 *
+	 * Precondition: $(D_INLINECODE protocol !is null)
+	 */
+	@property void protocol(Protocol protocol) pure nothrow @safe @nogc
+	in
+	{
+		assert(protocol !is null);
+	}
+
+
+	/**
+	 * Returns $(D_PARAM true) if the transport is closing or closed.
+	 */
+	bool isClosing() const pure nothrow @safe @nogc;
+
+	/**
+	 * Close the transport.
+	 *
+	 * Buffered data will be flushed.  No more data will be received.
+	 */
+	void close() @nogc;
 }
 
 /**
@@ -52,12 +93,8 @@ interface DuplexTransport : ReadTransport, WriteTransport
  */
 interface SocketTransport : Transport
 {
-	@property inout(Socket) socket() inout pure nothrow @safe @nogc;
+	/**
-}
+	 * Returns: Socket.
-
+	 */
-/**
+	@property Socket socket() pure nothrow @safe @nogc;
- * Represents a connection-oriented socket transport.
- */
-package interface StreamTransport : DuplexTransport, SocketTransport
-{
 }

source/tanya/async/watcher.d

@@ -3,10 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  */
 module tanya.async.watcher;
 
@@ -21,15 +21,6 @@ import tanya.memory;
 import tanya.memory.mmappool;
 import tanya.network.socket;
 
-version (Windows)
-{
-	import core.sys.windows.basetyps;
-	import core.sys.windows.mswsock;
-	import core.sys.windows.winbase;
-	import core.sys.windows.windef;
-	import core.sys.windows.winsock2;
-}
-
 /**
  * A watcher is an opaque structure that you allocate and register to record
  * your interest in some event. 
@@ -45,15 +36,48 @@ abstract class Watcher
 	void invoke() @nogc;
 }
 
-class ConnectionWatcher : Watcher
+/**
+ * Socket watcher.
+ */
+abstract class SocketWatcher : Watcher
 {
 	/// Watched socket.
-	private Socket socket_;
+	protected Socket socket_;
 
-	/// Protocol factory.
+	/**
-	protected Protocol delegate() @nogc protocolFactory;
+	 * Params:
+	 * 	socket = Socket.
+	 *
+	 * Precondition: $(D_INLINECODE socket !is null)
+	 */
+	this(Socket socket) pure nothrow @safe @nogc
+	in
+	{
+		assert(socket !is null);
+	}
+	body
+	{
+		socket_ = socket;
+	}
 
-	package Queue!IOWatcher incoming;
+	/**
+	 * Returns: Socket.
+	 */
+	@property Socket socket() pure nothrow @safe @nogc
+	{
+		return socket_;
+	}
+}
+
+/**
+ * Connection watcher.
+ */
+class ConnectionWatcher : SocketWatcher
+{
+	/// Incoming connection queue.
+	Queue!DuplexTransport incoming;
+
+	private Protocol delegate() @nogc protocolFactory;
 
 	/**
 	 * Params:
@@ -61,20 +85,8 @@ class ConnectionWatcher : Watcher
 	 */
 	this(Socket socket) @nogc
 	{
-		socket_ = socket;
+		super(socket);
-	}
+		incoming = Queue!DuplexTransport(MmapPool.instance);
-
-	/// Ditto.
-	protected this() pure nothrow @safe @nogc
-	{
-	}
-
-	~this() @nogc
-	{
-		foreach (w; incoming)
-		{
-			MmapPool.instance.dispose(w);
-		}
 	}
 
 	/**
@@ -87,159 +99,19 @@ class ConnectionWatcher : Watcher
 	}
 
 	/**
-	 * Returns: Socket.
+	 * Invokes new connection callback.
 	 */
-	@property inout(Socket) socket() inout pure nothrow @nogc
+	override void invoke() @nogc
-	{
-		return socket_;
-	}
-
-	/**
-	 * Returns: New protocol instance.
-	 */
-	@property Protocol protocol() @nogc
 	in
 	{
 		assert(protocolFactory !is null, "Protocol isn't set.");
 	}
 	body
 	{
-		return protocolFactory();
+		foreach (transport; incoming)
-	}
-
-	/**
-	 * Invokes new connection callback.
-	 */
-	override void invoke() @nogc
-	{
-		foreach (io; incoming)
 		{
-			io.protocol.connected(cast(DuplexTransport) io.transport);
+			transport.protocol = protocolFactory();
-		}
+			transport.protocol.connected(transport);
-	}
-}
-
-/**
- * Contains a pending watcher with the invoked events or a transport can be
- * read from.
- */
-class IOWatcher : ConnectionWatcher
-{
-	/// If an exception was thrown the transport should be already invalid.
-	private union
-	{
-		StreamTransport transport_;
-		SocketException exception_;
-	}
-
-	private Protocol protocol_;
-
-	/**
-	 * Returns: Underlying output buffer.
-	 */
-	package ReadBuffer!ubyte output;
-
-	/**
-	 * Params:
-	 * 	transport = Transport.
-	 * 	protocol  = New instance of the application protocol.
-	 */
-	this(StreamTransport transport, Protocol protocol) @nogc
-	in
-	{
-		assert(transport !is null);
-		assert(protocol !is null);
-	}
-	body
-	{
-		super();
-		transport_ = transport;
-		protocol_ = protocol;
-		output = ReadBuffer!ubyte(8192, 1024, MmapPool.instance);
-		active = true;
-	}
-
-	/**
-	 * Destroys the watcher.
-	 */
-	~this() @nogc
-	{
-		MmapPool.instance.dispose(protocol_);
-	}
-
-	/**
-	 * Assigns a transport.
-	 *
-	 * Params:
-	 * 	transport = Transport.
-	 * 	protocol  = Application protocol.
-	 *
-	 * Returns: $(D_KEYWORD this).
-	 */
-	IOWatcher opCall(StreamTransport transport, Protocol protocol)
-	pure nothrow @nogc
-	in
-	{
-		assert(transport !is null);
-		assert(protocol !is null);
-	}
-	body
-	{
-		transport_ = transport;
-		protocol_ = protocol;
-		active = true;
-		return this;
-	}
-
-	/**
-	 * Returns: Transport used by this watcher.
-	 */
-	@property inout(StreamTransport) transport() inout pure nothrow @nogc
-	{
-		return transport_;
-	}
-
-	/**
-	 * Sets an exception occurred during a read/write operation.
-	 *
-	 * Params:
-	 * 	exception = Thrown exception.
-	 */
-	@property void exception(SocketException exception) pure nothrow @nogc
-	{
-		exception_ = exception;
-	}
-
-	/**
-	 * Returns: Application protocol.
-	 */
-	override @property Protocol protocol() pure nothrow @safe @nogc
-	{
-		return protocol_;
-	}
-
-	/**
-	 * Returns: Socket.
-	 */
-	override @property inout(Socket) socket() inout pure nothrow @nogc
-	{
-		return transport.socket;
-	}
-
-	/**
-	 * Invokes the watcher callback.
-	 */
-	override void invoke() @nogc
-	{
-		if (output.length)
-		{
-			protocol.received(output[0..$]);
-			output.clear();
-		}
-		else
-		{
-			protocol.disconnected(exception_);
-			active = false;
 		}
 	}
 }

source/tanya/container/entry.d

@@ -5,41 +5,18 @@
 /*
  * Internal package used by containers that rely on entries/nodes.
  *
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * 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)
- */  
+ */
 module tanya.container.entry;
 
-version (unittest)
+package struct SEntry(T)
 {
-	package struct ConstEqualsStruct
+    /// Item content.
-	{
+    T content;
-		int opEquals(typeof(this) that) const @nogc
-		{
-			return true;
-		}
-	}
 
-	package struct MutableEqualsStruct
+    /// Next item.
-	{
+    SEntry* next;
-		int opEquals(typeof(this) that) @nogc
-		{
-			return true;
-		}
-	}
-
-	package struct NoEqualsStruct
-	{
-	}
-}
-
-package struct Entry(T)
-{
-	/// Item content.
-	T content;
-
-	/// Next item.
-	Entry* next;
 }

source/tanya/container/package.d

@@ -3,11 +3,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Abstract data types whose instances are collections of other objects.
+ *
+ * Copyright: Eugene Wissner 2016-2017.
  * 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)
- */  
+ */
 module tanya.container;
 
 public import tanya.container.buffer;

source/tanya/container/queue.d

@@ -3,13 +3,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * FIFO queue.
+ *
+ * Copyright: Eugene Wissner 2016-2017.
  * 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)
- */  
+ */
 module tanya.container.queue;
 
+import core.exception;
 import std.traits;
 import std.algorithm.mutation;
 import tanya.container.entry;
@@ -19,342 +22,267 @@ import tanya.memory;
  * FIFO queue.
  *
  * Params:
- * 	T = Content type.
+ *  T = Content type.
  */
 struct Queue(T)
 {
-	/**
+    /**
-	 * Removes all elements from the queue.
+     * Removes all elements from the queue.
-	 */
+     */
-	~this()
+    ~this()
-	{
+    {
-		while (!empty)
+        while (!empty)
-		{
+        {
-			dequeue();
+            dequeue();
-		}
+        }
-	}
+    }
 
-	/**
+    /**
-	 * Removes all elements from the queue.
+     * Returns how many elements are in the queue. It iterates through the queue
-	 */
+     * to count the elements.
-	deprecated
+     *
-	void clear()
+     * Returns: How many elements are in the queue.
-	{
+     */
-		while (!empty)
+    size_t length() const
-		{
+    {
-			dequeue();
+        size_t len;
-		}
+        for (const(SEntry!T)* i = first; i !is null; i = i.next)
-	}
+        {
+            ++len;
+        }
+        return len;
+    }
 
-	/**
+    ///
-	 * Returns how many elements are in the queue. It iterates through the queue
+    unittest
-	 * to count the elements.
+    {
-	 *
+        Queue!int q;
-	 * Returns: How many elements are in the queue.
-	 */
-	size_t length() const
-	{
-		size_t len;
-		for (const(Entry!T)* i = first.next; i !is null; i = i.next)
-		{
-			++len;
-		}
-		return len;
-	}
 
-	///
+        assert(q.length == 0);
-	unittest
+        q.enqueue(5);
-	{
+        assert(q.length == 1);
-		Queue!int q;
+        q.enqueue(4);
+        assert(q.length == 2);
+        q.enqueue(9);
+        assert(q.length == 3);
 
-		assert(q.length == 0);
+        q.dequeue();
-		q.enqueue(5);
+        assert(q.length == 2);
-		assert(q.length == 1);
+        q.dequeue();
-		q.enqueue(4);
+        assert(q.length == 1);
-		assert(q.length == 2);
+        q.dequeue();
-		q.enqueue(9);
+        assert(q.length == 0);
-		assert(q.length == 3);
+    }
 
-		q.dequeue();
+    private void enqueueEntry(ref SEntry!T* entry)
-		assert(q.length == 2);
+    {
-		q.dequeue();
+        if (empty)
-		assert(q.length == 1);
+        {
-		q.dequeue();
+            first = rear = entry;
-		assert(q.length == 0);
+        }
-	}
+        else
+        {
+            rear.next = entry;
+            rear = rear.next;
+        }
+    }
 
-	version (D_Ddoc)
+    private SEntry!T* allocateEntry()
-	{
+    {
-		/**
+        auto temp = cast(SEntry!T*) allocator.allocate(SEntry!T.sizeof);
-		 * Compares two queues. Checks if all elements of the both queues are equal.
+        if (temp is null)
-		 *
+        {
-		 * Returns: Whether $(D_KEYWORD this) and $(D_PARAM that) are equal.
+            onOutOfMemoryError();
-		 */
+        }
-		deprecated
+        return temp;
-		int opEquals(ref typeof(this) that);
+    }
 
-		/// Ditto.
+    /**
-		deprecated
+     * Inserts a new element.
-		int opEquals(typeof(this) that);
+     *
-	}
+     * Params:
-	else static if (!hasMember!(T, "opEquals")
+     *  x = New element.
-	             || (functionAttributes!(T.opEquals) & FunctionAttribute.const_))
+     */
-	{
+    void enqueue(ref T x)
-		deprecated
+    {
-		bool opEquals(in ref typeof(this) that) const
+        auto temp = allocateEntry();
-		{
-			const(Entry!T)* i = first.next;
-			const(Entry!T)* j = that.first.next;
-			while (i !is null && j !is null)
-			{
-				if (i.content != j.content)
-				{
-					return false;
-				}
-				i = i.next;
-				j = j.next;
-			}
-			return i is null && j is null;
-		}
 
-		deprecated
+        *temp = SEntry!T.init;
-		bool opEquals(in typeof(this) that) const
+        temp.content = x;
-		{
-			return opEquals(that);
-		}
-	}
-	else
-	{
-		deprecated
-		bool opEquals(ref typeof(this) that)
-		{
-			Entry!T* i = first.next;
-			Entry!T* j = that.first.next;
-			while (i !is null && j !is null)
-			{
-				if (i.content != j.content)
-				{
-					return false;
-				}
-				i = i.next;
-				j = j.next;
-			}
-			return i is null && j is null;
-		}
 
-		deprecated
+        enqueueEntry(temp);
-		bool opEquals(typeof(this) that)
+    }
-		{
-			return opEquals(that);
-		}
-	}
 
-	/**
+    /// Ditto.
-	 * Returns: First element.
+    void enqueue(T x)
-	 */
+    {
-	deprecated("Use dequeue instead.")
+        auto temp = allocateEntry();
-	@property ref inout(T) front() inout
-	in
-	{
-		assert(!empty);
-	}
-	body
-	{
-		return first.next.content;
-	}
 
-	/**
+        moveEmplace(x, (*temp).content);
-	 * Inserts a new element.
+        (*temp).next = null;
-	 *
-	 * Params:
-	 * 	x = New element.
-	 *
-	 * Returns: $(D_KEYWORD this).
-	 */
-	ref typeof(this) enqueue(ref T x)
-	{
-		auto temp = allocator.make!(Entry!T)(x);
-		if (empty)
-		{
-			first.next = rear = temp;
-		}
-		else
-		{
-			rear.next = temp;
-			rear = rear.next;
-		}
-		return this;
-	}
 
-	/// Ditto.
+        enqueueEntry(temp);
-	ref typeof(this) enqueue(T x)
+    }
-	{
-		return enqueue(x);
-	}
 
-	deprecated("Use enqueue instead.")
+    ///
-	alias insert = enqueue;
+    unittest
+    {
+        Queue!int q;
 
-	deprecated("Use enqueue instead.")
+        assert(q.empty);
-	alias insertBack = enqueue;
+        q.enqueue(8);
+        q.enqueue(9);
+        assert(q.dequeue() == 8);
+        assert(q.dequeue() == 9);
+    }
 
-	///
+    /**
-	unittest
+     * Returns: $(D_KEYWORD true) if the queue is empty.
-	{
+     */
-		Queue!int q;
+    @property bool empty() const
+    {
+        return first is null;
+    }
 
-		assert(q.empty);
+    ///
-		q.enqueue(8).enqueue(9);
+    unittest
-		assert(q.dequeue() == 8);
+    {
-		assert(q.dequeue() == 9);
+        Queue!int q;
-	}
+        int value = 7;
 
-	/**
+        assert(q.empty);
-	 * Returns: $(D_KEYWORD true) if the queue is empty.
+        q.enqueue(value);
-	 */
+        assert(!q.empty);
-	@property bool empty() const
+    }
-	{
-		return first.next is null;
-	}
 
-	///
+    /**
-	unittest
+     * Move the position to the next element.
-	{
+     *
-		Queue!int q;
+     * Returns: Dequeued element.
-		int value = 7;
+     */
+    T dequeue()
+    in
+    {
+        assert(!empty);
+    }
+    body
+    {
+        auto n = first.next;
+        T ret = move(first.content);
 
-		assert(q.empty);
+        allocator.dispose(first);
-		q.enqueue(value);
+        first = n;
-		assert(!q.empty);
+        return ret;
-	}
+    }
 
-	/**
+    ///
-	 * Move the position to the next element.
+    unittest
-	 *
+    {
-	 * Returns: Dequeued element.
+        Queue!int q;
-	 */
-	T dequeue()
-	in
-	{
-		assert(!empty);
-		assert(allocator !is null);
-	}
-	body
-	{
-		auto n = first.next.next;
-		T ret = move(first.next.content);
 
-		dispose(allocator, first.next);
+        q.enqueue(8);
-		first.next = n;
+        q.enqueue(9);
-		return ret;
+        assert(q.dequeue() == 8);
-	}
+        assert(q.dequeue() == 9);
+    }
 
-	deprecated("Use dequeue instead.")
+    /**
-	alias popFront = dequeue;
+     * $(D_KEYWORD foreach) iteration. The elements will be automatically
+     * dequeued.
+     *
+     * Params:
+     *  dg = $(D_KEYWORD foreach) body.
+     *
+     * Returns: The value returned from $(D_PARAM dg).
+     */
+    int opApply(scope int delegate(ref size_t i, ref T) @nogc dg)
+    {
+        int result;
 
-	///
+        for (size_t i = 0; !empty; ++i)
-	unittest
+        {
-	{
+            auto e = dequeue();
-		Queue!int q;
+            if ((result = dg(i, e)) != 0)
+            {
+                return result;
+            }
+        }
+        return result;
+    }
 
-		q.enqueue(8).enqueue(9);
+    /// Ditto.
-		assert(q.dequeue() == 8);
+    int opApply(scope int delegate(ref T) @nogc dg)
-		assert(q.dequeue() == 9);
+    {
-	}
+        int result;
 
-	/**
+        while (!empty)
-	 * $(D_KEYWORD foreach) iteration. The elements will be automatically
+        {
-	 * dequeued.
+            auto e = dequeue();
-	 *
+            if ((result = dg(e)) != 0)
-	 * Params:
+            {
-	 * 	dg = $(D_KEYWORD foreach) body.
+                return result;
-	 */
+            }
-	int opApply(scope int delegate(ref size_t i, ref T) @nogc dg)
+        }
-	{
+        return result;
-		int result;
+    }
 
-		for (size_t i = 0; !empty; ++i)
+    ///
-		{
+    unittest
-			auto e = dequeue();
+    {
-			if ((result = dg(i, e)) != 0)
+        Queue!int q;
-			{
-				return result;
-			}
-		}
-		return result;
-	}
 
-	/// Ditto.
+        size_t j;
-	int opApply(scope int delegate(ref T) @nogc dg)
+        q.enqueue(5);
-	{
+        q.enqueue(4);
-		int result;
+        q.enqueue(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);
 
-		while (!empty)
+        j = 0;
-		{
+        q.enqueue(5);
-			auto e = dequeue();
+        q.enqueue(4);
-			if ((result = dg(e)) != 0)
+        q.enqueue(9);
-			{
+        foreach (e; q)
-				return result;
+        {
-			}
+            assert(j != 2 || e == 9);
-		}
+            assert(j != 1 || e == 4);
-		return result;
+            assert(j != 0 || e == 5);
-	}
+            ++j;
+        }
+        assert(j == 3);
+        assert(q.empty);
+    }
 
-	///
+    private SEntry!T* first;
-	unittest
+    private SEntry!T* rear;
-	{
-		Queue!int q;
 
-		size_t j;
+    mixin DefaultAllocator;
-		q.enqueue(5).enqueue(4).enqueue(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.enqueue(5).enqueue(4).enqueue(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);
-	}
-
-	/// The first element of the list.
-	private Entry!T first;
-
-	/// The last element of the list.
-	private Entry!T* rear;
-
-	mixin DefaultAllocator;
 }
 
 ///
 unittest
 {
-	Queue!int q;
+    Queue!int q;
 
-	q.enqueue(5);
+    q.enqueue(5);
-	assert(!q.empty);
+    assert(!q.empty);
 
-	q.enqueue(4).enqueue(9);
+    q.enqueue(4);
+    q.enqueue(9);
 
-	assert(q.dequeue() == 5);
+    assert(q.dequeue() == 5);
 
-	foreach (i, ref e; q)
+    foreach (i, ref e; q)
-	{
+    {
-		assert(i != 0 || e == 4);
+        assert(i != 0 || e == 4);
-		assert(i != 1 || e == 9);
+        assert(i != 1 || e == 9);
-	}
+    }
-	assert(q.empty);
+    assert(q.empty);
 }

source/tanya/crypto/bit.d

@@ -1,510 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Copyright: Eugene Wissner 2016.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
- */
-module tanya.crypto.bit;
-
-/**
- * Wrapper that allows bit manipulation on $(D_KEYWORD ubyte[]) array.
- */
-struct BitVector
-{
-    protected ubyte[] vector;
-
-    /**
-     * Params:
-     *     array = Array should be manipulated on.
-     */
-    this(inout(ubyte[]) array) inout pure nothrow @safe @nogc
-    in
-    {
-        assert(array.length <= size_t.max / 8);
-        assert(array !is null);
-    }
-    body
-    {
-        vector = array;
-    }
-
-    ///
-    unittest
-    {
-        ubyte[5] array1 = [234, 3, 252, 10, 18];
-        ubyte[3] array2 = [65, 13, 173];
-        auto bits = BitVector(array1);
-
-        assert(bits[] is array1);
-        assert(bits[] !is array2);
-
-        bits = BitVector(array2);
-        assert(bits[] is array2);
-
-    }
-
-    /**
-     * Returns: Number of bits in the vector.
-     */
-    @property inout(size_t) length() inout const pure nothrow @safe @nogc
-    {
-        return vector.length * 8;
-    }
-
-    /// Ditto.
-    inout(size_t) opDollar() inout const pure nothrow @safe @nogc
-    {
-        return vector.length * 8;
-    }
-
-    ///
-    unittest
-    {
-        // [01000001, 00001101, 10101101]
-        ubyte[3] arr = [65, 13, 173];
-        auto bits = BitVector(arr);
-
-        assert(bits.length == 24);
-    }
-
-    /**
-     * Params:
-     *     bit = Bit position.
-     *
-     * Returns: $(D_KEYWORD true) if the bit on position $(D_PARAM bit) is set,
-     *          $(D_KEYWORD false) if not set.
-     */
-    inout(bool) opIndex(size_t bit) inout const pure nothrow @safe @nogc
-    in
-    {
-        assert(bit / 8 <= vector.length);
-    }
-    body
-    {
-        return (vector[bit / 8] & (0x80 >> (bit % 8))) != 0;
-    }
-
-    ///
-    unittest
-    {
-        // [01000001, 00001101, 10101101]
-        ubyte[3] arr = [65, 13, 173];
-        auto bits = BitVector(arr);
-
-        assert(!bits[0]);
-        assert(bits[1]);
-        assert(bits[7]);
-        assert(!bits[8]);
-        assert(!bits[11]);
-        assert(bits[12]);
-        assert(bits[20]);
-        assert(bits[23]);
-    }
-
-    /**
-     * Returns: Underlying array.
-     */
-    inout(ubyte[]) opIndex() inout pure nothrow @safe @nogc
-    {
-        return vector;
-    }
-
-    ///
-    unittest
-    {
-        // [01000001, 00001101, 10101101]
-        ubyte[3] arr = [65, 13, 173];
-        auto bits = BitVector(arr);
-
-        assert(bits[] is arr);
-    }
-
-    /**
-     * Params:
-     *     value = $(D_KEYWORD true) if the bit should be set,
-     *             $(D_KEYWORD false) if cleared.
-     *     bit   = Bit position.
-     *
-     * Returns: $(D_PSYMBOL this).
-     */
-    bool opIndexAssign(bool value, size_t bit) pure nothrow @safe @nogc
-    in
-    {
-        assert(bit / 8 <= vector.length);
-    }
-    body
-    {
-        if (value)
-        {
-            vector[bit / 8] |= (0x80 >> (bit % 8));
-        }
-        else
-        {
-            vector[bit / 8] &= ~(0x80 >> (bit % 8));
-        }
-        return value;
-    }
-
-    ///
-    unittest
-    {
-        // [01000001, 00001101, 10101101]
-        ubyte[3] arr = [65, 13, 173];
-        auto bits = BitVector(arr);
-
-        bits[5] = bits[6] = true;
-        assert(bits[][0] == 71);
-
-        bits[14] = true;
-        bits[15] = false;
-        assert(bits[][1] == 14);
-
-        bits[16] = bits[23] = false;
-        assert(bits[][2] == 44);
-    }
-
-    /**
-     * Copies bits from $(D_PARAM vector) into this $(D_PSYMBOL BitVector).
-     *
-     * The array that should be assigned, can be smaller (but not larger) than
-     * the underlying array of this $(D_PSYMBOL BitVector), leading zeros will
-     * be added in this case to the left.
-     *
-     * Params:
-     *     vector = $(D_KEYWORD ubyte[]) array not larger than
-     *              `$(D_PSYMBOL length) / 8`.
-     *
-     * Returns: $(D_KEYWORD this).
-     */
-    BitVector opAssign(ubyte[] vector) pure nothrow @safe @nogc
-    in
-    {
-        assert(vector.length <= this.vector.length);
-    }
-    body
-    {
-        immutable delta = this.vector.length - vector.length;
-        if (delta > 0)
-        {
-            this.vector[0..delta] = 0;
-        }
-        this.vector[delta..$] = vector[0..$];
-        return this;
-    }
-
-    ///
-    unittest
-    {
-        ubyte[5] array1 = [234, 3, 252, 10, 18];
-        ubyte[3] array2 = [65, 13, 173];
-        auto bits = BitVector(array1);
-
-        bits = array2;
-        assert(bits[][0] == 0);
-        assert(bits[][1] == 0);
-        assert(bits[][2] == 65);
-        assert(bits[][3] == 13);
-        assert(bits[][4] == 173);
-
-        bits = array2[0..2];
-        assert(bits[][0] == 0);
-        assert(bits[][1] == 0);
-        assert(bits[][2] == 0);
-        assert(bits[][3] == 65);
-        assert(bits[][4] == 13);
-    }
-
-    /**
-     * Support for bitwise operations.
-     *
-     * Params:
-     *     that = Another bit vector.
-     *
-     * Returns: $(D_KEYWORD this).
-     */
-    BitVector opOpAssign(string op)(BitVector that) pure nothrow @safe @nogc
-        if ((op == "^") || (op == "|") || (op == "&"))
-    {
-        return opOpAssign(op)(that.vector);
-    }
-
-    /// Ditto.
-    BitVector opOpAssign(string op)(ubyte[] that) pure nothrow @safe @nogc
-        if ((op == "^") || (op == "|") || (op == "&"))
-    in
-    {
-        assert(that.length <= vector.length);
-    }
-    body
-    {
-        for (int i = cast(int) vector.length - 1; i >= 0; --i)
-        {
-            mixin("vector[i] " ~  op ~ "= " ~ "that[i];");
-        }
-        immutable delta = vector.length - that.length;
-        if (delta)
-        {
-            static if (op == "&")
-            {
-                vector[0..delta] = 0;
-            }
-        }
-        return this;
-    }
-
-    ///
-    unittest
-    {
-        // [01000001, 00001101, 10101101]
-        ubyte[3] array1 = [65, 13, 173];
-        ubyte[3] array2 = [0b01010010, 0b10111110, 0b10111110];
-        auto bits = BitVector(array1);
-
-        bits |= array2;
-        assert(bits[][0] == 0b01010011);
-        assert(bits[][1] == 0b10111111);
-        assert(bits[][2] == 0b10111111);
-
-        bits &= array2;
-        assert(bits[][0] == array2[0]);
-        assert(bits[][1] == array2[1]);
-        assert(bits[][2] == array2[2]);
-
-        bits ^= array2;
-        assert(bits[][0] == 0);
-        assert(bits[][1] == 0);
-        assert(bits[][2] == 0);
-    }
-
-    /**
-     * Support for shift operations.
-     *
-     * Params:
-     *     n = Number of bits.
-     *
-     * Returns: $(D_KEYWORD this).
-     */
-    BitVector opOpAssign(string op)(in size_t n) pure nothrow @safe @nogc
-        if ((op == "<<") || (op == ">>"))
-
-    {
-        if (n >= length)
-        {
-            vector[0..$] = 0;
-        }
-        else if (n != 0)
-        {
-            immutable bit = n % 8, step = n / 8;
-            immutable delta = 8 - bit;
-            size_t i, j;
-
-            static if (op == "<<")
-            {
-                for (j = step; j < vector.length - 1; ++i)
-                {
-                    vector[i] = cast(ubyte)((vector[j] << bit)
-                              | vector[++j] >> delta);
-                }
-                vector[i] = cast(ubyte)(vector[j] << bit);
-                vector[$ - step ..$] = 0;
-            }
-            else static if (op == ">>")
-            {
-                for (i = vector.length - 1, j = i - step; j > 0; --i)
-                {
-                    vector[i] = cast(ubyte)((vector[j] >> bit)
-                              | vector[--j] << delta);
-                }
-                vector[i] = cast(ubyte)(vector[j] >> bit);
-                vector[0..step] = 0;
-            }
-        }
-        return this;
-    }
-
-    ///
-    nothrow @safe @nogc unittest
-    {
-        ubyte[4] arr = [0b10111110, 0b11110010, 0b01010010, 0b01010011];
-        auto bits = BitVector(arr);
-
-        bits <<= 0;
-        assert(bits[][0] == 0b10111110 && bits[][1] == 0b11110010
-            && bits[][2] == 0b01010010 && bits[][3] == 0b01010011);
-
-        bits <<= 2;
-        assert(bits[][0] == 0b11111011 && bits[][1] == 0b11001001
-            && bits[][2] == 0b01001001 && bits[][3] == 0b01001100);
-
-        bits <<= 4;
-        assert(bits[][0] == 0b10111100 && bits[][1] == 0b10010100
-            && bits[][2] == 0b10010100 && bits[][3] == 0b11000000);
-
-        bits <<= 8;
-        assert(bits[][0] == 0b10010100 && bits[][1] == 0b10010100
-            && bits[][2] == 0b11000000 && bits[][3] == 0b00000000);
-
-        bits <<= 7;
-        assert(bits[][0] == 0b01001010 && bits[][1] == 0b01100000
-            && bits[][2] == 0b00000000 && bits[][3] == 0b00000000);
-
-        bits <<= 25;
-        assert(bits[][0] == 0b00000000 && bits[][1] == 0b00000000
-            && bits[][2] == 0b00000000 && bits[][3] == 0b00000000);
-
-        arr = [0b00110011, 0b11001100, 0b11111111, 0b01010101];
-        bits <<= 24;
-        assert(bits[][0] == 0b01010101 && bits[][1] == 0b00000000
-            && bits[][2] == 0b00000000 && bits[][3] == 0b00000000);
-
-        arr[1] = 0b11001100;
-        arr[2] = 0b11111111;
-        arr[3] = 0b01010101;
-        bits <<= 12;
-        assert(bits[][0] == 0b11001111 && bits[][1] == 0b11110101
-            && bits[][2] == 0b01010000 && bits[][3] == 0b00000000);
-
-        bits <<= 100;
-        assert(bits[][0] == 0b00000000 && bits[][1] == 0b00000000
-            && bits[][2] == 0b00000000 && bits[][3] == 0b00000000);
-
-        arr = [0b10111110, 0b11110010, 0b01010010, 0b01010011];
-        bits >>= 0;
-        assert(bits[][0] == 0b10111110 && bits[][1] == 0b11110010
-            && bits[][2] == 0b01010010 && bits[][3] == 0b01010011);
-
-        bits >>= 2;
-        assert(bits[][0] == 0b00101111 && bits[][1] == 0b10111100
-            && bits[][2] == 0b10010100 && bits[][3] == 0b10010100);
-
-        bits >>= 4;
-        assert(bits[][0] == 0b00000010 && bits[][1] == 0b11111011
-            && bits[][2] == 0b11001001 && bits[][3] == 0b01001001);
-
-        bits >>= 8;
-        assert(bits[][0] == 0b00000000 && bits[][1] == 0b00000010
-            && bits[][2] == 0b11111011 && bits[][3] == 0b11001001);
-
-        bits >>= 7;
-        assert(bits[][0] == 0b00000000 && bits[][1] == 0b00000000
-            && bits[][2] == 0b00000101 && bits[][3] == 0b11110111);
-
-        bits >>= 25;
-        assert(bits[][0] == 0b00000000 && bits[][1] == 0b00000000
-            && bits[][2] == 0b00000000 && bits[][3] == 0b00000000);
-
-        arr = [0b00110011, 0b11001100, 0b11111111, 0b01010101];
-        bits >>= 24;
-        assert(bits[][0] == 0b00000000 && bits[][1] == 0b00000000
-            && bits[][2] == 0b00000000 && bits[][3] == 0b00110011);
-
-        arr[1] = 0b11001100;
-        arr[2] = 0b11111111;
-        arr[3] = 0b01010101;
-        bits >>= 12;
-        assert(bits[][0] == 0b00000000 && bits[][1] == 0b00000000
-            && bits[][2] == 0b00001100 && bits[][3] == 0b11001111);
-
-        bits >>= 100;
-        assert(bits[][0] == 0b00000000 && bits[][1] == 0b00000000
-            && bits[][2] == 0b00000000 && bits[][3] == 0b00000000);
-    }
-
-    /**
-     * Negates all bits.
-     *
-     * Returns: $(D_KEYWORD this).
-     */
-    BitVector opUnary(string op)() pure nothrow @safe @nogc
-        if (op == "~")
-    {
-        foreach (ref b; vector)
-        {
-            b = ~b;
-        }
-        return this;
-    }
-
-    ///
-    unittest
-    {
-        // [01000001, 00001101, 10101101]
-        ubyte[3] arr = [65, 13, 173];
-        auto bits = BitVector(arr);
-
-        ~bits;
-        assert(bits[][0] == 0b10111110);
-        assert(bits[][1] == 0b11110010);
-        assert(bits[][2] == 0b01010010);
-    }
-
-    /**
-     * Iterates through all bits.
-     *
-     * Params:
-     *     dg = $(D_KEYWORD foreach) delegate.
-     *
-     * Returns: By $(D_PARAM dg) returned value.
-     */
-    int opApply(int delegate(size_t, bool) dg)
-    {
-        int result;
-        foreach (i, ref v; vector)
-        {
-            foreach (c; 0..8)
-            {
-                result = dg(i * 8 + c, (v & (0x80 >> c)) != 0);
-                if (result)
-                {
-                    return result;
-                }
-            }
-        }
-        return result;
-    }
-
-    /// Ditto.
-    int opApply(int delegate(bool) dg)
-    {
-        int result;
-        foreach (ref v; vector)
-        {
-            foreach (c; 0..8)
-            {
-                result = dg((v & (0x80 >> c)) != 0);
-                if (result)
-                {
-                    return result;
-                }
-            }
-        }
-        return result;
-    }
-
-    ///
-    unittest
-    {
-        ubyte[2] arr = [0b01000001, 0b00001101];
-        auto bits = BitVector(arr);
-        size_t c;
-
-        foreach (i, v; bits)
-        {
-            assert(i == c);
-            if (i == 1 || i == 7 || i == 15 || i == 13 || i == 12)
-            {
-                assert(v);
-            }
-            else
-            {
-                assert(!v);
-            }
-            ++c;
-        }
-        assert(c == 16);
-    }
-}

source/tanya/crypto/des.d

@@ -1,607 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Copyright: Eugene Wissner 2016.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
- */
-module tanya.crypto.des;
-
-import tanya.crypto.bit;
-import tanya.crypto.symmetric;
-
-/// Initial permutation table.
-private immutable ubyte[64] ipTable = [58, 50, 42, 34, 26, 18, 10, 2,
-                                       60, 52, 44, 36, 28, 20, 12, 4,
-                                       62, 54, 46, 38, 30, 22, 14, 6,
-                                       64, 56, 48, 40, 32, 24, 16, 8,
-                                       57, 49, 41, 33, 25, 17, 9,  1,
-                                       59, 51, 43, 35, 27, 19, 11, 3,
-                                       61, 53, 45, 37, 29, 21, 13, 5,
-                                       63, 55, 47, 39, 31, 23, 15, 7];
-
-/// Final permutation table.
-private immutable ubyte[64] fpTable = [40, 8, 48, 16, 56, 24, 64, 32,
-                                       39, 7, 47, 15, 55, 23, 63, 31,
-                                       38, 6, 46, 14, 54, 22, 62, 30,
-                                       37, 5, 45, 13, 53, 21, 61, 29,
-                                       36, 4, 44, 12, 52, 20, 60, 28,
-                                       35, 3, 43, 11, 51, 19, 59, 27,
-                                       34, 2, 42, 10, 50, 18, 58, 26,
-                                       33, 1, 41, 9,  49, 17, 57, 25];
-
-/// Key permutation table 1.
-private immutable ubyte[64] pc1Table = [57, 49, 41, 33, 25, 17, 9, 1,
-                                        58, 50, 42, 34, 26, 18, 10, 2,
-                                        59, 51, 43, 35, 27, 19, 11, 3,
-                                        60, 52, 44, 36, 63, 55, 47, 39,
-                                        31, 23, 15, 7,  62, 54, 46, 38,
-                                        30, 22, 14, 6,  61, 53, 45, 37,
-                                        29, 21, 13, 5,  28, 20, 12, 4];
-
-/// Key permutation table 2.
-private immutable ubyte[48] pc2Table = [14, 17, 11, 24, 1,  5,  3,  28,
-                                        15, 6,  21, 10, 23, 19, 12, 4,
-                                        26, 8,  16, 7,  27, 20, 13, 2,
-                                        41, 52, 31, 37, 47, 55, 30, 40,
-                                        51, 45, 33, 48, 44, 49, 39, 56,
-                                        34, 53, 46, 42, 50, 36, 29, 32];
-
-/// Expansion table.
-private immutable ubyte[48] expansionTable = [32, 1,  2,  3,  4,  5,  4,  5,
-                                              6,  7,  8,  9,  8,  9,  10, 11,
-                                              12, 13, 12, 13, 14, 15, 16, 17,
-                                              16, 17, 18, 19, 20, 21, 20, 21,
-                                              22, 23, 24, 25, 24, 25, 26, 27,
-                                              28, 29, 28, 29, 30, 31, 32, 1];
-
-/// Final input block permutation.
-private immutable ubyte[32] pTable = [16, 7,  20, 21, 29, 12, 28, 17,
-                                      1,  15, 23, 26, 5,  18, 31, 10,
-                                      2,  8,  24, 14, 32, 27, 3,  9,
-                                      19, 13, 30, 6,  22, 11, 4, 25];
-
-/// The (in)famous S-boxes.
-private immutable ubyte[64][8] sBox = [[
-                                         14, 0,  4,  15, 13, 7,  1,  4,  2, 14,  15, 2, 11, 13, 8,  1,
-                                         3,  10, 10, 6,  6,  12, 12, 11, 5,  9,  9,  5, 0,  3,  7,  8,
-                                         4,  15, 1,  12, 14, 8,  8,  2,  13, 4,  6,  9, 2,  1,  11, 7,
-                                         15, 5,  12, 11, 9,  3,  7,  14, 3,  10, 10, 0, 5,  6,  0,  13,
-                                      ],[
-                                         15, 3,  1,  13, 8,  4,  14, 7,  6,  15, 11, 2,  3,  8,  4,  14,
-                                         9,  12, 7,  0,  2,  1,  13, 10, 12, 6,  0,  9,  5,  11, 10, 5,
-                                         0,  13, 14, 8,  7,  10, 11, 1,  10, 3,  4,  15, 13, 4,  1,  2,
-                                         5,  11, 8,  6,  12, 7,  6,  12, 9,  0,  3,  5,  2,  14, 15, 9,
-                                      ],[
-                                         10, 13, 0,  7,  9,  0,  14, 9,  6,  3,  3,  4,  15, 6,  5,  10,
-                                         1,  2,  13, 8,  12, 5,  7,  14, 11, 12, 4,  11, 2,  15, 8,  1,
-                                         13, 1,  6,  10, 4,  13, 9,  0,  8,  6,  15, 9,  3,  8,  0,  7,
-                                         11, 4,  1,  15, 2,  14, 12, 3,  5,  11, 10, 5,  14, 2,  7,  12,
-                                      ],[
-                                         7,  13, 13, 8,  14, 11, 3,  5,  0,  6,  6,  15, 9,  0,  10, 3,
-                                         1,  4,  2,  7,  8,  2,  5,  12, 11, 1,  12, 10, 4,  14, 15, 9,
-                                         10, 3,  6,  15, 9,  0,  0,  6,  12, 10, 11, 1,  7,  13, 13, 8,
-                                         15, 9,  1,  4,  3,  5,  14, 11, 5,  12, 2,  7,  8,  2,  4,  14,
-                                      ],[
-                                         2,  14, 12, 11, 4,  2,  1,  12, 7,  4,  10, 7,  11, 13, 6,  1,
-                                         8,  5,  5,  0,  3,  15, 15, 10, 13, 3,  0,  9,  14, 8,  9,  6,
-                                         4,  11, 2,  8,  1,  12, 11, 7,  10, 1,  13, 14, 7,  2,  8,  13,
-                                         15, 6,  9,  15, 12, 0,  5,  9,  6,  10, 3,  4,  0,  5,  14, 3,
-                                      ],[
-                                         12, 10, 1,  15, 10, 4,  15, 2,  9,  7,  2,  12, 6,  9,  8,  5,
-                                         0,  6,  13, 1,  3,  13, 4,  14, 14, 0,  7,  11, 5,  3,  11, 8,
-                                         9,  4,  14, 3,  15, 2,  5,  12, 2,  9,  8,  5,  12, 15, 3,  10,
-                                         7,  11, 0,  14, 4,  1,  10, 7,  1,  6,  13, 0,  11, 8,  6,  13,
-                                      ],[
-                                         4,  13, 11, 0,  2,  11, 14, 7,  15, 4,  0,  9,  8,  1,  13, 10,
-                                         3,  14, 12, 3,  9,  5,  7,  12, 5,  2,  10, 15, 6,  8,  1,  6,
-                                         1,  6,  4,  11, 11, 13, 13, 8,  12, 1,  3,  4,  7,  10, 14, 7,
-                                         10, 9,  15, 5,  6,  0,  8,  15, 0,  14, 5,  2,  9,  3,  2,  12,
-                                      ],[
-                                         13, 1,  2,  15, 8,  13, 4,  8,  6,  10, 15, 3,  11, 7,  1,  4,
-                                         10, 12, 9,  5,  3,  6,  14, 11, 5,  0,  0,  14, 12, 9,  7,  2,
-                                         7,  2,  11, 1,  4,  14, 1,  7,  9,  4,  12, 10, 14, 8,  2,  13,
-                                         0,  15, 6,  12, 10, 9,  13, 0,  15, 3,  3,  5,  5,  6,  8,  11,
-                                      ]];
-
-/**
- * Data Encryption Standard.
- *
- * Params:
- *     L = Number of keys.
- */
-class DES(ushort L = 1) : BlockCipher
-    if (L == 1)
-{
-    mixin FixedBlockSize!8;
-    mixin KeyLength!8;
-
-    private enum expansionBlockSize = 6;
-    private enum pc1KeyLength = 7;
-    private enum subkeyLength = 6;
-    private ubyte[] key_;
-
-    /**
-     * Params:
-     *     key = Key.
-     */
-    @property void key(ubyte[] key) pure nothrow @safe @nogc
-    in
-    {
-        assert(key.length >= minKeyLength);
-        assert(key.length <= maxKeyLength);
-    }
-    body
-    {
-        key_ = key;
-    }
-
-    /**
-     * Encrypts a block.
-     *
-     * Params:
-     *    plain  = Plain text, input.
-     *    cipher = Cipher text, output.
-     */
-    void encrypt(in ubyte[] plain, ubyte[] cipher)
-    nothrow
-    in
-    {
-        assert(plain.length == blockSize);
-        assert(cipher.length == blockSize);
-    }
-    body
-    {
-        operateBlock!(Direction.encryption)(plain, cipher);
-    }
-
-    /**
-     * Decrypts a block.
-     *
-     * Params:
-     *    cipher = Cipher text, input.
-     *    plain  = Plain text, output.
-     */
-    void decrypt(in ubyte[] cipher, ubyte[] plain)
-    nothrow
-    in
-    {
-        assert(plain.length == blockSize);
-        assert(cipher.length == blockSize);
-    }
-    body
-    {
-        operateBlock!(Direction.decryption)(cipher, plain);
-    }
-
-    private void operateBlock(Direction D)(in ubyte[] source, ref ubyte[] target)
-    {
-        ubyte[blockSize_] ipBlock;
-        ubyte[expansionBlockSize] expansionBlock;
-        ubyte[4] substitutionBlock;
-        ubyte[4] pBoxTarget;
-        ubyte[pc1KeyLength] pc1Key;
-        ubyte[subkeyLength] subkey;
-
-        // Initial permutation
-        permute(source, ipBlock, ipTable, blockSize);
-
-        // Key schedule computation
-        permute(key_, pc1Key, pc1Table, pc1KeyLength);
-
-        // Feistel function
-        for (ubyte round; round < 16; ++round)
-        {
-            auto bitVector = BitVector(expansionBlock);
-            /* Expansion. This permutation only looks at the first 4 bytes (32
-               bits of ipBlock); 16 of these are repeated in expansion table.*/
-            permute(BitVector(ipBlock[4..$]), bitVector, expansionTable, 6);
-
-            // Key mixing
-            static if (D == Direction.encryption)
-            {
-                rotateLeft(pc1Key);
-                if (!(round <= 1 || round == 8 || round == 15))
-                {
-                    // Rotate twice.
-                    rotateLeft(pc1Key);
-                }
-            }
-            permute(pc1Key, subkey, pc2Table, subkeyLength);
-            static if (D == Direction.decryption)
-            {
-                rotateRight(pc1Key);
-                if (!(round >= 14 || round == 7 || round == 0))
-                {
-                    // Rotate twice.
-                    rotateRight(pc1Key);
-                }
-            }
-
-            bitVector ^= subkey;
-
-            // Substitution; copy from updated expansion block to ciphertext block
-            substitutionBlock[0] = cast(ubyte) (sBox[0][(expansionBlock[0] & 0xfc ) >> 2] << 4);
-            substitutionBlock[0] |= sBox[1][(expansionBlock[0] & 0x03) << 4 | (expansionBlock[1] & 0xf0) >> 4];
-            substitutionBlock[1] = cast(ubyte) (sBox[2][(expansionBlock[1] & 0x0f) << 2 | (expansionBlock[2] & 0xc0) >> 6] << 4);
-            substitutionBlock[1] |= sBox[3][(expansionBlock[2] & 0x3f)];
-            substitutionBlock[2] = cast(ubyte) (sBox[4][(expansionBlock[3] & 0xfc) >> 2 ] << 4);
-            substitutionBlock[2] |= sBox[5][(expansionBlock[3] & 0x03) << 4 | (expansionBlock[4] & 0xf0) >> 4];
-            substitutionBlock[3] = cast(ubyte) (sBox[6][(expansionBlock[4] & 0x0F) << 2 | (expansionBlock[5] & 0xc0) >> 6] << 4);
-            substitutionBlock[3] |= sBox[7][(expansionBlock[5] & 0x3f)];
-
-            // Permutation
-            bitVector = BitVector(substitutionBlock);
-            permute(bitVector, pBoxTarget, pTable, blockSize / 2);
-
-            // Swap the halves.
-            substitutionBlock = ipBlock[0..4];
-            ipBlock[0..4] = ipBlock[4..$];
-
-            bitVector ^= pBoxTarget;
-            ipBlock[4..$] = substitutionBlock;
-        }
-
-        substitutionBlock = ipBlock[0..4];
-        ipBlock[0..4] = ipBlock[4..$];
-        ipBlock[4..$] = substitutionBlock;
-
-        // Final permutaion (undo initial permuation).
-        permute(ipBlock, target, fpTable, blockSize);
-    }
-
-    /**
-     * Performs the left rotation operation on the key.
-     *
-     * Params:
-     *     key = The key to rotate.
-     */
-    private void rotateLeft(ref ubyte[7] key) const pure nothrow @safe @nogc
-    {
-        immutable carryLeft = (key[0] & 0x80) >> 3;
-
-        key[0] = cast(ubyte) ((key[0] << 1) | ((key[1] & 0x80) >> 7));
-        key[1] = cast(ubyte) ((key[1] << 1) | ((key[2] & 0x80) >> 7));
-        key[2] = cast(ubyte) ((key[2] << 1) | ((key[3] & 0x80) >> 7));
-
-        immutable carryRight = (key[3] & 0x08) >> 3;
-        key[3] = cast(ubyte) ((((key[3] << 1) | ((key[4] & 0x80) >> 7)) & ~0x10) | carryLeft);
-
-        key[4] = cast(ubyte) ((key[4] << 1) | ((key[5] & 0x80) >> 7));
-        key[5] = cast(ubyte) ((key[5] << 1) | ((key[6] & 0x80) >> 7));
-        key[6] = cast(ubyte) ((key[6] << 1) | carryRight);
-    }
-
-    /**
-     * Performs the right rotation operation on the key.
-     *
-     * Params:
-     *     key = The key to rotate.
-     */
-    private void rotateRight(ref ubyte[7] key) const pure nothrow @safe @nogc
-    {
-        immutable carryRight = (key[6] & 0x01) << 3;
-
-        key[6] = cast(ubyte) ((key[6] >> 1) | ((key[5] & 0x01) << 7));
-        key[5] = cast(ubyte) ((key[5] >> 1) | ((key[4] & 0x01) << 7));
-        key[4] = cast(ubyte) ((key[4] >> 1) | ((key[3] & 0x01) << 7));
-
-        immutable carryLeft = (key[3] & 0x10) << 3;
-        key[3] = cast(ubyte) ((((key[3] >> 1) | ((key[2] & 0x01) << 7)) & ~0x08) | carryRight);
-
-        key[2] = cast(ubyte) ((key[2] >> 1) | ((key[1] & 0x01) << 7));
-        key[1] = cast(ubyte) ((key[1] >> 1) | ((key[0] & 0x01) << 7));
-        key[0] = cast(ubyte) ((key[0] >> 1) | carryLeft);
-    }
-
-    private void permute(in ubyte[] source, ubyte[] target, immutable(ubyte[]) permuteTable, size_t length)
-    const pure nothrow @safe @nogc
-    {
-        const sourceVector = const BitVector(source);
-        auto targetVector = BitVector(target);
-
-        permute(sourceVector, targetVector, permuteTable, length);
-    }
-
-    private void permute(in BitVector source, ubyte[] target, immutable(ubyte[]) permuteTable, size_t length)
-    const pure nothrow @safe @nogc
-    {
-        auto targetVector = BitVector(target);
-
-        permute(source, targetVector, permuteTable, length);
-    }
-
-    private void permute(in BitVector source, ref BitVector target, immutable(ubyte[]) permuteTable, size_t length)
-    const pure nothrow @safe @nogc
-    {
-        for (uint i; i < length * 8; ++i)
-        {
-            target[i] = source[permuteTable[i] - 1];
-        }
-    }
-}
-
-version (unittest)
-{
-    import std.typecons;
-
-    /* Test vectors for DES. Source:
-       "Validating the Correctness of Hardware 
-       Implementations of the NBS Data Encryption Standard"
-       NBS Special Publication 500-20, 1980. Appendix B */
-
-    // Initial and reverse Permutation and Expansion tests. Encrypt.
-    ubyte[8][64] desTestVectors1 = [
-        [0x95, 0xf8, 0xa5, 0xe5, 0xdd, 0x31, 0xd9, 0x00],
-        [0xdd, 0x7f, 0x12, 0x1c, 0xa5, 0x01, 0x56, 0x19],
-        [0x2e, 0x86, 0x53, 0x10, 0x4f, 0x38, 0x34, 0xea],
-        [0x4b, 0xd3, 0x88, 0xff, 0x6c, 0xd8, 0x1d, 0x4f],
-        [0x20, 0xb9, 0xe7, 0x67, 0xb2, 0xfb, 0x14, 0x56],
-        [0x55, 0x57, 0x93, 0x80, 0xd7, 0x71, 0x38, 0xef],
-        [0x6c, 0xc5, 0xde, 0xfa, 0xaf, 0x04, 0x51, 0x2f],
-        [0x0d, 0x9f, 0x27, 0x9b, 0xa5, 0xd8, 0x72, 0x60],
-        [0xd9, 0x03, 0x1b, 0x02, 0x71, 0xbd, 0x5a, 0x0a],
-        [0x42, 0x42, 0x50, 0xb3, 0x7c, 0x3d, 0xd9, 0x51],
-        [0xb8, 0x06, 0x1b, 0x7e, 0xcd, 0x9a, 0x21, 0xe5],
-        [0xf1, 0x5d, 0x0f, 0x28, 0x6b, 0x65, 0xbd, 0x28],
-        [0xad, 0xd0, 0xcc, 0x8d, 0x6e, 0x5d, 0xeb, 0xa1],
-        [0xe6, 0xd5, 0xf8, 0x27, 0x52, 0xad, 0x63, 0xd1],
-        [0xec, 0xbf, 0xe3, 0xbd, 0x3f, 0x59, 0x1a, 0x5e],
-        [0xf3, 0x56, 0x83, 0x43, 0x79, 0xd1, 0x65, 0xcd],
-        [0x2b, 0x9f, 0x98, 0x2f, 0x20, 0x03, 0x7f, 0xa9],
-        [0x88, 0x9d, 0xe0, 0x68, 0xa1, 0x6f, 0x0b, 0xe6],
-        [0xe1, 0x9e, 0x27, 0x5d, 0x84, 0x6a, 0x12, 0x98],
-        [0x32, 0x9a, 0x8e, 0xd5, 0x23, 0xd7, 0x1a, 0xec],
-        [0xe7, 0xfc, 0xe2, 0x25, 0x57, 0xd2, 0x3c, 0x97],
-        [0x12, 0xa9, 0xf5, 0x81, 0x7f, 0xf2, 0xd6, 0x5d],
-        [0xa4, 0x84, 0xc3, 0xad, 0x38, 0xdc, 0x9c, 0x19],
-        [0xfb, 0xe0, 0x0a, 0x8a, 0x1e, 0xf8, 0xad, 0x72],
-        [0x75, 0x0d, 0x07, 0x94, 0x07, 0x52, 0x13, 0x63],
-        [0x64, 0xfe, 0xed, 0x9c, 0x72, 0x4c, 0x2f, 0xaf],
-        [0xf0, 0x2b, 0x26, 0x3b, 0x32, 0x8e, 0x2b, 0x60],
-        [0x9d, 0x64, 0x55, 0x5a, 0x9a, 0x10, 0xb8, 0x52],
-        [0xd1, 0x06, 0xff, 0x0b, 0xed, 0x52, 0x55, 0xd7],
-        [0xe1, 0x65, 0x2c, 0x6b, 0x13, 0x8c, 0x64, 0xa5],
-        [0xe4, 0x28, 0x58, 0x11, 0x86, 0xec, 0x8f, 0x46],
-        [0xae, 0xb5, 0xf5, 0xed, 0xe2, 0x2d, 0x1a, 0x36],
-        [0xe9, 0x43, 0xd7, 0x56, 0x8a, 0xec, 0x0c, 0x5c],
-        [0xdf, 0x98, 0xc8, 0x27, 0x6f, 0x54, 0xb0, 0x4b],
-        [0xb1, 0x60, 0xe4, 0x68, 0x0f, 0x6c, 0x69, 0x6f],
-        [0xfa, 0x07, 0x52, 0xb0, 0x7d, 0x9c, 0x4a, 0xb8],
-        [0xca, 0x3a, 0x2b, 0x03, 0x6d, 0xbc, 0x85, 0x02],
-        [0x5e, 0x09, 0x05, 0x51, 0x7b, 0xb5, 0x9b, 0xcf],
-        [0x81, 0x4e, 0xeb, 0x3b, 0x91, 0xd9, 0x07, 0x26],
-        [0x4d, 0x49, 0xdb, 0x15, 0x32, 0x91, 0x9c, 0x9f],
-        [0x25, 0xeb, 0x5f, 0xc3, 0xf8, 0xcf, 0x06, 0x21],
-        [0xab, 0x6a, 0x20, 0xc0, 0x62, 0x0d, 0x1c, 0x6f],
-        [0x79, 0xe9, 0x0d, 0xbc, 0x98, 0xf9, 0x2c, 0xca],
-        [0x86, 0x6e, 0xce, 0xdd, 0x80, 0x72, 0xbb, 0x0e],
-        [0x8b, 0x54, 0x53, 0x6f, 0x2f, 0x3e, 0x64, 0xa8],
-        [0xea, 0x51, 0xd3, 0x97, 0x55, 0x95, 0xb8, 0x6b],
-        [0xca, 0xff, 0xc6, 0xac, 0x45, 0x42, 0xde, 0x31],
-        [0x8d, 0xd4, 0x5a, 0x2d, 0xdf, 0x90, 0x79, 0x6c],
-        [0x10, 0x29, 0xd5, 0x5e, 0x88, 0x0e, 0xc2, 0xd0],
-        [0x5d, 0x86, 0xcb, 0x23, 0x63, 0x9d, 0xbe, 0xa9],
-        [0x1d, 0x1c, 0xa8, 0x53, 0xae, 0x7c, 0x0c, 0x5f],
-        [0xce, 0x33, 0x23, 0x29, 0x24, 0x8f, 0x32, 0x28],
-        [0x84, 0x05, 0xd1, 0xab, 0xe2, 0x4f, 0xb9, 0x42],
-        [0xe6, 0x43, 0xd7, 0x80, 0x90, 0xca, 0x42, 0x07],
-        [0x48, 0x22, 0x1b, 0x99, 0x37, 0x74, 0x8a, 0x23],
-        [0xdd, 0x7c, 0x0b, 0xbd, 0x61, 0xfa, 0xfd, 0x54],
-        [0x2f, 0xbc, 0x29, 0x1a, 0x57, 0x0d, 0xb5, 0xc4],
-        [0xe0, 0x7c, 0x30, 0xd7, 0xe4, 0xe2, 0x6e, 0x12],
-        [0x09, 0x53, 0xe2, 0x25, 0x8e, 0x8e, 0x90, 0xa1],
-        [0x5b, 0x71, 0x1b, 0xc4, 0xce, 0xeb, 0xf2, 0xee],
-        [0xcc, 0x08, 0x3f, 0x1e, 0x6d, 0x9e, 0x85, 0xf6],
-        [0xd2, 0xfd, 0x88, 0x67, 0xd5, 0x0d, 0x2d, 0xfe],
-        [0x06, 0xe7, 0xea, 0x22, 0xce, 0x92, 0x70, 0x8f],
-        [0x16, 0x6b, 0x40, 0xb4, 0x4a, 0xba, 0x4b, 0xd6],
-    ];
-
-    // Key Permutation test. Encrypt.
-    // Test of right-shifts. Decrypt.
-    ubyte[8][56] desTestVectors2 = [
-        [0x95, 0xa8, 0xd7, 0x28, 0x13, 0xda, 0xa9, 0x4d],
-        [0x0e, 0xec, 0x14, 0x87, 0xdd, 0x8c, 0x26, 0xd5],
-        [0x7a, 0xd1, 0x6f, 0xfb, 0x79, 0xc4, 0x59, 0x26],
-        [0xd3, 0x74, 0x62, 0x94, 0xca, 0x6a, 0x6c, 0xf3],
-        [0x80, 0x9f, 0x5f, 0x87, 0x3c, 0x1f, 0xd7, 0x61],
-        [0xc0, 0x2f, 0xaf, 0xfe, 0xc9, 0x89, 0xd1, 0xfc],
-        [0x46, 0x15, 0xaa, 0x1d, 0x33, 0xe7, 0x2f, 0x10],
-        [0x20, 0x55, 0x12, 0x33, 0x50, 0xc0, 0x08, 0x58],
-        [0xdf, 0x3b, 0x99, 0xd6, 0x57, 0x73, 0x97, 0xc8],
-        [0x31, 0xfe, 0x17, 0x36, 0x9b, 0x52, 0x88, 0xc9],
-        [0xdf, 0xdd, 0x3c, 0xc6, 0x4d, 0xae, 0x16, 0x42],
-        [0x17, 0x8c, 0x83, 0xce, 0x2b, 0x39, 0x9d, 0x94],
-        [0x50, 0xf6, 0x36, 0x32, 0x4a, 0x9b, 0x7f, 0x80],
-        [0xa8, 0x46, 0x8e, 0xe3, 0xbc, 0x18, 0xf0, 0x6d],
-        [0xa2, 0xdc, 0x9e, 0x92, 0xfd, 0x3c, 0xde, 0x92],
-        [0xca, 0xc0, 0x9f, 0x79, 0x7d, 0x03, 0x12, 0x87],
-        [0x90, 0xba, 0x68, 0x0b, 0x22, 0xae, 0xb5, 0x25],
-        [0xce, 0x7a, 0x24, 0xf3, 0x50, 0xe2, 0x80, 0xb6],
-        [0x88, 0x2b, 0xff, 0x0a, 0xa0, 0x1a, 0x0b, 0x87],
-        [0x25, 0x61, 0x02, 0x88, 0x92, 0x45, 0x11, 0xc2],
-        [0xc7, 0x15, 0x16, 0xc2, 0x9c, 0x75, 0xd1, 0x70],
-        [0x51, 0x99, 0xc2, 0x9a, 0x52, 0xc9, 0xf0, 0x59],
-        [0xc2, 0x2f, 0x0a, 0x29, 0x4a, 0x71, 0xf2, 0x9f],
-        [0xee, 0x37, 0x14, 0x83, 0x71, 0x4c, 0x02, 0xea],
-        [0xa8, 0x1f, 0xbd, 0x44, 0x8f, 0x9e, 0x52, 0x2f],
-        [0x4f, 0x64, 0x4c, 0x92, 0xe1, 0x92, 0xdf, 0xed],
-        [0x1a, 0xfa, 0x9a, 0x66, 0xa6, 0xdf, 0x92, 0xae],
-        [0xb3, 0xc1, 0xcc, 0x71, 0x5c, 0xb8, 0x79, 0xd8],
-        [0x19, 0xd0, 0x32, 0xe6, 0x4a, 0xb0, 0xbd, 0x8b],
-        [0x3c, 0xfa, 0xa7, 0xa7, 0xdc, 0x87, 0x20, 0xdc],
-        [0xb7, 0x26, 0x5f, 0x7f, 0x44, 0x7a, 0xc6, 0xf3],
-        [0x9d, 0xb7, 0x3b, 0x3c, 0x0d, 0x16, 0x3f, 0x54],
-        [0x81, 0x81, 0xb6, 0x5b, 0xab, 0xf4, 0xa9, 0x75],
-        [0x93, 0xc9, 0xb6, 0x40, 0x42, 0xea, 0xa2, 0x40],
-        [0x55, 0x70, 0x53, 0x08, 0x29, 0x70, 0x55, 0x92],
-        [0x86, 0x38, 0x80, 0x9e, 0x87, 0x87, 0x87, 0xa0],
-        [0x41, 0xb9, 0xa7, 0x9a, 0xf7, 0x9a, 0xc2, 0x08],
-        [0x7a, 0x9b, 0xe4, 0x2f, 0x20, 0x09, 0xa8, 0x92],
-        [0x29, 0x03, 0x8d, 0x56, 0xba, 0x6d, 0x27, 0x45],
-        [0x54, 0x95, 0xc6, 0xab, 0xf1, 0xe5, 0xdf, 0x51],
-        [0xae, 0x13, 0xdb, 0xd5, 0x61, 0x48, 0x89, 0x33],
-        [0x02, 0x4d, 0x1f, 0xfa, 0x89, 0x04, 0xe3, 0x89],
-        [0xd1, 0x39, 0x97, 0x12, 0xf9, 0x9b, 0xf0, 0x2e],
-        [0x14, 0xc1, 0xd7, 0xc1, 0xcf, 0xfe, 0xc7, 0x9e],
-        [0x1d, 0xe5, 0x27, 0x9d, 0xae, 0x3b, 0xed, 0x6f],
-        [0xe9, 0x41, 0xa3, 0x3f, 0x85, 0x50, 0x13, 0x03],
-        [0xda, 0x99, 0xdb, 0xbc, 0x9a, 0x03, 0xf3, 0x79],
-        [0xb7, 0xfc, 0x92, 0xf9, 0x1d, 0x8e, 0x92, 0xe9],
-        [0xae, 0x8e, 0x5c, 0xaa, 0x3c, 0xa0, 0x4e, 0x85],
-        [0x9c, 0xc6, 0x2d, 0xf4, 0x3b, 0x6e, 0xed, 0x74],
-        [0xd8, 0x63, 0xdb, 0xb5, 0xc5, 0x9a, 0x91, 0xa0],
-        [0xa1, 0xab, 0x21, 0x90, 0x54, 0x5b, 0x91, 0xd7],
-        [0x08, 0x75, 0x04, 0x1e, 0x64, 0xc5, 0x70, 0xf7],
-        [0x5a, 0x59, 0x45, 0x28, 0xbe, 0xbe, 0xf1, 0xcc],
-        [0xfc, 0xdb, 0x32, 0x91, 0xde, 0x21, 0xf0, 0xc0],
-        [0x86, 0x9e, 0xfd, 0x7f, 0x9f, 0x26, 0x5a, 0x09],
-    ];
-
-    // Data permutation test. Encrypt.
-    ubyte[8][2][32] desTestVectors3 = [
-        [[0x10, 0x46, 0x91, 0x34, 0x89, 0x98, 0x01, 0x31], [0x88, 0xd5, 0x5e, 0x54, 0xf5, 0x4c, 0x97, 0xb4]],
-        [[0x10, 0x07, 0x10, 0x34, 0x89, 0x98, 0x80, 0x20], [0x0c, 0x0c, 0xc0, 0x0c, 0x83, 0xea, 0x48, 0xfd]],
-        [[0x10, 0x07, 0x10, 0x34, 0xc8, 0x98, 0x01, 0x20], [0x83, 0xbc, 0x8e, 0xf3, 0xa6, 0x57, 0x01, 0x83]],
-        [[0x10, 0x46, 0x10, 0x34, 0x89, 0x98, 0x80, 0x20], [0xdf, 0x72, 0x5d, 0xca, 0xd9, 0x4e, 0xa2, 0xe9]],
-        [[0x10, 0x86, 0x91, 0x15, 0x19, 0x19, 0x01, 0x01], [0xe6, 0x52, 0xb5, 0x3b, 0x55, 0x0b, 0xe8, 0xb0]],
-        [[0x10, 0x86, 0x91, 0x15, 0x19, 0x58, 0x01, 0x01], [0xaf, 0x52, 0x71, 0x20, 0xc4, 0x85, 0xcb, 0xb0]],
-        [[0x51, 0x07, 0xb0, 0x15, 0x19, 0x58, 0x01, 0x01], [0x0f, 0x04, 0xce, 0x39, 0x3d, 0xb9, 0x26, 0xd5]],
-        [[0x10, 0x07, 0xb0, 0x15, 0x19, 0x19, 0x01, 0x01], [0xc9, 0xf0, 0x0f, 0xfc, 0x74, 0x07, 0x90, 0x67]],
-        [[0x31, 0x07, 0x91, 0x54, 0x98, 0x08, 0x01, 0x01], [0x7c, 0xfd, 0x82, 0xa5, 0x93, 0x25, 0x2b, 0x4e]],
-        [[0x31, 0x07, 0x91, 0x94, 0x98, 0x08, 0x01, 0x01], [0xcb, 0x49, 0xa2, 0xf9, 0xe9, 0x13, 0x63, 0xe3]],
-        [[0x10, 0x07, 0x91, 0x15, 0xb9, 0x08, 0x01, 0x40], [0x00, 0xb5, 0x88, 0xbe, 0x70, 0xd2, 0x3f, 0x56]],
-        [[0x31, 0x07, 0x91, 0x15, 0x98, 0x08, 0x01, 0x40], [0x40, 0x6a, 0x9a, 0x6a, 0xb4, 0x33, 0x99, 0xae]],
-        [[0x10, 0x07, 0xd0, 0x15, 0x89, 0x98, 0x01, 0x01], [0x6c, 0xb7, 0x73, 0x61, 0x1d, 0xca, 0x9a, 0xda]],
-        [[0x91, 0x07, 0x91, 0x15, 0x89, 0x98, 0x01, 0x01], [0x67, 0xfd, 0x21, 0xc1, 0x7d, 0xbb, 0x5d, 0x70]],
-        [[0x91, 0x07, 0xd0, 0x15, 0x89, 0x19, 0x01, 0x01], [0x95, 0x92, 0xcb, 0x41, 0x10, 0x43, 0x07, 0x87]],
-        [[0x10, 0x07, 0xd0, 0x15, 0x98, 0x98, 0x01, 0x20], [0xa6, 0xb7, 0xff, 0x68, 0xa3, 0x18, 0xdd, 0xd3]],
-        [[0x10, 0x07, 0x94, 0x04, 0x98, 0x19, 0x01, 0x01], [0x4d, 0x10, 0x21, 0x96, 0xc9, 0x14, 0xca, 0x16]],
-        [[0x01, 0x07, 0x91, 0x04, 0x91, 0x19, 0x04, 0x01], [0x2d, 0xfa, 0x9f, 0x45, 0x73, 0x59, 0x49, 0x65]],
-        [[0x01, 0x07, 0x91, 0x04, 0x91, 0x19, 0x01, 0x01], [0xb4, 0x66, 0x04, 0x81, 0x6c, 0x0e, 0x07, 0x74]],
-        [[0x01, 0x07, 0x94, 0x04, 0x91, 0x19, 0x04, 0x01], [0x6e, 0x7e, 0x62, 0x21, 0xa4, 0xf3, 0x4e, 0x87]],
-        [[0x19, 0x07, 0x92, 0x10, 0x98, 0x1a, 0x01, 0x01], [0xaa, 0x85, 0xe7, 0x46, 0x43, 0x23, 0x31, 0x99]],
-        [[0x10, 0x07, 0x91, 0x19, 0x98, 0x19, 0x08, 0x01], [0x2e, 0x5a, 0x19, 0xdb, 0x4d, 0x19, 0x62, 0xd6]],
-        [[0x10, 0x07, 0x91, 0x19, 0x98, 0x1a, 0x08, 0x01], [0x23, 0xa8, 0x66, 0xa8, 0x09, 0xd3, 0x08, 0x94]],
-        [[0x10, 0x07, 0x92, 0x10, 0x98, 0x19, 0x01, 0x01], [0xd8, 0x12, 0xd9, 0x61, 0xf0, 0x17, 0xd3, 0x20]],
-        [[0x10, 0x07, 0x91, 0x15, 0x98, 0x19, 0x01, 0x0b], [0x05, 0x56, 0x05, 0x81, 0x6e, 0x58, 0x60, 0x8f]],
-        [[0x10, 0x04, 0x80, 0x15, 0x98, 0x19, 0x01, 0x01], [0xab, 0xd8, 0x8e, 0x8b, 0x1b, 0x77, 0x16, 0xf1]],
-        [[0x10, 0x04, 0x80, 0x15, 0x98, 0x19, 0x01, 0x02], [0x53, 0x7a, 0xc9, 0x5b, 0xe6, 0x9d, 0xa1, 0xe1]],
-        [[0x10, 0x04, 0x80, 0x15, 0x98, 0x19, 0x01, 0x08], [0xae, 0xd0, 0xf6, 0xae, 0x3c, 0x25, 0xcd, 0xd8]],
-        [[0x10, 0x02, 0x91, 0x14, 0x98, 0x10, 0x01, 0x04], [0xb3, 0xe3, 0x5a, 0x5e, 0xe5, 0x3e, 0x7b, 0x8d]],
-        [[0x10, 0x02, 0x91, 0x15, 0x98, 0x19, 0x01, 0x04], [0x61, 0xc7, 0x9c, 0x71, 0x92, 0x1a, 0x2e, 0xf8]],
-        [[0x10, 0x02, 0x91, 0x15, 0x98, 0x10, 0x02, 0x01], [0xe2, 0xf5, 0x72, 0x8f, 0x09, 0x95, 0x01, 0x3c]],
-        [[0x10, 0x02, 0x91, 0x16, 0x98, 0x10, 0x01, 0x01], [0x1a, 0xea, 0xc3, 0x9a, 0x61, 0xf0, 0xa4, 0x64]],
-    ];
-
-    // S-Box test. Encrypt.
-    ubyte[8][3][19] desTestVectors4 = [
-        [[0x7c, 0xa1, 0x10, 0x45, 0x4a, 0x1a, 0x6e, 0x57], [0x01, 0xa1, 0xd6, 0xd0, 0x39, 0x77, 0x67, 0x42],
-        [0x69, 0x0f, 0x5b, 0x0d, 0x9a, 0x26, 0x93, 0x9b]],
-        [[0x01, 0x31, 0xd9, 0x61, 0x9d, 0xc1, 0x37, 0x6e], [0x5c, 0xd5, 0x4c, 0xa8, 0x3d, 0xef, 0x57, 0xda],
-        [0x7a, 0x38, 0x9d, 0x10, 0x35, 0x4b, 0xd2, 0x71]],
-        [[0x07, 0xa1, 0x13, 0x3e, 0x4a, 0x0b, 0x26, 0x86], [0x02, 0x48, 0xd4, 0x38, 0x06, 0xf6, 0x71, 0x72],
-        [0x86, 0x8e, 0xbb, 0x51, 0xca, 0xb4, 0x59, 0x9a]],
-        [[0x38, 0x49, 0x67, 0x4c, 0x26, 0x02, 0x31, 0x9e], [0x51, 0x45, 0x4b, 0x58, 0x2d, 0xdf, 0x44, 0x0a],
-        [0x71, 0x78, 0x87, 0x6e, 0x01, 0xf1, 0x9b, 0x2a]],
-        [[0x04, 0xb9, 0x15, 0xba, 0x43, 0xfe, 0xb5, 0xb6], [0x42, 0xfd, 0x44, 0x30, 0x59, 0x57, 0x7f, 0xa2],
-        [0xaf, 0x37, 0xfb, 0x42, 0x1f, 0x8c, 0x40, 0x95]],
-        [[0x01, 0x13, 0xb9, 0x70, 0xfd, 0x34, 0xf2, 0xce], [0x05, 0x9b, 0x5e, 0x08, 0x51, 0xcf, 0x14, 0x3a],
-        [0x86, 0xa5, 0x60, 0xf1, 0x0e, 0xc6, 0xd8, 0x5b]],
-        [[0x01, 0x70, 0xf1, 0x75, 0x46, 0x8f, 0xb5, 0xe6], [0x07, 0x56, 0xd8, 0xe0, 0x77, 0x47, 0x61, 0xd2],
-        [0x0c, 0xd3, 0xda, 0x02, 0x00, 0x21, 0xdc, 0x09]],
-        [[0x43, 0x29, 0x7f, 0xad, 0x38, 0xe3, 0x73, 0xfe], [0x76, 0x25, 0x14, 0xb8, 0x29, 0xbf, 0x48, 0x6a],
-        [0xea, 0x67, 0x6b, 0x2c, 0xb7, 0xdb, 0x2b, 0x7a]],
-        [[0x07, 0xa7, 0x13, 0x70, 0x45, 0xda, 0x2a, 0x16], [0x3b, 0xdd, 0x11, 0x90, 0x49, 0x37, 0x28, 0x02],
-        [0xdf, 0xd6, 0x4a, 0x81, 0x5c, 0xaf, 0x1a, 0x0f]],
-        [[0x04, 0x68, 0x91, 0x04, 0xc2, 0xfd, 0x3b, 0x2f], [0x26, 0x95, 0x5f, 0x68, 0x35, 0xaf, 0x60, 0x9a],
-        [0x5c, 0x51, 0x3c, 0x9c, 0x48, 0x86, 0xc0, 0x88]],
-        [[0x37, 0xd0, 0x6b, 0xb5, 0x16, 0xcb, 0x75, 0x46], [0x16, 0x4d, 0x5e, 0x40, 0x4f, 0x27, 0x52, 0x32],
-        [0x0a, 0x2a, 0xee, 0xae, 0x3f, 0xf4, 0xab, 0x77]],
-        [[0x1f, 0x08, 0x26, 0x0d, 0x1a, 0xc2, 0x46, 0x5e], [0x6b, 0x05, 0x6e, 0x18, 0x75, 0x9f, 0x5c, 0xca],
-        [0xef, 0x1b, 0xf0, 0x3e, 0x5d, 0xfa, 0x57, 0x5a]],
-        [[0x58, 0x40, 0x23, 0x64, 0x1a, 0xba, 0x61, 0x76], [0x00, 0x4b, 0xd6, 0xef, 0x09, 0x17, 0x60, 0x62],
-        [0x88, 0xbf, 0x0d, 0xb6, 0xd7, 0x0d, 0xee, 0x56]],
-        [[0x02, 0x58, 0x16, 0x16, 0x46, 0x29, 0xb0, 0x07], [0x48, 0x0d, 0x39, 0x00, 0x6e, 0xe7, 0x62, 0xf2],
-        [0xa1, 0xf9, 0x91, 0x55, 0x41, 0x02, 0x0b, 0x56]],
-        [[0x49, 0x79, 0x3e, 0xbc, 0x79, 0xb3, 0x25, 0x8f], [0x43, 0x75, 0x40, 0xc8, 0x69, 0x8f, 0x3c, 0xfa],
-        [0x6f, 0xbf, 0x1c, 0xaf, 0xcf, 0xfd, 0x05, 0x56]],
-        [[0x4f, 0xb0, 0x5e, 0x15, 0x15, 0xab, 0x73, 0xa7], [0x07, 0x2d, 0x43, 0xa0, 0x77, 0x07, 0x52, 0x92],
-        [0x2f, 0x22, 0xe4, 0x9b, 0xab, 0x7c, 0xa1, 0xac]],
-        [[0x49, 0xe9, 0x5d, 0x6d, 0x4c, 0xa2, 0x29, 0xbf], [0x02, 0xfe, 0x55, 0x77, 0x81, 0x17, 0xf1, 0x2a],
-        [0x5a, 0x6b, 0x61, 0x2c, 0xc2, 0x6c, 0xce, 0x4a]],
-        [[0x01, 0x83, 0x10, 0xdc, 0x40, 0x9b, 0x26, 0xd6], [0x1d, 0x9d, 0x5c, 0x50, 0x18, 0xf7, 0x28, 0xc2],
-        [0x5f, 0x4c, 0x03, 0x8e, 0xd1, 0x2b, 0x2e, 0x41]],
-        [[0x1c, 0x58, 0x7f, 0x1c, 0x13, 0x92, 0x4f, 0xef], [0x30, 0x55, 0x32, 0x28, 0x6d, 0x6f, 0x29, 0x5a],
-        [0x63, 0xfa, 0xc0, 0xd0, 0x34, 0xd9, 0xf7, 0x93]],
-    ];
-}
-
-///
-unittest
-{
-    auto des = scoped!(DES!1);
-    ubyte[8] key = [0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01];
-    ubyte[8] plain = [0x80, 0, 0, 0, 0, 0, 0, 0];
-    ubyte[8] cipher;
-
-    des.key = key;
-    foreach (ubyte i; 0..64)
-    {
-        if (i != 0)
-        {
-            plain[i / 8] = i % 8 ? plain[i / 8] >> 1 : 0x80;
-            if (i % 8 == 0)
-            {
-                plain[i / 8 - 1] = 0;
-            }
-        }
-        // Initial Permutation and Expansion test.
-        des.encrypt(plain, cipher);
-        assert(cipher == desTestVectors1[i]);
-
-        // Inverse Permutation and Expansion test.
-        des.encrypt(cipher, cipher);
-        assert(cipher == plain);
-    }
-
-    plain[0..$] = 0;
-    foreach (ubyte i; 0..56)
-    {
-        key[i / 7] = i % 7 ? key[i / 7] >> 1 : 0x80;
-        if (i % 7 == 0 && i != 0)
-        {
-            key[i / 7 - 1] = 0x01;
-        }
-        des.key = key;
-
-        // Initial Permutation and Expansion test.
-        des.encrypt(plain, cipher);
-        assert(cipher == desTestVectors2[i]);
-
-        // Test of right-shifts in Decryption.
-        des.decrypt(desTestVectors2[i], cipher);
-        assert(cipher == plain);
-    }
-
-    // Data permutation test.
-    plain[0..$] = 0;
-    foreach (i; desTestVectors3)
-    {
-        des.key = i[0];
-        des.encrypt(plain, cipher);
-        assert(cipher == i[1]);
-    }
-
-    // S-Box test.
-    foreach (i; desTestVectors4)
-    {
-        des.key = i[0];
-        des.encrypt(i[1], cipher);
-        assert(cipher == i[2]);
-    }
-}

source/tanya/crypto/mode.d

@@ -1,279 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Block cipher modes of operation.
- *
- * Copyright: Eugene Wissner 2016.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
- */
-module tanya.crypto.mode;
-
-import tanya.memory;
-import std.algorithm.iteration;
-import std.typecons;
-
-/**
- * Supported padding mode.
- *
- * See_Also:
- * 	$(D_PSYMBOL pad)
- */
-enum PaddingMode
-{
-	zero,
-	pkcs7,
-	ansiX923,
-}
-
-/**
- * Params:
- * 	input     = Sequence that should be padded.
- * 	mode      = Padding mode.
- * 	blockSize = Block size.
- * 	allocator = Allocator was used to allocate $(D_PARAM input).
- *
- * Returns: The function modifies the initial array and returns it.
- *
- * See_Also:
- * 	$(D_PSYMBOL PaddingMode)
- */
-ubyte[] pad(ref ubyte[] input,
-            in PaddingMode mode,
-            in ushort blockSize,
-            shared Allocator allocator = defaultAllocator)
-in
-{
-	assert(blockSize > 0 && blockSize <= 256);
-	assert(blockSize % 64 == 0);
-	assert(input.length > 0);
-}
-body
-{
-	immutable rest = cast(ubyte) input.length % blockSize;
-	immutable size_t lastBlock = input.length - (rest > 0 ? rest : blockSize);
-	immutable needed = cast(ubyte) (rest > 0 ? blockSize - rest : 0);
-
-	final switch (mode) with (PaddingMode)
-	{
-		case zero:
-			allocator.resizeArray(input, input.length + needed);
-			break;
-		case pkcs7:
-			if (needed)
-			{
-				allocator.resizeArray(input, input.length + needed);
-				input[input.length - needed ..$].each!((ref e) => e = needed);
-			}
-			else
-			{
-				allocator.resizeArray(input, input.length + blockSize);
-			}
-			break;
-		case ansiX923:
-			allocator.resizeArray(input, input.length + (needed ? needed : blockSize));
-			input[$ - 1] = needed;
-			break;
-	}
-
-	return input;
-}
-
-///
-unittest
-{
-	{ // Zeros
-		auto input = defaultAllocator.makeArray!ubyte(50);
-
-		pad(input, PaddingMode.zero, 64);
-		assert(input.length == 64);
-
-		pad(input, PaddingMode.zero, 64);
-		assert(input.length == 64);
-		assert(input[63] == 0);
-
-		defaultAllocator.dispose(input);
-	}
-	{ // PKCS#7
-		auto input = defaultAllocator.makeArray!ubyte(50);
-		for (ubyte i; i < 40; ++i)
-		{
-			input[i] = i;
-		}
-
-		pad(input, PaddingMode.pkcs7, 64);
-		assert(input.length == 64);
-		for (ubyte i; i < 64; ++i)
-		{
-			if (i >= 40 && i < 50)
-			{
-				assert(input[i] == 0);
-			}
-			else if (i >= 50)
-			{
-				assert(input[i] == 14);
-			}
-			else
-			{
-				assert(input[i] == i);
-			}
-		}
-
-		pad(input, PaddingMode.pkcs7, 64);
-		assert(input.length == 128);
-		for (ubyte i; i < 128; ++i)
-		{
-			if (i >= 64 || (i >= 40 && i < 50))
-			{
-				assert(input[i] == 0);
-			}
-			else if (i >= 50 && i < 64)
-			{
-				assert(input[i] == 14);
-			}
-			else
-			{
-				assert(input[i] == i);
-			}
-		}
-
-		defaultAllocator.dispose(input);
-	}
-	{ // ANSI X.923
-		auto input = defaultAllocator.makeArray!ubyte(50);
-		for (ubyte i; i < 40; ++i)
-		{
-			input[i] = i;
-		}
-
-		pad(input, PaddingMode.ansiX923, 64);
-		assert(input.length == 64);
-		for (ubyte i; i < 64; ++i)
-		{
-			if (i < 40)
-			{
-				assert(input[i] == i);
-			}
-			else if (i == 63)
-			{
-				assert(input[i] == 14);
-			}
-			else
-			{
-				assert(input[i] == 0);
-			}
-		}
-
-		pad(input, PaddingMode.pkcs7, 64);
-		assert(input.length == 128);
-		for (ubyte i = 0; i < 128; ++i)
-		{
-			if (i < 40)
-			{
-				assert(input[i] == i);
-			}
-			else if (i == 63)
-			{
-				assert(input[i] == 14);
-			}
-			else
-			{
-				assert(input[i] == 0);
-			}
-		}
-
-		defaultAllocator.dispose(input);
-	}
-}
-
-/**
- * Params:
- * 	input     = Sequence that should be padded.
- * 	mode      = Padding mode.
- * 	blockSize = Block size.
- * 	allocator = Allocator was used to allocate $(D_PARAM input).
- *
- * Returns: The function modifies the initial array and returns it.
- *
- * See_Also:
- * 	$(D_PSYMBOL pad)
- */
-ref ubyte[] unpad(ref ubyte[] input,
-                  in PaddingMode mode,
-                  in ushort blockSize,
-                  shared Allocator allocator = defaultAllocator)
-in
-{
-	assert(input.length != 0);
-	assert(input.length % 64 == 0);
-}
-body
-{
-	final switch (mode) with (PaddingMode)
-	{
-		case zero:
-			break;
-		case pkcs7:
-		case ansiX923:
-			immutable last = input[$ - 1];
-
-			allocator.resizeArray(input, input.length - (last ? last : blockSize));
-			break;
-	}
-
-	return input;
-}
-
-///
-unittest
-{
-	{ // Zeros
-		auto input = defaultAllocator.makeArray!ubyte(50);
-		auto inputDup = defaultAllocator.makeArray!ubyte(50);
-
-		pad(input, PaddingMode.zero, 64);
-		pad(inputDup, PaddingMode.zero, 64);
-
-		unpad(input, PaddingMode.zero, 64);
-		assert(input == inputDup);
-
-		defaultAllocator.dispose(input);
-		defaultAllocator.dispose(inputDup);
-
-	}
-	{ // PKCS#7
-		auto input = defaultAllocator.makeArray!ubyte(50);
-		auto inputDup = defaultAllocator.makeArray!ubyte(50);
-		for (ubyte i; i < 40; ++i)
-		{
-			input[i] = i;
-			inputDup[i] = i;
-		}
-
-		pad(input, PaddingMode.pkcs7, 64);
-		unpad(input, PaddingMode.pkcs7, 64);
-		assert(input == inputDup);
-
-		defaultAllocator.dispose(input);
-		defaultAllocator.dispose(inputDup);
-	}
-	{ // ANSI X.923
-		auto input = defaultAllocator.makeArray!ubyte(50);
-		auto inputDup = defaultAllocator.makeArray!ubyte(50);
-		for (ubyte i; i < 40; ++i)
-		{
-			input[i] = i;
-			inputDup[i] = i;
-		}
-
-		pad(input, PaddingMode.pkcs7, 64);
-		unpad(input, PaddingMode.pkcs7, 64);
-		assert(input == inputDup);
-
-		defaultAllocator.dispose(input);
-		defaultAllocator.dispose(inputDup);
-	}
-}

source/tanya/crypto/package.d

@@ -1,16 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Copyright: Eugene Wissner 2016.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
- */
-module tanya.crypto;
-
-public import tanya.crypto.bit;
-public import tanya.crypto.des;
-public import tanya.crypto.mode;
-public import tanya.crypto.symmetric;

source/tanya/crypto/symmetric.d

@@ -1,177 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Interfaces for implementing secret key algorithms.
- *
- * Copyright: Eugene Wissner 2016.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
- */
-module tanya.crypto.symmetric;
-
-/**
- * Implemented by secret key algorithms.
- */
-interface SymmetricCipher
-{
-    /**
-     * Returns: Key length.
-     */
-    @property inout(uint) keyLength() inout const pure nothrow @safe @nogc;
-
-    /**
-     * Returns: Minimum key length.
-     */
-    @property inout(uint) minKeyLength() inout const pure nothrow @safe @nogc;
-
-    /**
-     * Returns: Maximum key length.
-     */
-    @property inout(uint) maxKeyLength() inout const pure nothrow @safe @nogc;
-
-    /// Cipher direction.
-    protected enum Direction : ushort
-    {
-        encryption,
-        decryption,
-    }
-
-    /**
-     * Params:
-     *     key = Key.
-     */
-    @property void key(ubyte[] key) pure nothrow @safe @nogc
-    in
-    {
-        assert(key.length >= minKeyLength);
-        assert(key.length <= maxKeyLength);
-    }
-}
-
-/**
- * Implemented by block ciphers.
- */
-interface BlockCipher : SymmetricCipher
-{
-    /**
-     * Returns: Block size.
-     */
-    @property inout(uint) blockSize() inout const pure nothrow @safe @nogc;
-
-    /**
-     * Encrypts a block.
-     *
-     * Params:
-     *    plain  = Plain text, input.
-     *    cipher = Cipher text, output.
-     */
-    void encrypt(in ubyte[] plain, ubyte[] cipher)
-    in
-    {
-        assert(plain.length == blockSize);
-        assert(cipher.length == blockSize);
-    }
-
-    /**
-     * Decrypts a block.
-     *
-     * Params:
-     *    cipher = Cipher text, input.
-     *    plain  = Plain text, output.
-     */
-    void decrypt(in ubyte[] cipher, ubyte[] plain)
-    in
-    {
-        assert(plain.length == blockSize);
-        assert(cipher.length == blockSize);
-    }
-}
-
-/**
- * Mixed in by algorithms with fixed block size.
- *
- * Params:
- *     N = Block size.
- */
-mixin template FixedBlockSize(uint N)
-    if (N != 0)
-{
-    private enum uint blockSize_ = N;
-
-    /**
-     * Returns: Fixed block size.
-     */
-    final @property inout(uint) blockSize() inout const pure nothrow @safe @nogc
-    {
-        return blockSize_;
-    }
-}
-
-/**
- * Mixed in by symmetric algorithms.
- * If $(D_PARAM Min) equals $(D_PARAM Max) fixed key length is assumed.
- *
- * Params:
- *     Min = Minimum key length.
- *     Max = Maximum key length.
- */
-mixin template KeyLength(uint Min, uint Max = Min)
-    if (Min != 0 && Max != 0)
-{
-    static if (Min == Max)
-    {
-        private enum uint keyLength_ = Min;
-
-        /**
-         * Returns: Key length.
-         */
-        final @property inout(uint) keyLength() inout const pure nothrow @safe @nogc
-        {
-            return keyLength_;
-        }
-
-        /**
-         * Returns: Minimum key length.
-         */
-        final @property inout(uint) minKeyLength() inout const pure nothrow @safe @nogc
-        {
-            return keyLength_;
-        }
-
-        /**
-         * Returns: Maximum key length.
-         */
-        final @property inout(uint) maxKeyLength() inout const pure nothrow @safe @nogc
-        {
-            return keyLength_;
-        }
-    }
-    else static if (Min < Max)
-    {
-        private enum uint minKeyLength_ = Min;
-        private enum uint maxKeyLength_ = Max;
-
-        /**
-         * Returns: Minimum key length.
-         */
-        final @property inout(uint) minKeyLength() inout const pure nothrow @safe @nogc
-        {
-            return minKeyLength_;
-        }
-
-        /**
-         * Returns: Maximum key length.
-         */
-        final @property inout(uint) maxKeyLength() inout const pure nothrow @safe @nogc
-        {
-            return maxKeyLength_;
-        }
-    }
-    else
-    {
-        static assert(false, "Max should be larger or equal to Min");
-    }
-}

source/tanya/math/package.d

@@ -3,11 +3,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- */  
+ */
 module tanya.math;
 
 import std.traits;
@@ -16,7 +16,7 @@ public import tanya.math.random;
 
 version (unittest)
 {
-	import std.algorithm.iteration;
+    import std.algorithm.iteration;
 }
 
 /**
@@ -26,12 +26,12 @@ version (unittest)
  * is used to allocate the result.
  *
  * Params:
- * 	I = Base type.
+ *  I = Base type.
- * 	G = Exponent type.
+ *  G = Exponent type.
- * 	H = Divisor type:
+ *  H = Divisor type:
- * 	x = Base.
+ *  x = Base.
- * 	y = Exponent.
+ *  y = Exponent.
- * 	z = Divisor.
+ *  z = Divisor.
  *
  * Returns: Reminder of the division of $(D_PARAM x) to the power $(D_PARAM y)
  *          by $(D_PARAM z).
@@ -39,134 +39,162 @@ version (unittest)
  * Precondition: $(D_INLINECODE z > 0)
  */
 H pow(I, G, H)(in auto ref I x, in auto ref G y, in auto ref H z)
-	if (isIntegral!I && isIntegral!G && isIntegral!H)
+    if (isIntegral!I && isIntegral!G && isIntegral!H)
 in
 {
-	assert(z > 0, "Division by zero.");
+    assert(z > 0, "Division by zero.");
 }
 body
 {
-	G mask = G.max / 2 + 1;
+    G mask = G.max / 2 + 1;
-	H result;
+    H result;
 
-	if (y == 0)
+    if (y == 0)
-	{
+    {
-		return 1 % z;
+        return 1 % z;
-	}
+    }
-	else if (y == 1)
+    else if (y == 1)
-	{
+    {
-		return x % z;
+        return x % z;
-	}
+    }
-	do
+    do
-	{
+    {
-		immutable bit = y & mask;
+        immutable bit = y & mask;
-		if (!result && bit)
+        if (!result && bit)
-		{
+        {
-			result = x;
+            result = x;
-			continue;
+            continue;
-		}
+        }
 
-		result *= result;
+        result *= result;
-		if (bit)
+        if (bit)
-		{
+        {
-			result *= x;
+            result *= x;
-		}
+        }
-		result %= z;
+        result %= z;
-	}
+    }
-	while (mask >>= 1);
+    while (mask >>= 1);
 
-	return result;
+    return result;
 }
 
 /// Ditto.
-I pow(I)(in auto ref I x, in auto ref I y, in auto ref I z)
+I pow(I)(const auto ref I x, const auto ref I y, const auto ref I z)
-	if (is(I == Integer))
+    if (is(I == Integer))
 in
 {
-	assert(z.length > 0, "Division by zero.");
+    assert(z.length > 0, "Division by zero.");
 }
 body
 {
-	size_t i = y.length;
+    size_t i = y.length;
-	auto tmp2 = Integer(x.allocator), tmp1 = Integer(x, x.allocator);
+    auto tmp1 = Integer(x, x.allocator);
-	Integer result = Integer(x.allocator);
+    auto result = Integer(x.allocator);
 
-	if (x.length == 0 && i != 0)
+    if (x.length == 0 && i != 0)
-	{
+    {
-		i = 0;
+        i = 0;
-	}
+    }
-	else
+    else
-	{
+    {
-		result = 1;
+        result = 1;
-	}
+    }
-	while (i)
+    while (i)
-	{
+    {
-		--i;
+        --i;
-		for (ubyte mask = 0x01; mask; mask <<= 1)
+        for (ubyte mask = 0x01; mask; mask <<= 1)
-		{
+        {
-			if (y.rep[i] & mask)
+            if (y.rep[i] & mask)
-			{
+            {
-				result *= tmp1;
+                result *= tmp1;
-				result %= z;
+                result %= z;
-			}
+            }
-			tmp2 = tmp1;
+            auto tmp2 = tmp1;
-			tmp1 *= tmp2;
+            tmp1 *= tmp2;
-			tmp1 %= z;
+            tmp1 %= z;
-		}
+        }
-	}
+    }
-	return result;
+    return result;
 }
 
 ///
 pure nothrow @safe @nogc unittest
 {
-	assert(pow(3, 5, 7) == 5);
+    assert(pow(3, 5, 7) == 5);
-	assert(pow(2, 2, 1) == 0);
+    assert(pow(2, 2, 1) == 0);
-	assert(pow(3, 3, 3) == 0);
+    assert(pow(3, 3, 3) == 0);
-	assert(pow(7, 4, 2) == 1);
+    assert(pow(7, 4, 2) == 1);
-	assert(pow(53, 0, 2) == 1);
+    assert(pow(53, 0, 2) == 1);
-	assert(pow(53, 1, 3) == 2);
+    assert(pow(53, 1, 3) == 2);
-	assert(pow(53, 2, 5) == 4);
+    assert(pow(53, 2, 5) == 4);
-	assert(pow(0, 0, 5) == 1);
+    assert(pow(0, 0, 5) == 1);
-	assert(pow(0, 5, 5) == 0);
+    assert(pow(0, 5, 5) == 0);
 }
 
 ///
 unittest
 {
-	assert(cast(long) pow(Integer(3), Integer(5), Integer(7)) == 5);
+    assert(pow(Integer(3), Integer(5), Integer(7)) == 5);
-	assert(cast(long) pow(Integer(2), Integer(2), Integer(1)) == 0);
+    assert(pow(Integer(2), Integer(2), Integer(1)) == 0);
-	assert(cast(long) pow(Integer(3), Integer(3), Integer(3)) == 0);
+    assert(pow(Integer(3), Integer(3), Integer(3)) == 0);
-	assert(cast(long) pow(Integer(7), Integer(4), Integer(2)) == 1);
+    assert(pow(Integer(7), Integer(4), Integer(2)) == 1);
-	assert(cast(long) pow(Integer(53), Integer(0), Integer(2)) == 1);
+    assert(pow(Integer(53), Integer(0), Integer(2)) == 1);
-	assert(cast(long) pow(Integer(53), Integer(1), Integer(3)) == 2);
+    assert(pow(Integer(53), Integer(1), Integer(3)) == 2);
-	assert(cast(long) pow(Integer(53), Integer(2), Integer(5)) == 4);
+    assert(pow(Integer(53), Integer(2), Integer(5)) == 4);
-	assert(cast(long) pow(Integer(0), Integer(0), Integer(5)) == 1);
+    assert(pow(Integer(0), Integer(0), Integer(5)) == 1);
-	assert(cast(long) pow(Integer(0), Integer(5), Integer(5)) == 0);
+    assert(pow(Integer(0), Integer(5), Integer(5)) == 0);
 }
 
 /**
  * Checks if $(D_PARAM x) is a prime.
  *
  * Params:
- * 	x = The number should be checked.
+ *  x = The number should be checked.
  *
  * Returns: $(D_KEYWORD true) if $(D_PARAM x) is a prime number,
  *          $(D_KEYWORD false) otherwise.
  */
 bool isPseudoprime(ulong x) nothrow pure @safe @nogc
 {
-	return pow(2, x - 1, x) == 1;
+    return pow(2, x - 1, x) == 1;
 }
 
 ///
 unittest
 {
-	uint[30] known = [74623, 74653, 74687, 74699, 74707, 74713, 74717, 74719,
+    uint[30] known = [74623, 74653, 74687, 74699, 74707, 74713, 74717, 74719,
-	                  74843, 74747, 74759, 74761, 74771, 74779, 74797, 74821,
+                      74843, 74747, 74759, 74761, 74771, 74779, 74797, 74821,
-	                  74827, 9973, 104729, 15485867, 49979693, 104395303,
+                      74827, 9973, 104729, 15485867, 49979693, 104395303,
-	                  593441861, 104729, 15485867, 49979693, 104395303,
+                      593441861, 104729, 15485867, 49979693, 104395303,
-	                  593441861, 899809363, 982451653];
+                      593441861, 899809363, 982451653];
 
-	known.each!((ref x) => assert(isPseudoprime(x)));
+    known.each!((ref x) => assert(isPseudoprime(x)));
+}
+
+/**
+ * Params:
+ *  I = Value type.
+ *  x = Value.
+ *
+ * Returns: The absolute value of a number.
+ */
+I abs(I : Integer)(const auto ref I x)
+{
+    auto result = Integer(x, x.allocator);
+    result.sign = Sign.positive;
+    return result;
+}
+
+/// Ditto.
+I abs(I : Integer)(I x)
+{
+    x.sign = Sign.positive;
+    return x;
+}
+
+/// Ditto.
+I abs(I)(const I x)
+    if (isIntegral!I)
+{
+    return x >= 0 ? x : -x;
 }

source/tanya/math/random.d

@@ -8,8 +8,8 @@
  * Copyright: Eugene Wissner 2016.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- */  
+ */
 module tanya.math.random;
 
 import std.digest.sha;
@@ -27,20 +27,20 @@ enum maxGather = 128;
  */
 class EntropyException : Exception
 {
-	/**
+    /**
-	 * Params:
+     * Params:
-	 * 	msg  = Message to output.
+     *  msg  = Message to output.
-	 * 	file = The file where the exception occurred.
+     *  file = The file where the exception occurred.
-	 * 	line = The line number where the exception occurred.
+     *  line = The line number where the exception occurred.
-	 * 	next = The previous exception in the chain of exceptions, if any.
+     *  next = The previous exception in the chain of exceptions, if any.
-	 */
+     */
-	this(string msg,
+    this(string msg,
-	     string file = __FILE__,
+         string file = __FILE__,
-	     size_t line = __LINE__,
+         size_t line = __LINE__,
-	     Throwable next = null) pure @safe nothrow const @nogc
+         Throwable next = null) pure @safe nothrow const @nogc
-	{
+    {
-		super(msg, file, line, next);
+        super(msg, file, line, next);
-	}
+    }
 }
 
 /**
@@ -48,103 +48,103 @@ class EntropyException : Exception
  */
 abstract class EntropySource
 {
-	/// Amount of already generated entropy.
+    /// Amount of already generated entropy.
-	protected ushort size_;
+    protected ushort size_;
 
-	/**
+    /**
-	 * Returns: Minimum bytes required from the entropy source.
+     * Returns: Minimum bytes required from the entropy source.
-	 */
+     */
-	@property immutable(ubyte) threshold() const @safe pure nothrow;
+    @property immutable(ubyte) threshold() const @safe pure nothrow;
 
-	/**
+    /**
-	 * Returns: Whether this entropy source is strong.
+     * Returns: Whether this entropy source is strong.
-	 */
+     */
-	@property immutable(bool) strong() const @safe pure nothrow;
+    @property immutable(bool) strong() const @safe pure nothrow;
 
-	/**
+    /**
-	 * Returns: Amount of already generated entropy.
+     * Returns: Amount of already generated entropy.
-	 */
+     */
-	@property ushort size() const @safe pure nothrow
+    @property ushort size() const @safe pure nothrow
-	{
+    {
-		return size_;
+        return size_;
-	}
+    }
 
-	/**
+    /**
-	 * Params:
+     * Params:
-	 * 	size = Amount of already generated entropy. Cannot be smaller than the
+     *  size = Amount of already generated entropy. Cannot be smaller than the
-	 * 	       already set value.
+     *         already set value.
-	 */
+     */
-	@property void size(ushort size) @safe pure nothrow
+    @property void size(ushort size) @safe pure nothrow
-	{
+    {
-		size_ = size;
+        size_ = size;
-	}
+    }
 
-	/**
+    /**
-	 * Poll the entropy source.
+     * Poll the entropy source.
-	 *
+     *
-	 * Params:
+     * Params:
-	 * 	output = Buffer to save the generate random sequence (the method will
+     *  output = Buffer to save the generate random sequence (the method will
-	 * 	         to fill the buffer).
+     *           to fill the buffer).
-	 *
+     *
-	 * Returns: Number of bytes that were copied to the $(D_PARAM output)
+     * Returns: Number of bytes that were copied to the $(D_PARAM output)
-	 *          or $(D_PSYMBOL Nullable!ubyte.init) on error.
+     *          or $(D_PSYMBOL Nullable!ubyte.init) on error.
-	 */
+     */
-	Nullable!ubyte poll(out ubyte[maxGather] output);
+    Nullable!ubyte poll(out ubyte[maxGather] output);
 }
 
 version (linux)
 {
-	extern (C) long syscall(long number, ...) nothrow;
+    extern (C) long syscall(long number, ...) nothrow;
 
-	/**
+    /**
-	 * Uses getrandom system call.
+     * Uses getrandom system call.
-	 */
+     */
-	class PlatformEntropySource : EntropySource
+    class PlatformEntropySource : EntropySource
-	{
+    {
-		/**
+        /**
-		 * Returns: Minimum bytes required from the entropy source.
+         * Returns: Minimum bytes required from the entropy source.
-		 */
+         */
-		override @property immutable(ubyte) threshold() const @safe pure nothrow
+        override @property immutable(ubyte) threshold() const @safe pure nothrow
-		{
+        {
-			return 32;
+            return 32;
-		}
+        }
 
-		/**
+        /**
-		 * Returns: Whether this entropy source is strong.
+         * Returns: Whether this entropy source is strong.
-		 */
+         */
-		override @property immutable(bool) strong() const @safe pure nothrow
+        override @property immutable(bool) strong() const @safe pure nothrow
-		{
+        {
-			return true;
+            return true;
-		}
+        }
 
-		/**
+        /**
-		 * Poll the entropy source.
+         * Poll the entropy source.
-		 *
+         *
-		 * Params:
+         * Params:
-		 * 	output = Buffer to save the generate random sequence (the method will
+         *  output = Buffer to save the generate random sequence (the method will
-		 * 	         to fill the buffer).
+         *           to fill the buffer).
-		 *
+         *
-		 * Returns: Number of bytes that were copied to the $(D_PARAM output)
+         * Returns: Number of bytes that were copied to the $(D_PARAM output)
-		 *          or $(D_PSYMBOL Nullable!ubyte.init) on error.
+         *          or $(D_PSYMBOL Nullable!ubyte.init) on error.
-		 */
+         */
-		override Nullable!ubyte poll(out ubyte[maxGather] output) nothrow
+        override Nullable!ubyte poll(out ubyte[maxGather] output) nothrow
-		out (length)
+        out (length)
-		{
+        {
-			assert(length <= maxGather);
+            assert(length <= maxGather);
-		}
+        }
-		body
+        body
-		{
+        {
-			// int getrandom(void *buf, size_t buflen, unsigned int flags);
+            // int getrandom(void *buf, size_t buflen, unsigned int flags);
-			auto length = syscall(318, output.ptr, output.length, 0);
+            auto length = syscall(318, output.ptr, output.length, 0);
-			Nullable!ubyte ret;
+            Nullable!ubyte ret;
 
-			if (length >= 0)
+            if (length >= 0)
-			{
+            {
-				ret = cast(ubyte) length;
+                ret = cast(ubyte) length;
-			}
+            }
-			return ret;
+            return ret;
-		}
+        }
-	}
+    }
 }
 
 /**
@@ -156,165 +156,165 @@ version (linux)
  *
  * output = entropy.random;
  *
- * defaultAllocator.finalize(entropy);
+ * defaultAllocator.dispose(entropy);
  * ---
  */
 class Entropy
 {
-	/// Entropy sources.
+    /// Entropy sources.
-	protected EntropySource[] sources;
+    protected EntropySource[] sources;
 
-	private ubyte sourceCount_;
+    private ubyte sourceCount_;
 
-	private shared Allocator allocator;
+    private shared Allocator allocator;
 
-	/// Entropy accumulator.
+    /// Entropy accumulator.
-	protected SHA!(maxGather * 8, 512) accumulator;
+    protected SHA!(maxGather * 8, 512) accumulator;
 
-	/**
+    /**
-	 * Params:
+     * Params:
-	 *  maxSources = Maximum amount of entropy sources can be set.
+     *  maxSources = Maximum amount of entropy sources can be set.
-	 * 	allocator  = Allocator to allocate entropy sources available on the
+     *  allocator  = Allocator to allocate entropy sources available on the
-	 * 	             system.
+     *               system.
-	 */
+     */
-	this(size_t maxSources = 20, shared Allocator allocator = defaultAllocator)
+    this(size_t maxSources = 20, shared Allocator allocator = defaultAllocator)
-	in
+    in
-	{
+    {
-		assert(maxSources > 0 && maxSources <= ubyte.max);
+        assert(maxSources > 0 && maxSources <= ubyte.max);
-		assert(allocator !is null);
+        assert(allocator !is null);
-	}
+    }
-	body
+    body
-	{
+    {
-		allocator.resizeArray(sources, maxSources);
+        allocator.resize(sources, maxSources);
 
-		version (linux)
+        version (linux)
-		{
+        {
-			this ~= allocator.make!PlatformEntropySource;
+            this ~= allocator.make!PlatformEntropySource;
-		}
+        }
-	}
+    }
 
-	/**
+    /**
-	 * Returns: Amount of the registered entropy sources.
+     * Returns: Amount of the registered entropy sources.
-	 */
+     */
-	@property ubyte sourceCount() const @safe pure nothrow
+    @property ubyte sourceCount() const @safe pure nothrow
-	{
+    {
-		return sourceCount_;
+        return sourceCount_;
-	}
+    }
 
-	/**
+    /**
-	 * Add an entropy source.
+     * Add an entropy source.
-	 *
+     *
-	 * Params:
+     * Params:
-	 * 	source = Entropy source.
+     *  source = Entropy source.
-	 *
+     *
-	 * Returns: $(D_PSYMBOL this).
+     * Returns: $(D_PSYMBOL this).
-	 *
+     *
-	 * See_Also:
+     * See_Also:
-	 * 	$(D_PSYMBOL EntropySource)
+     *  $(D_PSYMBOL EntropySource)
-	 */
+     */
-	Entropy opOpAssign(string Op)(EntropySource source) @safe pure nothrow
+    Entropy opOpAssign(string Op)(EntropySource source) @safe pure nothrow
-		if (Op == "~")
+        if (Op == "~")
-	in
+    in
-	{
+    {
-		assert(sourceCount_ <= sources.length);
+        assert(sourceCount_ <= sources.length);
-	}
+    }
-	body
+    body
-	{
+    {
-		sources[sourceCount_++] = source;
+        sources[sourceCount_++] = source;
-		return this;
+        return this;
-	}
+    }
 
-	/**
+    /**
-	 * Returns: Generated random sequence.
+     * Returns: Generated random sequence.
-	 *
+     *
-	 * Throws: $(D_PSYMBOL EntropyException) if no strong entropy source was
+     * Throws: $(D_PSYMBOL EntropyException) if no strong entropy source was
-	 *         registered or it failed.
+     *         registered or it failed.
-	 */
+     */
-	@property ubyte[blockSize] random()
+    @property ubyte[blockSize] random()
-	in
+    in
-	{
+    {
-		assert(sourceCount_ > 0, "No entropy sources defined.");
+        assert(sourceCount_ > 0, "No entropy sources defined.");
-	}
+    }
-	body
+    body
-	{
+    {
-		bool haveStrong;
+        bool haveStrong;
-		ushort done;
+        ushort done;
-		ubyte[blockSize] output;
+        ubyte[blockSize] output;
 
-		do
+        do
-		{
+        {
-			ubyte[maxGather] buffer;
+            ubyte[maxGather] buffer;
 
-			// Run through our entropy sources
+            // Run through our entropy sources
-			for (ubyte i; i < sourceCount; ++i)
+            for (ubyte i; i < sourceCount; ++i)
-			{
+            {
-				auto outputLength = sources[i].poll(buffer);
+                auto outputLength = sources[i].poll(buffer);
 
-				if (!outputLength.isNull)
+                if (!outputLength.isNull)
-				{
+                {
-					if (outputLength > 0)
+                    if (outputLength > 0)
-					{
+                    {
-						update(i, buffer, outputLength);
+                        update(i, buffer, outputLength);
-						sources[i].size = cast(ushort) (sources[i].size + outputLength);
+                        sources[i].size = cast(ushort) (sources[i].size + outputLength);
-					}
+                    }
-					if (sources[i].size < sources[i].threshold)
+                    if (sources[i].size < sources[i].threshold)
-					{
+                    {
-						continue;
+                        continue;
-					}
+                    }
-					else if (sources[i].strong)
+                    else if (sources[i].strong)
-					{
+                    {
-						haveStrong = true;
+                        haveStrong = true;
-					}
+                    }
-				}
+                }
-				done = 257;
+                done = 257;
-			}
+            }
-		}
+        }
-		while (++done < 256);
+        while (++done < 256);
 
-		if (!haveStrong)
+        if (!haveStrong)
-		{
+        {
-			throw allocator.make!EntropyException("No strong entropy source defined.");
+            throw allocator.make!EntropyException("No strong entropy source defined.");
-		}
+        }
 
-		output = accumulator.finish();
+        output = accumulator.finish();
 
-		// Reset accumulator and counters and recycle existing entropy
+        // Reset accumulator and counters and recycle existing entropy
-		accumulator.start();
+        accumulator.start();
 
-		// Perform second SHA-512 on entropy
+        // Perform second SHA-512 on entropy
-		output = sha512Of(output);
+        output = sha512Of(output);
 
-		for (ubyte i = 0; i < sourceCount; ++i)
+        for (ubyte i = 0; i < sourceCount; ++i)
-		{
+        {
-			sources[i].size = 0;
+            sources[i].size = 0;
-		}
+        }
-		return output;
+        return output;
-	}
+    }
 
-	/**
+    /**
-	 * Update entropy accumulator.
+     * Update entropy accumulator.
-	 *
+     *
-	 * Params:
+     * Params:
-	 * 	sourceId = Entropy source index in $(D_PSYMBOL sources).
+     *  sourceId = Entropy source index in $(D_PSYMBOL sources).
-	 * 	data     = Data got from the entropy source.
+     *  data     = Data got from the entropy source.
-	 * 	length   = Length of the received data.
+     *  length   = Length of the received data.
-	 */
+     */
-	protected void update(in ubyte sourceId,
+    protected void update(in ubyte sourceId,
-	                      ref ubyte[maxGather] data,
+                          ref ubyte[maxGather] data,
-	                      ubyte length) @safe pure nothrow
+                          ubyte length) @safe pure nothrow
-	{
+    {
-		ubyte[2] header;
+        ubyte[2] header;
 
-		if (length > blockSize)
+        if (length > blockSize)
-		{
+        {
-			data[0..64] = sha512Of(data);
+            data[0..64] = sha512Of(data);
-			length = blockSize;
+            length = blockSize;
-		}
+        }
 
-		header[0] = sourceId;
+        header[0] = sourceId;
-		header[1] = length;
+        header[1] = length;
 
-		accumulator.put(header);
+        accumulator.put(header);
-		accumulator.put(data[0..length]);
+        accumulator.put(data[0..length]);
-	}
+    }
 }

source/tanya/memory/allocator.d

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * 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)
@@ -15,113 +15,53 @@ module tanya.memory.allocator;
  */
 interface Allocator
 {
-	/**
+    /**
-	 * Returns: Alignment offered.
+     * Returns: Alignment offered.
-	 */
+     */
-	@property uint alignment() const shared pure nothrow @safe @nogc;
+    @property uint alignment() const shared pure nothrow @safe @nogc;
 
-	/**
+    /**
-	 * Allocates $(D_PARAM size) bytes of memory.
+     * Allocates $(D_PARAM size) bytes of memory.
-	 *
+     *
-	 * Params:
+     * Params:
-	 * 	size = Amount of memory to allocate.
+     *  size = Amount of memory to allocate.
-	 *
+     *
-	 * Returns: Pointer to the new allocated memory.
+     * Returns: Pointer to the new allocated memory.
-	 */
+     */
-	void[] allocate(in size_t size) shared nothrow @nogc;
+    void[] allocate(in size_t size) shared nothrow @nogc;
 
-	/**
+    /**
-	 * Deallocates a memory block.
+     * Deallocates a memory block.
-	 *
+     *
-	 * Params:
+     * Params:
-	 * 	p = A pointer to the memory block to be freed.
+     *  p = A pointer to the memory block to be freed.
-	 *
+     *
-	 * Returns: Whether the deallocation was successful.
+     * Returns: Whether the deallocation was successful.
-	 */
+     */
-	bool deallocate(void[] p) shared nothrow @nogc;
+    bool deallocate(void[] p) shared nothrow @nogc;
 
-	/**
+    /**
-	 * Increases or decreases the size of a memory block.
+     * Increases or decreases the size of a memory block.
-	 *
+     *
-	 * Params:
+     * Params:
-	 * 	p    = A pointer to the memory block.
+     *  p    = A pointer to the memory block.
-	 * 	size = Size of the reallocated block.
+     *  size = Size of the reallocated block.
-	 *
+     *
-	 * Returns: Pointer to the allocated memory.
+     * Returns: Pointer to the allocated memory.
-	 */
+     */
-	bool reallocate(ref void[] p, in size_t size) shared nothrow @nogc;
+    bool reallocate(ref void[] p, in size_t size) shared nothrow @nogc;
 
-	/**
+    /**
-	 * Expands a memory block in place.
+     * Reallocates a memory block in place if possible or returns
-	 *
+     * $(D_KEYWORD false). This function cannot be used to allocate or
-	 * Params:
+     * deallocate memory, so if $(D_PARAM p) is $(D_KEYWORD null) or
-	 * 	p    = A pointer to the memory block.
+     * $(D_PARAM size) is `0`, it should return $(D_KEYWORD false).
-	 * 	size = Size of the reallocated block.
+     *
-	 *
+     * Params:
-	 * Returns: $(D_KEYWORD true) if successful, $(D_KEYWORD false) otherwise.
+     *  p    = A pointer to the memory block.
-	 */
+     *  size = Size of the reallocated block.
-	bool expand(ref void[] p, in size_t size) shared nothrow @nogc;
+     *
-}
+     * Returns: $(D_KEYWORD true) if successful, $(D_KEYWORD false) otherwise.
-
+     */
-/**
+    bool reallocateInPlace(ref void[] p, in size_t size) shared nothrow @nogc;
- * The mixin generates common methods for classes and structs using
- * allocators. It provides a protected member, constructor and a read-only property,
- * that checks if an allocator was already set and sets it to the default
- * one, if not (useful for structs which don't have a default constructor).
- */
-mixin template DefaultAllocator()
-{
-	/// Allocator.
-	protected shared Allocator allocator_;
-
-	/**
-	 * Params:
-	 * 	allocator = The allocator should be used.
-	 */
-	this(shared Allocator allocator)
-	in
-	{
-		assert(allocator !is null);
-	}
-	body
-	{
-		this.allocator_ = allocator;
-	}
-
-	/**
-	 * This property checks if the allocator was set in the constructor
-	 * and sets it to the default one, if not.
-	 *
-	 * Returns: Used allocator.
-	 *
-	 * Postcondition: $(D_INLINECODE allocator_ !is null)
-	 */
-	protected @property shared(Allocator) allocator() nothrow @safe @nogc
-	out (allocator)
-	{
-		assert(allocator !is null);
-	}
-	body
-	{
-		if (allocator_ is null)
-		{
-			allocator_ = defaultAllocator;
-		}
-		return allocator_;
-	}
-
-	/// Ditto.
-	@property shared(Allocator) allocator() const nothrow @trusted @nogc
-	out (allocator)
-	{
-		assert(allocator !is null);
-	}
-	body
-	{
-		if (allocator_ is null)
-		{
-			return defaultAllocator;
-		}
-		return cast(shared Allocator) allocator_;
-	}
 }

source/tanya/memory/mallocator.d

@@ -0,0 +1,185 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * Copyright: Eugene Wissner 2017.
+ * 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)
+ */
+module tanya.memory.mallocator;
+
+import core.stdc.stdlib;
+import std.algorithm.comparison;
+import tanya.memory.allocator;
+
+/**
+ * Wrapper for malloc/realloc/free from the C standard library.
+ */
+final class Mallocator : Allocator
+{
+    /**
+     * Allocates $(D_PARAM size) bytes of memory.
+     *
+     * Params:
+     *  size = Amount of memory to allocate.
+     *
+     * Returns: The pointer to the new allocated memory.
+     */
+    void[] allocate(in size_t size) shared nothrow @nogc
+    {
+        if (!size)
+        {
+            return null;
+        }
+        auto p = malloc(size + psize);
+
+        return p is null ? null : p[psize .. psize + size];
+    }
+
+    ///
+    @nogc nothrow unittest
+    {
+        auto p = Mallocator.instance.allocate(20);
+
+        assert(p.length == 20);
+
+        Mallocator.instance.deallocate(p);
+    }
+
+    /**
+     * Deallocates a memory block.
+     *
+     * Params:
+     *  p = A pointer to the memory block to be freed.
+     *
+     * Returns: Whether the deallocation was successful.
+     */
+    bool deallocate(void[] p) shared nothrow @nogc
+    {
+        if (p !is null)
+        {
+            free(p.ptr - psize);
+        }
+        return true;
+    }
+
+    ///
+    @nogc nothrow unittest
+    {
+        void[] p;
+        assert(Mallocator.instance.deallocate(p));
+
+        p = Mallocator.instance.allocate(10);
+        assert(Mallocator.instance.deallocate(p));
+    }
+
+    /**
+     * Reallocating in place isn't supported.
+     *
+     * Params:
+     *  p    = A pointer to the memory block.
+     *  size = Size of the reallocated block.
+     *
+     * Returns: $(D_KEYWORD false).
+     */
+    bool reallocateInPlace(ref void[] p, const size_t size) shared nothrow @nogc
+    {
+        return false;
+    }
+
+    /**
+     * Increases or decreases the size of a memory block.
+     *
+     * Params:
+     *  p    = A pointer to the memory block.
+     *  size = Size of the reallocated block.
+     *
+     * Returns: Whether the reallocation was successful.
+     */
+    bool reallocate(ref void[] p, const size_t size) shared nothrow @nogc
+    {
+        if (size == 0)
+        {
+            if (deallocate(p))
+            {
+                p = null;
+                return true;
+            }
+        }
+        else if (p is null)
+        {
+            p = allocate(size);
+            return p is null ? false : true;
+        }
+        else
+        {
+            auto r = realloc(p.ptr - psize, size + psize);
+
+            if (r !is null)
+            {
+                p = r[psize .. psize + size];
+                return true;
+            }
+        }
+        return false;
+    }
+
+    ///
+    @nogc nothrow unittest
+    {
+        void[] p;
+
+        assert(Mallocator.instance.reallocate(p, 20));
+        assert(p.length == 20);
+
+        assert(Mallocator.instance.reallocate(p, 30));
+        assert(p.length == 30);
+
+        assert(Mallocator.instance.reallocate(p, 10));
+        assert(p.length == 10);
+
+        assert(Mallocator.instance.reallocate(p, 0));
+        assert(p is null);
+    }
+
+    /**
+     * Returns: The alignment offered.
+     */
+    @property uint alignment() shared const pure nothrow @safe @nogc
+    {
+        return cast(uint) max(double.alignof, real.alignof);
+    }
+
+    /**
+     * Static allocator instance and initializer.
+     *
+     * Returns: The global $(D_PSYMBOL Allocator) instance.
+     */
+    static @property ref shared(Mallocator) instance() @nogc nothrow
+    {
+        if (instance_ is null)
+        {
+            immutable size = __traits(classInstanceSize, Mallocator) + psize;
+            void* p = malloc(size);
+
+            if (p !is null)
+            {
+                p[psize .. size] = typeid(Mallocator).initializer[];
+                instance_ = cast(shared Mallocator) p[psize .. size].ptr;
+            }
+        }
+        return instance_;
+    }
+
+    ///
+    @nogc nothrow unittest
+    {
+        assert(instance is instance);
+    }
+
+    private enum psize = 8;
+
+    private shared static Mallocator instance_;
+}

source/tanya/memory/mmappool.d

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * 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)
@@ -50,6 +50,21 @@ else version (Windows)
  */
 final class MmapPool : Allocator
 {
+	invariant
+	{
+		for (auto r = &head; *r !is null; r = &((*r).next))
+		{
+			auto block = cast(Block) (cast(void*) *r + RegionEntry.sizeof);
+			do
+			{
+				assert(block.prev is null || block.prev.next is block);
+				assert(block.next is null || block.next.prev is block);
+				assert(block.region is *r);
+			}
+			while ((block = block.next) !is null);
+		}
+	}
+
 	/**
 	 * Allocates $(D_PARAM size) bytes of memory.
 	 *
@@ -156,7 +171,7 @@ final class MmapPool : Allocator
 	 */
 	bool deallocate(void[] p) shared nothrow @nogc
 	{
-		if (p is null)
+		if (p.ptr is null)
 		{
 			return true;
 		}
@@ -216,7 +231,10 @@ final class MmapPool : Allocator
 	}
 
 	/**
-	 * Expands a memory block in place.
+	 * Reallocates a memory block in place if possible or returns
+	 * $(D_KEYWORD false). This function cannot be used to allocate or
+	 * deallocate memory, so if $(D_PARAM p) is $(D_KEYWORD null) or
+	 * $(D_PARAM size) is `0`, it should return $(D_KEYWORD false).
 	 *
 	 * Params:
 	 * 	p    = A pointer to the memory block.
@@ -224,16 +242,18 @@ final class MmapPool : Allocator
 	 *
 	 * Returns: $(D_KEYWORD true) if successful, $(D_KEYWORD false) otherwise.
 	 */
-	bool expand(ref void[] p, in size_t size) shared nothrow @nogc
+	bool reallocateInPlace(ref void[] p, in size_t size) shared nothrow @nogc
 	{
-		if (size <= p.length)
+		if (p is null || size == 0)
-		{
-			return true;
-		}
-		if (p is null)
 		{
 			return false;
 		}
+		if (size <= p.length)
+		{
+			// Leave the block as is.
+			p = p.ptr[0 .. size];
+			return true;
+		}
 		Block block1 = cast(Block) (p.ptr - BlockEntry.sizeof);
 
 		if (block1.size >= size)
@@ -243,7 +263,7 @@ final class MmapPool : Allocator
 			return true;
 		}
 		immutable dataSize = addAlignment(size);
-		immutable delta = dataSize - p.length;
+		immutable delta = dataSize - addAlignment(p.length);
 
 		if (block1.next is null
 		 || !block1.next.free
@@ -255,21 +275,17 @@ final class MmapPool : Allocator
 		}
 		if (block1.next.size >= delta + alignment_)
 		{
-			// We should move the start position of the next block. The order may be
+			// Move size from block2 to block1.
-			// important because the old block and the new one can overlap.
+			block1.next.size = block1.next.size - delta;
-			auto block2 = cast(Block) (p.ptr + dataSize);
-			block2.size = block1.next.size - delta;
-			block2.free = true;
-			block2.region = block1.region;
-			block2.next = block1.next.next;
-			block2.prev = block1;
-
 			block1.size = block1.size + delta;
 
+			auto block2 = cast(Block) (p.ptr + dataSize);
 			if (block1.next.next !is null)
 			{
 				block1.next.next.prev = block2;
 			}
+			// block1.next and block2 can overlap.
+			memmove(cast(void*) block2, cast(void*) block1.next, BlockEntry.sizeof);
 			block1.next = block2;
 		}
 		else
@@ -287,22 +303,22 @@ final class MmapPool : Allocator
 	nothrow unittest
 	{
 		void[] p;
-		assert(!MmapPool.instance.expand(p, 5));
+		assert(!MmapPool.instance.reallocateInPlace(p, 5));
 		assert(p is null);
 
 		p = MmapPool.instance.allocate(1);
 		auto orig = p.ptr;
 
-		assert(MmapPool.instance.expand(p, 2));
+		assert(MmapPool.instance.reallocateInPlace(p, 2));
 		assert(p.length == 2);
 		assert(p.ptr == orig);
 
-		assert(MmapPool.instance.expand(p, 4));
+		assert(MmapPool.instance.reallocateInPlace(p, 4));
 		assert(p.length == 4);
 		assert(p.ptr == orig);
 
-		assert(MmapPool.instance.expand(p, 2));
+		assert(MmapPool.instance.reallocateInPlace(p, 2));
-		assert(p.length == 4);
+		assert(p.length == 2);
 		assert(p.ptr == orig);
 
 		MmapPool.instance.deallocate(p);
@@ -328,17 +344,12 @@ final class MmapPool : Allocator
 			}
 			return false;
 		}
-		else if (size <= p.length)
+		else if (reallocateInPlace(p, size))
-		{
-			// Leave the block as is.
-			p = p.ptr[0 .. size];
-			return true;
-		}
-		else if (expand(p, size))
 		{
 			return true;
 		}
-		// Can't extend, allocate a new block, copy and delete the previous.
+		// Can't reallocate in place, allocate a new block,
+		// copy and delete the previous one.
 		void[] reallocP = allocate(size);
 		if (reallocP is null)
 		{
@@ -574,3 +585,61 @@ final class MmapPool : Allocator
 	}
 	private alias Block = shared BlockEntry*;
 }
+
+// A lot of allocations/deallocations, but it is the minimum caused a
+// segmentation fault because MmapPool reallocateInPlace moves a block wrong.
+unittest
+{
+	auto a = MmapPool.instance.allocate(16);
+	auto d = MmapPool.instance.allocate(16);
+	auto b = MmapPool.instance.allocate(16);
+	auto e = MmapPool.instance.allocate(16);
+	auto c = MmapPool.instance.allocate(16);
+	auto f = MmapPool.instance.allocate(16);
+
+	MmapPool.instance.deallocate(a);
+	MmapPool.instance.deallocate(b);
+	MmapPool.instance.deallocate(c);
+
+	a = MmapPool.instance.allocate(50);
+	MmapPool.instance.reallocateInPlace(a, 64);
+	MmapPool.instance.deallocate(a);
+
+	a = MmapPool.instance.allocate(1);
+	auto tmp1 = MmapPool.instance.allocate(1);
+	auto h1 = MmapPool.instance.allocate(1);
+	auto tmp2 = cast(ubyte[]) MmapPool.instance.allocate(1);
+
+	auto h2 = MmapPool.instance.allocate(2);
+	tmp1 = MmapPool.instance.allocate(1);
+	MmapPool.instance.deallocate(h2);
+	MmapPool.instance.deallocate(h1);
+
+	h2 = MmapPool.instance.allocate(2);
+	h1 = MmapPool.instance.allocate(1);
+	MmapPool.instance.deallocate(h2);
+
+	auto rep = cast(void[]) tmp2;
+	MmapPool.instance.reallocate(rep, tmp1.length);
+	tmp2 = cast(ubyte[]) rep;
+
+	MmapPool.instance.reallocate(tmp1, 9);
+
+	rep = cast(void[]) tmp2;
+	MmapPool.instance.reallocate(rep, tmp1.length);
+	tmp2 = cast(ubyte[]) rep;
+	MmapPool.instance.reallocate(tmp1, 17);
+
+	tmp2[$ - 1] = 0;
+
+	MmapPool.instance.deallocate(tmp1);
+
+	b = MmapPool.instance.allocate(16);
+
+	MmapPool.instance.deallocate(h1);
+	MmapPool.instance.deallocate(a);
+	MmapPool.instance.deallocate(b);
+	MmapPool.instance.deallocate(d);
+	MmapPool.instance.deallocate(e);
+	MmapPool.instance.deallocate(f);
+}

source/tanya/memory/package.d

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * 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)
@@ -11,10 +11,74 @@
 module tanya.memory;
 
 import core.exception;
-public import std.experimental.allocator : make, makeArray;
+public import std.experimental.allocator : make;
 import std.traits;
 public import tanya.memory.allocator;
-public import tanya.memory.types;
+
+/**
+ * The mixin generates common methods for classes and structs using
+ * allocators. It provides a protected member, constructor and a read-only property,
+ * that checks if an allocator was already set and sets it to the default
+ * one, if not (useful for structs which don't have a default constructor).
+ */
+mixin template DefaultAllocator()
+{
+    /// Allocator.
+    protected shared Allocator allocator_;
+
+    /**
+     * Params:
+     *  allocator = The allocator should be used.
+     *
+     * Precondition: $(D_INLINECODE allocator_ !is null)
+     */
+    this(shared Allocator allocator)
+    in
+    {
+        assert(allocator !is null);
+    }
+    body
+    {
+        this.allocator_ = allocator;
+    }
+
+    /**
+     * This property checks if the allocator was set in the constructor
+     * and sets it to the default one, if not.
+     *
+     * Returns: Used allocator.
+     *
+     * Postcondition: $(D_INLINECODE allocator !is null)
+     */
+    protected @property shared(Allocator) allocator() nothrow @safe @nogc
+    out (allocator)
+    {
+        assert(allocator !is null);
+    }
+    body
+    {
+        if (allocator_ is null)
+        {
+            allocator_ = defaultAllocator;
+        }
+        return allocator_;
+    }
+
+    /// Ditto.
+    @property shared(Allocator) allocator() const nothrow @trusted @nogc
+    out (allocator)
+    {
+        assert(allocator !is null);
+    }
+    body
+    {
+        if (allocator_ is null)
+        {
+            return defaultAllocator;
+        }
+        return cast(shared Allocator) allocator_;
+    }
+}
 
 // From druntime
 private extern (C) void _d_monitordelete(Object h, bool det) nothrow @nogc;
@@ -23,18 +87,28 @@ shared Allocator allocator;
 
 shared static this() nothrow @trusted @nogc
 {
-	import tanya.memory.mmappool;
+    import tanya.memory.mallocator;
-	allocator = MmapPool.instance;
+    allocator = Mallocator.instance;
 }
 
 @property ref shared(Allocator) defaultAllocator() nothrow @safe @nogc
+out (allocator)
 {
-	return allocator;
+    assert(allocator !is null);
+}
+body
+{
+    return allocator;
 }
 
 @property void defaultAllocator(shared(Allocator) allocator) nothrow @safe @nogc
+in
 {
-	.allocator = allocator;
+    assert(allocator !is null);
+}
+body
+{
+    .allocator = allocator;
 }
 
 /**
@@ -42,101 +116,90 @@ shared static this() nothrow @trusted @nogc
  * object of type $(D_PARAM T).
  *
  * Params:
- * 	T = Object type.
+ *  T = Object type.
  */
 template stateSize(T)
 {
-	static if (is(T == class) || is(T == interface))
+    static if (is(T == class) || is(T == interface))
-	{
+    {
-		enum stateSize = __traits(classInstanceSize, T);
+        enum stateSize = __traits(classInstanceSize, T);
-	}
+    }
-	else
+    else
-	{
+    {
-		enum stateSize = T.sizeof;
+        enum stateSize = T.sizeof;
-	}
+    }
 }
 
 /**
  * Params:
- * 	size      = Raw size.
+ *  size      = Raw size.
- * 	alignment = Alignment.
+ *  alignment = Alignment.
  *
  * Returns: Aligned size.
  */
-size_t alignedSize(in size_t size, in size_t alignment = 8) pure nothrow @safe @nogc
+size_t alignedSize(const size_t size, const size_t alignment = 8)
+pure nothrow @safe @nogc
 {
-	return (size - 1) / alignment * alignment + alignment;
+    return (size - 1) / alignment * alignment + alignment;
 }
 
 /**
  * Internal function used to create, resize or destroy a dynamic array. It
- * throws $(D_PSYMBOL OutOfMemoryError) if $(D_PARAM Throws) is set. The new
+ * may throw $(D_PSYMBOL OutOfMemoryError). The new
- * allocated part of the array is initialized only if $(D_PARAM Init) 
+ * allocated part of the array isn't initialized. This function can be trusted
- * is set. This function can be trusted only in the data structures that
+ * only in the data structures that can ensure that the array is
- * can ensure that the array is allocated/rellocated/deallocated with the
+ * allocated/rellocated/deallocated with the same allocator.
- * same allocator.
  *
  * Params:
- * 	T         = Element type of the array being created.
+ *  T         = Element type of the array being created.
- * 	Init      = If should be initialized.
+ *  allocator = The allocator used for getting memory.
- * 	Throws    = If $(D_PSYMBOL OutOfMemoryError) should be throwsn.
+ *  array     = A reference to the array being changed.
- * 	allocator = The allocator used for getting memory.
+ *  length    = New array length.
- * 	array     = A reference to the array being changed.
- * 	length    = New array length.
  *
- * Returns: $(D_KEYWORD true) upon success, $(D_KEYWORD false) if memory could
+ * Returns: $(D_PARAM array).
- *          not be reallocated. In the latter
  */
-package(tanya) bool resize(T,
+package(tanya) T[] resize(T)(shared Allocator allocator,
-                           bool Init = true,
+                             auto ref T[] array,
-                           bool Throws = true)
+                             const size_t length) @trusted
-                          (shared Allocator allocator,
-                           ref T[] array,
-                           in size_t length) @trusted
 {
-	void[] buf = array;
+    if (length == 0)
-	static if (Init)
+    {
-	{
+        if (allocator.deallocate(array))
-		immutable oldLength = array.length;
+        {
-	}
+            return null;
-	if (!allocator.reallocate(buf, length * T.sizeof))
+        }
-	{
+        else
-		static if (Throws)
+        {
-		{
+            onOutOfMemoryErrorNoGC();
-			onOutOfMemoryError;
+        }
-		}
+    }
-		return false;
-	}
-	// Casting from void[] is unsafe, but we know we cast to the original type.
-	array = cast(T[]) buf;
 
-	static if (Init)
+    void[] buf = array;
-	{
+    if (!allocator.reallocate(buf, length * T.sizeof))
-		if (oldLength < length)
+    {
-		{
+        onOutOfMemoryErrorNoGC();
-			array[oldLength .. $] = T.init;
+    }
-		}
+    // Casting from void[] is unsafe, but we know we cast to the original type.
-	}
+    array = cast(T[]) buf;
-	return true;
+
+    return array;
 }
-package(tanya) alias resizeArray = resize;
 
-///
+private unittest
-unittest
 {
-	int[] p;
+    int[] p;
 
-	defaultAllocator.resizeArray(p, 20);
+    p = defaultAllocator.resize(p, 20);
-	assert(p.length == 20);
+    assert(p.length == 20);
 
-	defaultAllocator.resizeArray(p, 30);
+    p = defaultAllocator.resize(p, 30);
-	assert(p.length == 30);
+    assert(p.length == 30);
 
-	defaultAllocator.resizeArray(p, 10);
+    p = defaultAllocator.resize(p, 10);
-	assert(p.length == 10);
+    assert(p.length == 10);
 
-	defaultAllocator.resizeArray(p, 0);
+    p = defaultAllocator.resize(p, 0);
-	assert(p is null);
+    assert(p is null);
 }
 
 /**
@@ -145,90 +208,101 @@ unittest
  * allocator.
  *
  * Params:
- * 	T         = Type of $(D_PARAM p).
+ *  T         = Type of $(D_PARAM p).
- * 	allocator = Allocator the $(D_PARAM p) was allocated with.
+ *  allocator = Allocator the $(D_PARAM p) was allocated with.
- * 	p         = Object or array to be destroyed.
+ *  p         = Object or array to be destroyed.
  */
 void dispose(T)(shared Allocator allocator, auto ref T* p)
 {
-	static if (hasElaborateDestructor!T)
+    static if (hasElaborateDestructor!T)
-	{
+    {
-		destroy(*p);
+        destroy(*p);
-	}
+    }
-	() @trusted { allocator.deallocate((cast(void*) p)[0 .. T.sizeof]); }();
+    () @trusted { allocator.deallocate((cast(void*) p)[0 .. T.sizeof]); }();
-	p = null;
+    p = null;
 }
 
 /// Ditto.
 void dispose(T)(shared Allocator allocator, auto ref T p)
-	if (is(T == class) || is(T == interface))
+    if (is(T == class) || is(T == interface))
 {
-	if (p is null)
+    if (p is null)
-	{
+    {
-		return;
+        return;
-	}
+    }
-	static if (is(T == interface))
+    static if (is(T == interface))
-	{
+    {
-		version(Windows)
+        version(Windows)
-		{
+        {
-			import core.sys.windows.unknwn : IUnknown;
+            import core.sys.windows.unknwn : IUnknown;
-			static assert(!is(T: IUnknown), "COM interfaces can't be destroyed in "
+            static assert(!is(T: IUnknown), "COM interfaces can't be destroyed in "
-										 ~ __PRETTY_FUNCTION__);
+                                         ~ __PRETTY_FUNCTION__);
-		}
+        }
-		auto ob = cast(Object) p;
+        auto ob = cast(Object) p;
-	}
+    }
-	else
+    else
-	{
+    {
-		alias ob = p;
+        alias ob = p;
-	}
+    }
-	auto ptr = cast(void *) ob;
+    auto ptr = cast(void *) ob;
 
-	auto support = ptr[0 .. typeid(ob).initializer.length];
+    auto support = ptr[0 .. typeid(ob).initializer.length];
-	scope (success)
+    scope (success)
-	{
+    {
-		() @trusted { allocator.deallocate(support); }();
+        () @trusted { allocator.deallocate(support); }();
-		p = null;
+        p = null;
-	}
+    }
 
-	auto ppv = cast(void**) ptr;
+    auto ppv = cast(void**) ptr;
-	if (!*ppv)
+    if (!*ppv)
-	{
+    {
-		return;
+        return;
-	}
+    }
-	auto pc = cast(ClassInfo*) *ppv;
+    auto pc = cast(ClassInfo*) *ppv;
-	scope (exit)
+    scope (exit)
-	{
+    {
-		*ppv = null;
+        *ppv = null;
-	}
+    }
 
-	auto c = *pc;
+    auto c = *pc;
-	do
+    do
-	{
+    {
-		// Assume the destructor is @nogc. Leave it nothrow since the destructor
+        // Assume the destructor is @nogc. Leave it nothrow since the destructor
-		// shouldn't throw and if it does, it is an error anyway.
+        // shouldn't throw and if it does, it is an error anyway.
-		if (c.destructor)
+        if (c.destructor)
-		{
+        {
-			(cast(void function (Object) nothrow @safe @nogc) c.destructor)(ob);
+            (cast(void function (Object) nothrow @safe @nogc) c.destructor)(ob);
-		}
+        }
-	}
+    }
-	while ((c = c.base) !is null);
+    while ((c = c.base) !is null);
 
-	if (ppv[1]) // if monitor is not null
+    if (ppv[1]) // if monitor is not null
-	{
+    {
-		_d_monitordelete(cast(Object) ptr, true);
+        _d_monitordelete(cast(Object) ptr, true);
-	}
+    }
 }
 
 /// Ditto.
-void dispose(T)(shared Allocator allocator, auto ref T[] array)
+void dispose(T)(shared Allocator allocator, auto ref T[] p)
 {
-	static if (hasElaborateDestructor!(typeof(array[0])))
+    static if (hasElaborateDestructor!(typeof(p[0])))
-	{
+    {
-	foreach (ref e; array)
+        import std.algorithm.iteration;
-	{
+        p.each!(e => destroy(e));
-	    destroy(e);
+    }
-	}
+    () @trusted { allocator.deallocate(p); }();
-	}
+    p = null;
-	() @trusted { allocator.deallocate(array); }();
+}
-	array = null;
+
+unittest
+{
+    struct S
+    {
+        ~this()
+        {
+        }
+    }
+    auto p = cast(S[]) defaultAllocator.allocate(S.sizeof);
+
+    defaultAllocator.dispose(p);
 }

source/tanya/memory/types.d

@@ -3,10 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  */
 module tanya.memory.types;
 
@@ -23,345 +23,345 @@ import tanya.memory;
  * when the reference count goes down to zero, frees the underlying store.
  *
  * Params:
- * 	T = Type of the reference-counted value.
+ *  T = Type of the reference-counted value.
  */
 struct RefCounted(T)
 {
-	static if (is(T == class) || is(T == interface))
+    static if (is(T == class) || is(T == interface))
-	{
+    {
-		private alias Payload = T;
+        private alias Payload = T;
-	}
+    }
-	else
+    else
-	{
+    {
-		private alias Payload = T*;
+        private alias Payload = T*;
-	}
+    }
 
-	private class Storage
+    private class Storage
-	{
+    {
-		private Payload payload;
+        private Payload payload;
-		private size_t counter = 1;
+        private size_t counter = 1;
 
-		private final size_t opUnary(string op)() pure nothrow @safe @nogc
+        private final size_t opUnary(string op)() pure nothrow @safe @nogc
-			if (op == "--" || op == "++")
+            if (op == "--" || op == "++")
-		in
+        in
-		{
+        {
-			assert(counter > 0);
+            assert(counter > 0);
-		}
+        }
-		body
+        body
-		{
+        {
-			mixin("return " ~ op ~ "counter;");
+            mixin("return " ~ op ~ "counter;");
-		}
+        }
 
-		private final int opCmp(size_t counter) const pure nothrow @safe @nogc
+        private final int opCmp(size_t counter) const pure nothrow @safe @nogc
-		{
+        {
-			if (this.counter > counter)
+            if (this.counter > counter)
-			{
+            {
-				return 1;
+                return 1;
-			}
+            }
-			else if (this.counter < counter)
+            else if (this.counter < counter)
-			{
+            {
-				return -1;
+                return -1;
-			}
+            }
-			else
+            else
-			{
+            {
-				return 0;
+                return 0;
-			}
+            }
-		}
+        }
 
-		private final int opEquals(size_t counter) const pure nothrow @safe @nogc
+        private final int opEquals(size_t counter) const pure nothrow @safe @nogc
-		{
+        {
-			return this.counter == counter;
+            return this.counter == counter;
-		}
+        }
-	}
+    }
 
-	private final class RefCountedStorage : Storage
+    private final class RefCountedStorage : Storage
-	{
+    {
-		private shared Allocator allocator;
+        private shared Allocator allocator;
 
-		this(shared Allocator allocator) pure nothrow @safe @nogc
+        this(shared Allocator allocator) pure nothrow @safe @nogc
-		in
+        in
-		{
+        {
-			assert(allocator !is null);
+            assert(allocator !is null);
-		}
+        }
-		body
+        body
-		{
+        {
-			this.allocator = allocator;
+            this.allocator = allocator;
-		}
+        }
 
-		~this() nothrow @nogc
+        ~this() nothrow @nogc
-		{
+        {
-			allocator.dispose(payload);
+            allocator.dispose(payload);
-		}
+        }
-	}
+    }
 
-	private Storage storage;
+    private Storage storage;
 
-	invariant
+    invariant
-	{
+    {
-		assert(storage is null || allocator_ !is null);
+        assert(storage is null || allocator_ !is null);
-	}
+    }
 
-	/**
+    /**
-	 * Takes ownership over $(D_PARAM value), setting the counter to 1.
+     * Takes ownership over $(D_PARAM value), setting the counter to 1.
-	 * $(D_PARAM value) may be a pointer, an object or a dynamic array.
+     * $(D_PARAM value) may be a pointer, an object or a dynamic array.
-	 *
+     *
-	 * Params:
+     * Params:
-	 * 	value     = Value whose ownership is taken over.
+     *  value     = Value whose ownership is taken over.
-	 * 	allocator = Allocator used to destroy the $(D_PARAM value) and to
+     *  allocator = Allocator used to destroy the $(D_PARAM value) and to
-	 * 	            allocate/deallocate internal storage.
+     *              allocate/deallocate internal storage.
-	 *
+     *
-	 * Precondition: $(D_INLINECODE allocator !is null)
+     * Precondition: $(D_INLINECODE allocator !is null)
-	 */
+     */
-	this(Payload value, shared Allocator allocator = defaultAllocator)
+    this(Payload value, shared Allocator allocator = defaultAllocator)
-	{
+    {
-		this(allocator);
+        this(allocator);
-		storage = allocator.make!RefCountedStorage(allocator);
+        storage = allocator.make!RefCountedStorage(allocator);
-		move(value, storage.payload);
+        move(value, storage.payload);
-	}
+    }
 
-	/// Ditto.
+    /// Ditto.
-	this(shared Allocator allocator)
+    this(shared Allocator allocator)
-	in
+    in
-	{
+    {
-		assert(allocator !is null);
+        assert(allocator !is null);
-	}
+    }
-	body
+    body
-	{
+    {
-		this.allocator_ = allocator;
+        this.allocator_ = allocator;
-	}
+    }
 
-	/**
+    /**
-	 * Increases the reference counter by one.
+     * Increases the reference counter by one.
-	 */
+     */
-	this(this)
+    this(this)
-	{
+    {
-		if (count != 0)
+        if (count != 0)
-		{
+        {
-			++storage;
+            ++storage;
-		}
+        }
-	}
+    }
 
-	/**
+    /**
-	 * Decreases the reference counter by one.
+     * Decreases the reference counter by one.
-	 *
+     *
-	 * If the counter reaches 0, destroys the owned object.
+     * If the counter reaches 0, destroys the owned object.
-	 */
+     */
-	~this()
+    ~this()
-	{
+    {
-		if (storage !is null && !(storage.counter && --storage))
+        if (storage !is null && !(storage.counter && --storage))
-		{
+        {
-			allocator_.dispose(storage);
+            allocator_.dispose(storage);
-		}
+        }
-	}
+    }
 
-	/**
+    /**
-	 * Takes ownership over $(D_PARAM rhs). Initializes this
+     * Takes ownership over $(D_PARAM rhs). Initializes this
-	 * $(D_PSYMBOL RefCounted) if needed.
+     * $(D_PSYMBOL RefCounted) if needed.
-	 *
+     *
-	 * If it is the last reference of the previously owned object,
+     * If it is the last reference of the previously owned object,
-	 * it will be destroyed.
+     * it will be destroyed.
-	 *
+     *
-	 * To reset the $(D_PSYMBOL RefCounted) assign $(D_KEYWORD null).
+     * To reset the $(D_PSYMBOL RefCounted) assign $(D_KEYWORD null).
-	 *
+     *
-	 * If the allocator wasn't set before, $(D_PSYMBOL defaultAllocator) will
+     * If the allocator wasn't set before, $(D_PSYMBOL defaultAllocator) will
-	 * be used. If you need a different allocator, create a new
+     * be used. If you need a different allocator, create a new
-	 * $(D_PSYMBOL RefCounted) and assign it.
+     * $(D_PSYMBOL RefCounted) and assign it.
-	 *
+     *
-	 * Params:
+     * Params:
-	 * 	rhs = $(D_KEYWORD this).
+     *  rhs = $(D_KEYWORD this).
-	 */
+     */
-	ref typeof(this) opAssign(Payload rhs)
+    ref typeof(this) opAssign(Payload rhs)
-	{
+    {
-		if (storage is null)
+        if (storage is null)
-		{
+        {
-			storage = allocator.make!RefCountedStorage(allocator);
+            storage = allocator.make!RefCountedStorage(allocator);
-		}
+        }
-		else if (storage > 1)
+        else if (storage > 1)
-		{
+        {
-			--storage;
+            --storage;
-			storage = allocator.make!RefCountedStorage(allocator);
+            storage = allocator.make!RefCountedStorage(allocator);
-		}
+        }
-		else if (cast(RefCountedStorage) storage is null)
+        else if (cast(RefCountedStorage) storage is null)
-		{
+        {
-			// Created with refCounted. Always destroyed togethter with the pointer.
+            // Created with refCounted. Always destroyed togethter with the pointer.
-			assert(storage.counter != 0);
+            assert(storage.counter != 0);
-			allocator.dispose(storage);
+            allocator.dispose(storage);
-			storage = allocator.make!RefCountedStorage(allocator);
+            storage = allocator.make!RefCountedStorage(allocator);
-		}
+        }
-		else
+        else
-		{
+        {
-			allocator.dispose(storage.payload);
+            allocator.dispose(storage.payload);
-		}
+        }
-		move(rhs, storage.payload);
+        move(rhs, storage.payload);
-		return this;
+        return this;
-	}
+    }
 
-	/// Ditto.
+    /// Ditto.
-	ref typeof(this) opAssign(typeof(null))
+    ref typeof(this) opAssign(typeof(null))
-	{
+    {
-		if (storage is null)
+        if (storage is null)
-		{
+        {
-			return this;
+            return this;
-		}
+        }
-		else if (storage > 1)
+        else if (storage > 1)
-		{
+        {
-			--storage;
+            --storage;
-			storage = null;
+            storage = null;
-		}
+        }
-		else if (cast(RefCountedStorage) storage is null)
+        else if (cast(RefCountedStorage) storage is null)
-		{
+        {
-			// Created with refCounted. Always destroyed togethter with the pointer.
+            // Created with refCounted. Always destroyed togethter with the pointer.
-			assert(storage.counter != 0);
+            assert(storage.counter != 0);
-			allocator.dispose(storage);
+            allocator.dispose(storage);
-			return this;
+            return this;
-		}
+        }
-		else
+        else
-		{
+        {
-			allocator.dispose(storage.payload);
+            allocator.dispose(storage.payload);
-		}
+        }
-		return this;
+        return this;
-	}
+    }
 
-	/// Ditto.
+    /// Ditto.
-	ref typeof(this) opAssign(typeof(this) rhs)
+    ref typeof(this) opAssign(typeof(this) rhs)
-	{
+    {
-		swap(allocator_, rhs.allocator_);
+        swap(allocator_, rhs.allocator_);
-		swap(storage, rhs.storage);
+        swap(storage, rhs.storage);
-		return this;
+        return this;
-	}
+    }
 
-	/**
+    /**
-	 * Returns: Reference to the owned object.
+     * Returns: Reference to the owned object.
-	 */
+     */
-	inout(Payload) get() inout pure nothrow @safe @nogc
+    inout(Payload) get() inout pure nothrow @safe @nogc
-	in
+    in
-	{
+    {
-		assert(count > 0, "Attempted to access an uninitialized reference.");
+        assert(count > 0, "Attempted to access an uninitialized reference.");
-	}
+    }
-	body
+    body
-	{
+    {
-		return storage.payload;
+        return storage.payload;
-	}
+    }
 
-	static if (isPointer!Payload)
+    static if (isPointer!Payload)
-	{
+    {
-		/**
+        /**
-		 * Params:
+         * Params:
-		 * 	op = Operation. 
+         *  op = Operation. 
-		 *
+         *
-		 * Dereferences the pointer. It is defined only for pointers, not for
+         * Dereferences the pointer. It is defined only for pointers, not for
-		 * reference types like classes, that can be accessed directly.
+         * reference types like classes, that can be accessed directly.
-		 *
+         *
-		 * Returns: Reference to the pointed value.
+         * Returns: Reference to the pointed value.
-		 */
+         */
-		ref T opUnary(string op)()
+        ref T opUnary(string op)()
-			if (op == "*")
+            if (op == "*")
-		{
+        {
-			return *storage.payload;
+            return *storage.payload;
-		}
+        }
-	}
+    }
 
-	/**
+    /**
-	 * Returns: Whether this $(D_PSYMBOL RefCounted) already has an internal 
+     * Returns: Whether this $(D_PSYMBOL RefCounted) already has an internal 
-	 *          storage.
+     *          storage.
-	 */
+     */
-	@property bool isInitialized() const
+    @property bool isInitialized() const
-	{
+    {
-		return storage !is null;
+        return storage !is null;
-	}
+    }
 
-	/**
+    /**
-	 * Returns: The number of $(D_PSYMBOL RefCounted) instances that share
+     * Returns: The number of $(D_PSYMBOL RefCounted) instances that share
-	 *          ownership over the same pointer (including $(D_KEYWORD this)).
+     *          ownership over the same pointer (including $(D_KEYWORD this)).
-	 *          If this $(D_PSYMBOL RefCounted) isn't initialized, returns `0`.
+     *          If this $(D_PSYMBOL RefCounted) isn't initialized, returns `0`.
-	 */
+     */
-	@property size_t count() const
+    @property size_t count() const
-	{
+    {
-		return storage is null ? 0 : storage.counter;
+        return storage is null ? 0 : storage.counter;
-	}
+    }
 
-	mixin DefaultAllocator;
+    mixin DefaultAllocator;
-	alias get this;
+    alias get this;
 }
 
 ///
 unittest
 {
-	auto rc = RefCounted!int(defaultAllocator.make!int(5), defaultAllocator);
+    auto rc = RefCounted!int(defaultAllocator.make!int(5), defaultAllocator);
-	auto val = rc.get;
+    auto val = rc.get;
 
-	*val = 8;
+    *val = 8;
-	assert(*rc.storage.payload == 8);
+    assert(*rc.storage.payload == 8);
 
-	val = null;
+    val = null;
-	assert(rc.storage.payload !is null);
+    assert(rc.storage.payload !is null);
-	assert(*rc.storage.payload == 8);
+    assert(*rc.storage.payload == 8);
 
-	*rc = 9;
+    *rc = 9;
-	assert(*rc.storage.payload == 9);
+    assert(*rc.storage.payload == 9);
 }
 
 version (unittest)
 {
-	private class A
+    private class A
-	{
+    {
-		uint *destroyed;
+        uint *destroyed;
 
-		this(ref uint destroyed) @nogc
+        this(ref uint destroyed) @nogc
-		{
+        {
-			this.destroyed = &destroyed;
+            this.destroyed = &destroyed;
-		}
+        }
 
-		~this() @nogc
+        ~this() @nogc
-		{
+        {
-			++(*destroyed);
+            ++(*destroyed);
-		}
+        }
-	}
+    }
 
-	private struct B
+    private struct B
-	{
+    {
-		int prop;
+        int prop;
-		@disable this();
+        @disable this();
-		this(int param1) @nogc
+        this(int param1) @nogc
-		{
+        {
-			prop = param1;
+            prop = param1;
-		}
+        }
-	}
+    }
 }
 
 private unittest
 {
-	uint destroyed;
+    uint destroyed;
-	auto a = defaultAllocator.make!A(destroyed);
+    auto a = defaultAllocator.make!A(destroyed);
 
-	assert(destroyed == 0);
+    assert(destroyed == 0);
-	{
+    {
-		auto rc = RefCounted!A(a, defaultAllocator);
+        auto rc = RefCounted!A(a, defaultAllocator);
-		assert(rc.count == 1);
+        assert(rc.count == 1);
 
-		void func(RefCounted!A rc)
+        void func(RefCounted!A rc)
-		{
+        {
-			assert(rc.count == 2);
+            assert(rc.count == 2);
-		}
+        }
-		func(rc);
+        func(rc);
 
-		assert(rc.count == 1);
+        assert(rc.count == 1);
-	}
+    }
-	assert(destroyed == 1);
+    assert(destroyed == 1);
 
-	RefCounted!int rc;
+    RefCounted!int rc;
-	assert(rc.count == 0);
+    assert(rc.count == 0);
-	rc = defaultAllocator.make!int(8);
+    rc = defaultAllocator.make!int(8);
-	assert(rc.count == 1);
+    assert(rc.count == 1);
 }
 
 private unittest
 {
-	static assert(is(typeof(RefCounted!int.storage.payload) == int*));
+    static assert(is(typeof(RefCounted!int.storage.payload) == int*));
-	static assert(is(typeof(RefCounted!A.storage.payload) == A));
+    static assert(is(typeof(RefCounted!A.storage.payload) == A));
 
-	static assert(is(RefCounted!B));
+    static assert(is(RefCounted!B));
-	static assert(is(RefCounted!A));
+    static assert(is(RefCounted!A));
 }
 
 /**
@@ -374,85 +374,85 @@ private unittest
  * object).
  *
  * Params:
- * 	T         = Type of the constructed object.
+ *  T         = Type of the constructed object.
- * 	A         = Types of the arguments to the constructor of $(D_PARAM T).
+ *  A         = Types of the arguments to the constructor of $(D_PARAM T).
- * 	allocator = Allocator.
+ *  allocator = Allocator.
- * 	args      = Constructor arguments of $(D_PARAM T).
+ *  args      = Constructor arguments of $(D_PARAM T).
  * 
  * Returns: Newly created $(D_PSYMBOL RefCounted!T).
  */
 RefCounted!T refCounted(T, A...)(shared Allocator allocator, auto ref A args)
-	if (!is(T == interface) && !isAbstractClass!T
+    if (!is(T == interface) && !isAbstractClass!T
          && !isArray!T && !isAssociativeArray!T)
 {
-	auto rc = typeof(return)(allocator);
+    auto rc = typeof(return)(allocator);
 
-	immutable storageSize = alignedSize(stateSize!(RefCounted!T.Storage));
+    immutable storageSize = alignedSize(stateSize!(RefCounted!T.Storage));
-	immutable size = alignedSize(stateSize!T + storageSize);
+    immutable size = alignedSize(stateSize!T + storageSize);
 
-	auto mem = (() @trusted => allocator.allocate(size))();
+    auto mem = (() @trusted => allocator.allocate(size))();
-	if (mem is null)
+    if (mem is null)
-	{
+    {
-		onOutOfMemoryError();
+        onOutOfMemoryError();
-	}
+    }
-	scope (failure)
+    scope (failure)
-	{
+    {
-		() @trusted { allocator.deallocate(mem); }();
+        () @trusted { allocator.deallocate(mem); }();
-	}
+    }
-	rc.storage = emplace!(RefCounted!T.Storage)(mem[0 .. storageSize]);
+    rc.storage = emplace!(RefCounted!T.Storage)(mem[0 .. storageSize]);
 
-	static if (is(T == class))
+    static if (is(T == class))
-	{
+    {
-		rc.storage.payload = emplace!T(mem[storageSize .. $], args);
+        rc.storage.payload = emplace!T(mem[storageSize .. $], args);
-	}
+    }
-	else
+    else
-	{
+    {
-		auto ptr = (() @trusted => (cast(T*) mem[storageSize .. $].ptr))();
+        auto ptr = (() @trusted => (cast(T*) mem[storageSize .. $].ptr))();
-		rc.storage.payload = emplace!T(ptr, args);
+        rc.storage.payload = emplace!T(ptr, args);
-	}
+    }
-	return rc;
+    return rc;
 }
 
 ///
 unittest
 {
-	auto rc = defaultAllocator.refCounted!int(5);
+    auto rc = defaultAllocator.refCounted!int(5);
-	assert(rc.count == 1);
+    assert(rc.count == 1);
 
-	void func(RefCounted!int param)
+    void func(RefCounted!int param)
-	{
+    {
-		if (param.count == 2)
+        if (param.count == 2)
-		{
+        {
-			func(param);
+            func(param);
-		}
+        }
-		else
+        else
-		{
+        {
-			assert(param.count == 3);
+            assert(param.count == 3);
-		}
+        }
-	}
+    }
-	func(rc);
+    func(rc);
 
-	assert(rc.count == 1);
+    assert(rc.count == 1);
 }
 
 private @nogc unittest
 {
-	struct E
+    struct E
-	{
+    {
-	}
+    }
-	auto b = defaultAllocator.refCounted!B(15);
+    auto b = defaultAllocator.refCounted!B(15);
-	static assert(is(typeof(b.storage.payload) == B*));
+    static assert(is(typeof(b.storage.payload) == B*));
-	static assert(is(typeof(b.prop) == int));
+    static assert(is(typeof(b.prop) == int));
-	static assert(!is(typeof(defaultAllocator.refCounted!B())));
+    static assert(!is(typeof(defaultAllocator.refCounted!B())));
 
-	static assert(is(typeof(defaultAllocator.refCounted!E())));
+    static assert(is(typeof(defaultAllocator.refCounted!E())));
-	static assert(!is(typeof(defaultAllocator.refCounted!E(5))));
+    static assert(!is(typeof(defaultAllocator.refCounted!E(5))));
-	{
+    {
-		auto rc = defaultAllocator.refCounted!B(3);
+        auto rc = defaultAllocator.refCounted!B(3);
-		assert(rc.get.prop == 3);
+        assert(rc.get.prop == 3);
-	}
+    }
-	{
+    {
-		auto rc = defaultAllocator.refCounted!E();
+        auto rc = defaultAllocator.refCounted!E();
-		assert(rc.count);
+        assert(rc.count);
-	}
+    }
 }

source/tanya/meta/gen.d

@@ -1,49 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Templates that generate values.
- *
- * 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)
- */
-module tanya.meta.gen;
-
-import std.traits;
-
-/**
- * Initializer list.
- *
- * Generates a static array with elements from $(D_PARAM args). All elements
- * should have the same type. It can be used in constructors which accept a
- * list of the elements of the same type in the situations where variadic
- * functions and templates can't be used.
- *
- * Params:
- * 	Args = Argument type.
- * 	args = Arguments.
- */
-enum IL(Args...)(Args args)
-	if (Args.length > 0)
-{
-	alias BaseType = typeof(args[0]);
-
-	BaseType[args.length] result;
-
-	foreach (i, a; args)
-	{
-		static assert(isImplicitlyConvertible!(typeof(a), BaseType));
-		result[i] = a;
-	}
-	return result;
-}
-
-///
-unittest
-{
-	static assert(IL(1, 5, 8).length == 3);
-	static assert(IL(1, 5, 8).sizeof == 3 * int.sizeof);
-}

source/tanya/meta/package.d

@@ -1,15 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Metaprogramming.
- *
- * 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)
- */
-module tanya.meta;
-
-public import tanya.meta.gen;

source/tanya/network/socket.d

@@ -174,13 +174,13 @@ else version (Windows)
 	alias WSASocket = WSASocketW;
 
 	alias LPFN_GETACCEPTEXSOCKADDRS = VOID function(PVOID,
-													DWORD,
+	                                                DWORD,
-													DWORD,
+	                                                DWORD,
-													DWORD,
+	                                                DWORD,
-													SOCKADDR**,
+	                                                SOCKADDR**,
-													LPINT,
+	                                                LPINT,
-													SOCKADDR**,
+	                                                SOCKADDR**,
-													LPINT);
+	                                                LPINT);
 	const GUID WSAID_GETACCEPTEXSOCKADDRS = {0xb5367df2,0xcbac,0x11cf,[0x95,0xca,0x00,0x80,0x5f,0x48,0xa1,0x92]};
 
 	struct WSABUF {
@@ -248,23 +248,23 @@ else version (Windows)
 		 * Throws: $(D_PSYMBOL SocketException) if unable to receive.
 		 */
 		bool beginReceive(ubyte[] buffer,
-						  SocketState overlapped,
+		                  SocketState overlapped,
-						  Flags flags = Flags(Flag.none)) @nogc @trusted
+		                  Flags flags = Flags(Flag.none)) @nogc @trusted
 		{
 			auto receiveFlags = cast(DWORD) flags;
 
 			overlapped.handle = cast(HANDLE) handle_;
 			overlapped.event = OverlappedSocketEvent.read;
-			overlapped.buffer.len = buffer.length;
+			overlapped.buffer.len = cast(ULONG) buffer.length;
 			overlapped.buffer.buf = cast(char*) buffer.ptr;
 
 			auto result = WSARecv(handle_,
-								  &overlapped.buffer,
+			                      &overlapped.buffer,
-								  1u,
+			                      1u,
-								  NULL,
+			                      NULL,
-								  &receiveFlags,
+			                      &receiveFlags,
-								  &overlapped.overlapped,
+			                      &overlapped.overlapped,
-								  NULL);
+			                      NULL);
 
 			if (result == SOCKET_ERROR && !wouldHaveBlocked)
 			{
@@ -292,9 +292,9 @@ else version (Windows)
 		{
 			DWORD lpNumber;
 			BOOL result = GetOverlappedResult(overlapped.handle,
-											  &overlapped.overlapped,
+			                                  &overlapped.overlapped,
-											  &lpNumber,
+			                                  &lpNumber,
-											  FALSE);
+			                                  FALSE);
 			if (result == FALSE && !wouldHaveBlocked)
 			{
 				disconnected_ = true;
@@ -321,21 +321,21 @@ else version (Windows)
 		 * Throws: $(D_PSYMBOL SocketException) if unable to send.
 		 */
 		bool beginSend(ubyte[] buffer,
-					   SocketState overlapped,
+		               SocketState overlapped,
-					   Flags flags = Flags(Flag.none)) @nogc @trusted
+		               Flags flags = Flags(Flag.none)) @nogc @trusted
 		{
 			overlapped.handle = cast(HANDLE) handle_;
 			overlapped.event = OverlappedSocketEvent.write;
-			overlapped.buffer.len = buffer.length;
+			overlapped.buffer.len = cast(ULONG) buffer.length;
 			overlapped.buffer.buf = cast(char*) buffer.ptr;
 
 			auto result = WSASend(handle_,
-								  &overlapped.buffer,
+			                      &overlapped.buffer,
-								  1u,
+			                      1u,
-								  NULL,
+			                      NULL,
-								  cast(DWORD) flags,
+			                      cast(DWORD) flags,
-								  &overlapped.overlapped,
+			                      &overlapped.overlapped,
-								  NULL);
+			                      NULL);
 
 			if (result == SOCKET_ERROR && !wouldHaveBlocked)
 			{
@@ -364,9 +364,9 @@ else version (Windows)
 		{
 			DWORD lpNumber;
 			BOOL result = GetOverlappedResult(overlapped.handle,
-											  &overlapped.overlapped,
+			                                  &overlapped.overlapped,
-											  &lpNumber,
+			                                  &lpNumber,
-											  FALSE);
+			                                  FALSE);
 			if (result == FALSE && !wouldHaveBlocked)
 			{
 				disconnected_ = true;
@@ -385,7 +385,7 @@ else version (Windows)
 		 * Create a socket.
 		 *
 		 * Params:
-		 *     af       = Address family.
+		 *     af = Address family.
 		 *
 		 * Throws: $(D_PSYMBOL SocketException) on errors.
 		 */
@@ -402,14 +402,14 @@ else version (Windows)
 			DWORD dwBytes;
 
 			auto result = WSAIoctl(handle_,
-								   SIO_GET_EXTENSION_FUNCTION_POINTER,
+			                       SIO_GET_EXTENSION_FUNCTION_POINTER,
-								   &guidAcceptEx,
+			                       &guidAcceptEx,
-								   guidAcceptEx.sizeof,
+			                       guidAcceptEx.sizeof,
-								   &acceptExtension,
+			                       &acceptExtension,
-								   acceptExtension.sizeof,
+			                       acceptExtension.sizeof,
-								   &dwBytes,
+			                       &dwBytes,
-								   NULL,
+			                       NULL,
-								   NULL);
+			                       NULL);
 			if (!result == SOCKET_ERROR)
 			{
 				throw make!SocketException(defaultAllocator,
@@ -449,13 +449,13 @@ else version (Windows)
 
 			// We don't want to get any data now, but only start to accept the connections
 			BOOL result = acceptExtension(handle_,
-										  socket,
+			                              socket,
-										  overlapped.buffer.buf,
+			                              overlapped.buffer.buf,
-										  0u,
+			                              0u,
-										  sockaddr_in.sizeof + 16,
+			                              sockaddr_in.sizeof + 16,
-										  sockaddr_in.sizeof + 16,
+			                              sockaddr_in.sizeof + 16,
-										  &dwBytes,
+			                              &dwBytes,
-										  &overlapped.overlapped);
+			                              &overlapped.overlapped);
 			if (result == FALSE && !wouldHaveBlocked)
 			{
 				throw defaultAllocator.make!SocketException("Unable to accept socket connection");
@@ -478,7 +478,7 @@ else version (Windows)
 		{
 			scope (exit)
 			{
-				defaultAllocator.dispose(overlapped.buffer.buf[0..overlapped.buffer.len]);
+				defaultAllocator.dispose(overlapped.buffer.buf[0 .. overlapped.buffer.len]);
 			}
 			auto socket = make!OverlappedConnectedSocket(defaultAllocator,
 			                                             cast(socket_t) overlapped.handle,
@@ -539,9 +539,9 @@ shared static this()
 		auto ws2Lib = GetModuleHandle("ws2_32.dll");
 
 		getaddrinfoPointer = cast(typeof(getaddrinfoPointer))
-							 GetProcAddress(ws2Lib, "getaddrinfo");
+			GetProcAddress(ws2Lib, "getaddrinfo");
 		freeaddrinfoPointer = cast(typeof(freeaddrinfoPointer))
-							  GetProcAddress(ws2Lib, "freeaddrinfo");
+			GetProcAddress(ws2Lib, "freeaddrinfo");
 	}
 	else version (Posix)
 	{
@@ -754,10 +754,10 @@ abstract class Socket
 	{
 		auto length = cast(socklen_t) result.length;
 		if (getsockopt(handle_,
-					   cast(int) level,
+		               cast(int) level,
-					   cast(int) option,
+		               cast(int) option,
-					   result.ptr,
+		               result.ptr,
-					   &length) == SOCKET_ERROR)
+		               &length) == SOCKET_ERROR)
 		{
 			throw defaultAllocator.make!SocketException("Unable to get socket option");
 		}
@@ -821,10 +821,10 @@ abstract class Socket
 	                         void[] value) const @trusted @nogc
 	{
 		if (setsockopt(handle_,
-					   cast(int)level,
+		               cast(int)level,
-					   cast(int)option,
+		               cast(int)option,
-					   value.ptr,
+		               value.ptr,
-					   cast(uint) value.length) == SOCKET_ERROR)
+		               cast(uint) value.length) == SOCKET_ERROR)
 		{
 			throw defaultAllocator.make!SocketException("Unable to set socket option");
 		}