Fix typo in README, add CONTRIBUTING.md link

Assigning RefCounted to RefCounted fails at compile time.

https://issues.caraus.io/issues/247

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true

.gitignore

@@ -1,7 +1,14 @@
 # Binary
 *.[oa]
+*.exe
 
 # D
 .dub
 __test__*__
 __test__*__.core
+/tanya-test-library
+
+/docs/
+/docs.json
+
+/*.lst

.travis.yml

@@ -1,17 +1,34 @@
 sudo: false
 
 os:
- - linux
+  - linux
+  - osx
 
 language: d
 
 d:
- - dmd-2.072.2
- - dmd-2.071.2
+  - dmd-2.074.1
+  - dmd-2.073.2
+  - dmd-2.072.2
+  - dmd-2.071.2
 
 env: 
- matrix:
-  - ARCH=x86_64
+  matrix:
+    - ARCH=x86_64
+    - ARCH=x86
+
+addons:
+  apt:
+    packages:
+      - gcc-multilib
+
+before_script:
+  - if [ "$PS1" = '(dmd-2.074.1)' ]; then
+      export UNITTEST="unittest-cov";
+    fi
 
 script:
- - dub test --arch=$ARCH
+  - dub test -b ${UNITTEST:-unittest} --arch=$ARCH --compiler=$DC
+
+after_success:
+  - test "$UNITTEST" = "unittest-cov" && bash <(curl -s https://codecov.io/bash)

CODE_OF_CONDUCT.md

@@ -0,0 +1,5 @@
+# Contributor Code of Conduct
+
+This project adheres to No Code of Conduct.  We are all adults.  We accept anyone's contributions.  Nothing else matters.
+
+For more information please visit the [No Code of Conduct](https://github.com/domgetter/NCoC) homepage.

CONTRIBUTING.md

@@ -0,0 +1,64 @@
+# Contributing
+
+Tanya is a project in active development, therefore any help is appreciated. Thank you for considering contributing
+to it, feel welcome.
+These guidelines describe ways to get started.
+
+
+## Ways to get involved
+
+* **Reporting a problem**: [Report](https://issues.caraus.io/projects/tanya/issues) bugs and usage problems you
+encounter.
+* **Fixing issues**: [The bug tracker](https://issues.caraus.io/projects/tanya/issues) contains a list of issues you
+can work on.
+* **Documentation**: You can improve API documentation by correcting grammar errors, completing existing texts and
+writing new ones, or providing usage examples.
+* **Testing**: Test coverage is important for a library. Writing tests is not only helpful, but is also a great way
+to get a feel for how tanya works.
+
+
+## Opening an issue
+
+If you have found a bug, an error, have some question, or suggestion, open in issue. Tanya uses an external
+[bug tracker](https://issues.caraus.io/projects/tanya/issues). You should
+[register](https://issues.caraus.io/account/register) before you can report your issue. There is also a list
+of open issues that mirror the current development process and progress. If you're looking for a challenge, just
+pick an issue you are interested in and start working on it. Fill free to comment on the issue to get more
+information.
+
+Some issues have a category assigned to it. Such issues belongs mostly to a larger part of the library that is
+currently in development. The category specifies then the git branch development happens on. The remaining issues
+can be fixed directly in master.
+
+In the [roadmap](https://issues.caraus.io/projects/tanya/roadmap) you can find a list of issues that are planned
+to be fixed till a specific release. Version numbers refer to the versions in the
+[git repository](https://github.com/caraus-ecms/tanya/releases).
+
+
+## Creating a pull request
+
+I accept GitHub pull requests. Creating a pull request is like sending a patch with a suggested change.
+First you have to [fork](https://guides.github.com/activities/forking/) the repository. Clone your fork locally
+with `git clone` and create a new branch where you want to work, for example:
+
+```shell
+git checkout -b bugfix-x
+```
+Commit your changes to your fork:
+
+```shell
+git commit -m "Fix Bug X"
+git push -u origin bugfix-x
+```
+After that if you visit your fork on GitHub, GitHub will suggest to create pull request. Just follow the steps
+described on GitHub to finish the process.
+
+Please ensure that you fork is even with the upstream (original) repository. If not, you have to rebase your branch
+on upstream master before submitting a pull request. See https://help.github.com/articles/syncing-a-fork/ for a
+step-by-step guide.
+
+
+## Questions and suggestions
+
+* [Open an issue](https://issues.caraus.io/projects/tanya/issues)
+* [Send an email](mailto:info@caraus.de)

README.md

@@ -1,12 +1,13 @@
 # Tanya
 
-[![Build Status](https://travis-ci.org/caraus-ecms/tanya.svg?branch=master)](https://travis-ci.org/caraus-ecms/tanya)
+[![Build status](https://travis-ci.org/caraus-ecms/tanya.svg?branch=master)](https://travis-ci.org/caraus-ecms/tanya)
+[![Build status](https://ci.appveyor.com/api/projects/status/djkmverdfsylc7ti/branch/master?svg=true)](https://ci.appveyor.com/project/belka-ew/tanya/branch/master)
+[![codecov](https://codecov.io/gh/caraus-ecms/tanya/branch/master/graph/badge.svg)](https://codecov.io/gh/caraus-ecms/tanya)
 [![Dub version](https://img.shields.io/dub/v/tanya.svg)](https://code.dlang.org/packages/tanya)
 [![Dub downloads](https://img.shields.io/dub/dt/tanya.svg)](https://code.dlang.org/packages/tanya)
 [![License](https://img.shields.io/badge/license-MPL_2.0-blue.svg)](https://raw.githubusercontent.com/caraus-ecms/tanya/master/LICENSE)
 
-Tanya is a general purpose library for D programming language that doesn't
-rely on the Garbage Collector.
+Tanya is a general purpose library for D programming language.
 
 Its aim is to simplify the manual memory management in D and to provide a
 guarantee with @nogc attribute that there are no hidden allocations on the
@@ -14,57 +15,148 @@ 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/issues)
+* [Documentation](https://docs.caraus.io/tanya)
+* [Contribution guidelines](CONTRIBUTING.md)
+
 ## 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`: Multiple precision integer and a set of functions.
-* `memory`: Tools for manual memory management (allocator, reference counting,
-helper functions).
-* `network`: URL-Parsing, sockets.
+* `container`: Queue, Array, Singly and doubly linked lists, Buffers, UTF-8
+string, Hash set.
+* `format`: Formatting and conversion functions.
+* `math`: Arbitrary precision integer and a set of functions.
+* `memory`: Tools for manual memory management (allocators, smart pointers).
+* `network`: URL-Parsing, sockets, utilities.
+* `os`: Platform-independent interfaces to operating system functionality.
+
+## Basic usage
+
+### Allocators
+
+Memory management is done with allocators. Instead of using `new` to create an
+instance of a class, an allocator is used:
+
+```d
+import tanya.memory;
+
+class A
+{
+    this(int arg)
+    {
+    }
+}
+
+A a = defaultAllocator.make!A(5);
+
+defaultAllocator.dispose(a);
+```
+
+As you can see, the user is responsible for deallocation, therefore `dispose`
+is called at the end.
+
+If you want to change the `defaultAllocator` to something different, you
+probably want to do it at the program's beginning. Or you can invoke another
+allocator directly. It is important to ensure that the object is destroyed
+using the same allocator that was used to allocate it.
+
+What if I get an allocated object from some function? The generic rule is: If
+you haven't requested the memory yourself (with `make`), you don't need to free
+it.
+
+`tanya.memory.smartref` contains smart pointers, helpers that can take care of
+a proper deallocation in some cases for you.
+
+### Exceptions
+
+Since exceptions are normal classes in D, they are allocated and dellocated the
+same as described above, but:
+
+1. The caller is **always** responsible for destroying a caught exception.
+2. Exceptions are **always** allocated and should be always allocated with the
+`defaultAllocator`.
+
+```d
+import tanya.memory;
+
+void functionThatThrows()
+{
+    throw defaultAlocator.make!Exception("An error occurred");
+}
+
+try
+{
+    functionThatThrows()
+}
+catch (Exception e)
+{
+    defaultAllocator.dispose(e);
+}
+```
+
+### Containers
+
+Arrays are commonly used in programming. D's built-in arrays often rely on the
+GC. It is inconvenient to change their size, reserve memory for future use and
+so on. Containers can help here. The following example demonstrates how
+`tanya.container.array.Array` can be used instead of `int[]`.
+
+```d
+import tanya.container.array;
+
+Array!int arr;
+
+// Reserve memory if I know that my container will contain approximately 15
+// elements.
+arr.reserve(15);
+
+arr.insertBack(5); // Add one element.
+arr.length = 10; // New elements are initialized to 0.
+
+// Iterate over the first five elements.
+foreach (el; arr[0 .. 5])
+{
+}
+
+int i = arr[7]; // Access 7th element.
+```
+
+There are more containers in the `tanya.container` package.
+
+## Development
 
 ### Supported compilers
 
-* dmd 2.072.2
-* dmd 2.071.2
+| dmd     |
+|:-------:|
+| 2.074.1 |
+| 2.073.2 |
+| 2.072.2 |
+| 2.071.2 |
 
 ### Current status
 
-The library is currently under development, but some parts of it can already be
-used.
+Following modules are under development:
 
-Containers were newly reworked and the API won't change significantly, but will
-be only extended. The same is true for the `memory` package.
+| Feature  | Branch    | Build status                                                                                                                                                                                                                                                                                  |
+|----------|:---------:|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| BitArray | bitvector | [![bitvector](https://travis-ci.org/caraus-ecms/tanya.svg?branch=bitvector)](https://travis-ci.org/caraus-ecms/tanya) [![bitvector](https://ci.appveyor.com/api/projects/status/djkmverdfsylc7ti/branch/bitvector?svg=true)](https://ci.appveyor.com/project/belka-ew/tanya/branch/bitvector) |
+| TLS      | crypto    | [![crypto](https://travis-ci.org/caraus-ecms/tanya.svg?branch=crypto)](https://travis-ci.org/caraus-ecms/tanya) [![crypto](https://ci.appveyor.com/api/projects/status/djkmverdfsylc7ti/branch/crypto?svg=true)](https://ci.appveyor.com/project/belka-ew/tanya/branch/crypto)                |
+| File IO  | io        | [![io](https://travis-ci.org/caraus-ecms/tanya.svg?branch=io)](https://travis-ci.org/caraus-ecms/tanya) [![io](https://ci.appveyor.com/api/projects/status/djkmverdfsylc7ti/branch/io?svg=true)](https://ci.appveyor.com/project/belka-ew/tanya/branch/io)                                    |
 
-`network` and `async` packages should be reviewed in the future and the API may
-change.
+### Release management
 
-`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.
+3-week release cycle.
 
-I'm currently mostly working on `crypto` that is not a complete cryptographic
-suite, but contains (will contain) algorithm implementations required by TLS.
+Deprecated features are removed after one release (in approximately 6 weeks after deprecating).
 
-### Further characteristics
+## 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 a native D library without any external dependencies.
 
 * Tanya is cross-platform. The development happens on a 64-bit Linux, but it
 is being tested on Windows and FreeBSD as well.
 
-* The library isn't thread-safe. Thread-safity should be added later.
-
-## Contributing
-
-Since I'm mostly busy writing new code and implementing new features I would
-appreciate, if anyone uses the library. It would help me to improve the
-codebase and fix issues.
-
-Feel free to contact me if you have any questions.
+* The library isn't thread-safe yet.

appveyor.yml

@@ -0,0 +1,72 @@
+platform: x64
+os: Visual Studio 2015
+
+environment:
+  matrix:
+    - DC: dmd
+      DVersion: 2.074.1
+      arch: x64
+    - DC: dmd
+      DVersion: 2.074.1
+      arch: x86
+    - DC: dmd
+      DVersion: 2.073.2
+      arch: x64
+    - DC: dmd
+      DVersion: 2.073.2
+      arch: x86
+    - DC: dmd
+      DVersion: 2.072.2
+      arch: x64
+    - DC: dmd
+      DVersion: 2.072.2
+      arch: x86
+    - DC: dmd
+      DVersion: 2.071.2
+      arch: x64
+    - DC: dmd
+      DVersion: 2.071.2
+      arch: x86
+
+skip_tags: true
+
+install:
+  - ps: function SetUpDCompiler
+        {
+          $env:toolchain = "msvc";
+          $version = $env:DVersion;
+          Invoke-WebRequest "http://downloads.dlang.org/releases/2.x/$($version)/dmd.$($version).windows.7z" -OutFile "c:\dmd.7z";
+          echo "finished.";
+          pushd c:\\;
+          7z x dmd.7z > $null;
+          popd;
+        }
+  - ps: SetUpDCompiler
+
+  - ps: if($env:DVersion -eq "2.071.2"){
+          Invoke-WebRequest "http://code.dlang.org/files/dub-1.2.1-windows-x86.zip" -OutFile "dub.zip";
+          7z x dub.zip -odub > $null;
+          Move-Item "dub/dub.exe" "C:\dmd2\windows\bin"
+        }
+
+before_build:
+  - ps: if($env:arch -eq "x86"){
+          $env:compilersetupargs = "x86";
+          $env:Darch = "x86";
+        }
+        elseif($env:arch -eq "x64"){
+          $env:compilersetupargs = "amd64";
+          $env:Darch = "x86_64";
+        }
+  - ps: $env:PATH += ";C:\dmd2\windows\bin;";
+  - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall" %compilersetupargs%
+
+build_script:
+  - echo dummy build script - dont remove me
+
+test_script:
+  - echo %Darch%
+  - echo %PATH%
+  - 'dub --version'
+  - '%DC% --version'
+  - dub test -b unittest --arch=%Darch% --compiler=%DC%

codecov.yml

@@ -0,0 +1,4 @@
+ignore:
+  - "source/tanya/async/event/iocp.d"
+  - "source/tanya/async/iocp.d"
+  - "source/tanya/memory/types.d"

dub.json

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

source/tanya/async/event/epoll.d

@@ -2,15 +2,20 @@
  * 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.
+/*
+ * Event loop implementation for Linux.
+ *
+ * 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;
 
-version (linux):
+version (D_Ddoc)
+{
+}
+else version (linux):
 
 public import core.sys.linux.epoll;
 import tanya.async.protocol;
@@ -18,6 +23,7 @@ import tanya.async.event.selector;
 import tanya.async.loop;
 import tanya.async.transport;
 import tanya.async.watcher;
+import tanya.container.array;
 import tanya.memory;
 import tanya.memory.mmappool;
 import tanya.network.socket;
@@ -28,160 +34,153 @@ import std.algorithm.comparison;
 
 extern (C) nothrow @nogc
 {
-	int epoll_create1(int flags);
-	int epoll_ctl (int epfd, int op, int fd, epoll_event *event);
-	int epoll_wait (int epfd, epoll_event *events, int maxevents, int timeout);
+    int epoll_create1(int flags);
+    int epoll_ctl (int epfd, int op, int fd, epoll_event *event);
+    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;
+    protected int fd;
+    private Array!epoll_event events;
 
-	/**
-	 * Initializes the loop.
-	 */
-	this() @nogc
-	{
-		if ((fd = epoll_create1(EPOLL_CLOEXEC)) < 0)
-		{
-			throw MmapPool.instance.make!BadLoopException("epoll initialization failed");
-		}
-		super();
-		MmapPool.instance.resizeArray(events, maxEvents);
-	}
+    /**
+     * Initializes the loop.
+     */
+    this() @nogc
+    {
+        if ((fd = epoll_create1(EPOLL_CLOEXEC)) < 0)
+        {
+            throw defaultAllocator.make!BadLoopException("epoll initialization failed");
+        }
+        super();
+        events = Array!epoll_event(maxEvents, MmapPool.instance);
+    }
 
-	/**
-	 * Free loop internals.
-	 */
-	~this() @nogc
-	{
-		MmapPool.instance.dispose(events);
-		close(fd);
-	}
+    /**
+     * Frees loop internals.
+     */
+    ~this() @nogc
+    {
+        close(fd);
+    }
 
-	/**
-	 * 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.
-	 */
-	protected override bool reify(ConnectionWatcher watcher,
-	                              EventMask oldEvents,
-	                              EventMask events) @nogc
-	in
-	{
-		assert(watcher !is null);
-	}
-	body
-	{
-		int op = EPOLL_CTL_DEL;
-		epoll_event ev;
+    /**
+     * 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.
+     */
+    protected override bool reify(SocketWatcher watcher,
+                                  EventMask oldEvents,
+                                  EventMask events) @nogc
+    {
+        int op = EPOLL_CTL_DEL;
+        epoll_event ev;
 
-		if (events == oldEvents)
-		{
-			return true;
-		}
-		if (events && oldEvents)
-		{
-			op = EPOLL_CTL_MOD;
-		}
-		else if (events && !oldEvents)
-		{
-			op = EPOLL_CTL_ADD;
-		}
+        if (events == oldEvents)
+        {
+            return true;
+        }
+        if (events && oldEvents)
+        {
+            op = EPOLL_CTL_MOD;
+        }
+        else if (events && !oldEvents)
+        {
+            op = EPOLL_CTL_ADD;
+        }
 
-		ev.data.fd = watcher.socket.handle;
-		ev.events = (events & (Event.read | Event.accept) ? EPOLLIN | EPOLLPRI : 0)
-				  | (events & Event.write ? EPOLLOUT : 0)
-				  | EPOLLET;
+        ev.data.fd = watcher.socket.handle;
+        ev.events = (events & (Event.read | Event.accept) ? EPOLLIN | EPOLLPRI : 0)
+                  | (events & Event.write ? EPOLLOUT : 0)
+                  | EPOLLET;
 
-		return epoll_ctl(fd, op, watcher.socket.handle, &ev) == 0;
-	}
+        return epoll_ctl(fd, op, watcher.socket.handle, &ev) == 0;
+    }
 
-	/**
-	 * Does the actual polling.
-	 */
-	protected override void poll() @nogc
-	{
-		// Don't block
-		immutable timeout = cast(immutable int) blockTime.total!"msecs";
-		auto eventCount = epoll_wait(fd, events.ptr, maxEvents, timeout);
+    /**
+     * Does the actual polling.
+     */
+    protected override void poll() @nogc
+    {
+        // Don't block
+        immutable timeout = cast(immutable int) blockTime.total!"msecs";
+        auto eventCount = epoll_wait(fd, events.get().ptr, maxEvents, timeout);
 
-		if (eventCount < 0)
-		{
-			if (errno != EINTR)
-			{
-				throw defaultAllocator.make!BadLoopException();
-			}
-			return;
-		}
+        if (eventCount < 0)
+        {
+            if (errno != EINTR)
+            {
+                throw defaultAllocator.make!BadLoopException();
+            }
+            return;
+        }
 
-		for (auto i = 0; i < eventCount; ++i)
-		{
-			auto io = cast(IOWatcher) connections[events[i].data.fd];
+        for (auto i = 0; i < eventCount; ++i)
+        {
+            auto transport = cast(StreamTransport) connections[events[i].data.fd];
 
-			if (io is null)
-			{
-				acceptConnections(connections[events[i].data.fd]);
-			}
-			else if (events[i].events & EPOLLERR)
-			{
-				kill(io, null);
-			}
-			else if (events[i].events & (EPOLLIN | EPOLLPRI | EPOLLHUP))
-			{
-				auto transport = cast(SelectorStreamTransport) io.transport;
-				assert(transport !is null);
+            if (transport is null)
+            {
+                auto connection = cast(ConnectionWatcher) connections[events[i].data.fd];
+                assert(connection !is null);
 
-				SocketException exception;
-				try
-				{
-					ptrdiff_t received;
-					do
-					{
-						received = transport.socket.receive(io.output[]);
-						io.output += received;
-					}
-					while (received);
-				}
-				catch (SocketException e)
-				{
-					exception = e;
-				}
-				if (transport.socket.disconnected)
-				{
-					kill(io, exception);
-				}
-				else if (io.output.length)
-				{
-					swapPendings.insertBack(io);
-				}
-			}
-			else if (events[i].events & EPOLLOUT)
-			{
-				auto transport = cast(SelectorStreamTransport) io.transport;
-				assert(transport !is null);
+                acceptConnections(connection);
+            }
+            else if (events[i].events & EPOLLERR)
+            {
+                kill(transport);
+                continue;
+            }
+            else if (events[i].events & (EPOLLIN | EPOLLPRI | EPOLLHUP))
+            {
+                SocketException exception;
+                try
+                {
+                    ptrdiff_t received;
+                    do
+                    {
+                        received = transport.socket.receive(transport.output[]);
+                        transport.output += received;
+                    }
+                    while (received);
+                }
+                catch (SocketException e)
+                {
+                    exception = e;
+                }
+                if (transport.socket.disconnected)
+                {
+                    kill(transport, exception);
+                    continue;
+                }
+                else if (transport.output.length)
+                {
+                    pendings.enqueue(transport);
+                }
+            }
+            if (events[i].events & EPOLLOUT)
+            {
+                transport.writeReady = true;
+                if (transport.input.length)
+                {
+                    feed(transport);
+                }
+            }
+        }
+    }
 
-				transport.writeReady = true;
-				if (transport.input.length)
-				{
-					feed(transport);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Returns: The blocking time.
-	 */
-	override protected @property inout(Duration) blockTime()
-	inout @safe pure nothrow
-	{
-		return min(super.blockTime, 1.dur!"seconds");
-	}
+    /**
+     * Returns: The blocking time.
+     */
+    override protected @property inout(Duration) blockTime()
+    inout @safe pure nothrow
+    {
+        return min(super.blockTime, 1.dur!"seconds");
+    }
 }

source/tanya/async/event/iocp.d

@@ -2,15 +2,20 @@
  * 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.
+/*
+ * Event loop implementation for Windows.
+ *
+ * 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;
 
-version (Windows):
+version (D_Ddoc)
+{
+}
+else version (Windows):
 
 import tanya.container.buffer;
 import tanya.async.loop;
@@ -26,266 +31,359 @@ 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 WriteBuffer!ubyte input;
+    private ReadBuffer!ubyte output;
 
-	/**
-	 * Creates new completion port transport.
-	 * Params:
-	 * 	socket = Socket.
-	 */
-	this(OverlappedConnectedSocket socket) @nogc
-	in
-	{
-		assert(socket !is null);
-	}
-	body
-	{
-		socket_ = socket;
-		input = WriteBuffer!ubyte(8192, MmapPool.instance);
-	}
+    private WriteBuffer!ubyte input;
 
-	@property inout(OverlappedConnectedSocket) socket()
-	inout pure nothrow @safe @nogc
-	{
-		return socket_;
-	}
+    private Protocol protocol_;
 
-	/**
-	 * Write some data to the transport.
-	 *
-	 * Params:
-	 * 	data = Data to send.
-	 */
-	void write(ubyte[] data) @nogc
-	{
-		immutable empty = input.length == 0;
-		input ~= data;
-		if (empty)
-		{
-			SocketState overlapped;
-			try
-			{
-				overlapped = MmapPool.instance.make!SocketState;
-				socket.beginSend(input[], overlapped);
-			}
-			catch (SocketException e)
-			{
-				MmapPool.instance.dispose(overlapped);
-				MmapPool.instance.dispose(e);
-			}
-		}
-	}
+    private bool closing;
+
+    /**
+     * Creates new completion port transport.
+     *
+     * Params:
+     *  socket = Socket.
+     *
+     * Precondition: $(D_INLINECODE socket !is null)
+     */
+    this(OverlappedConnectedSocket socket) @nogc
+    {
+        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
+    {
+        return cast(OverlappedConnectedSocket) socket_;
+    }
+
+    /**
+     * 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() pure nothrow @safe @nogc
+    {
+        closing = true;
+    }
+
+    /**
+     * Write some data to the transport.
+     *
+     * Params:
+     *  data = Data to send.
+     */
+    void write(ubyte[] data) @nogc
+    {
+        input ~= data;
+    }
+
+    /**
+     * 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)
+        {
+            immutable empty = input.length == 0;
+            protocol.received(output[0 .. $]);
+            output.clear();
+            if (empty)
+            {
+                SocketState overlapped;
+                try
+                {
+                    overlapped = MmapPool.instance.make!SocketState;
+                    socket.beginSend(input[], overlapped);
+                }
+                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;
+    protected HANDLE completionPort;
 
-	protected OVERLAPPED overlap;
+    protected OVERLAPPED overlap;
 
-	/**
-	 * Initializes the loop.
-	 */
-	this() @nogc
-	{
-		super();
+    /**
+     * Initializes the loop.
+     */
+    this() @nogc
+    {
+        super();
 
-		completionPort = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0);
-		if (!completionPort)
-		{
-			throw make!BadLoopException(defaultAllocator,
-			                            "Creating completion port failed");
-		}
-	}
+        completionPort = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0);
+        if (!completionPort)
+        {
+            throw make!BadLoopException(defaultAllocator,
+                                        "Creating completion port failed");
+        }
+    }
 
-	/**
-	 * 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 protected bool reify(ConnectionWatcher watcher,
-								  EventMask oldEvents,
-								  EventMask events) @nogc
-	{
-		SocketState overlapped;
-		if (!(oldEvents & Event.accept) && (events & Event.accept))
-		{
-			auto socket = cast(OverlappedStreamSocket) watcher.socket;
-			assert(socket !is null);
+    /**
+     * 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 protected bool reify(SocketWatcher watcher,
+                                  EventMask oldEvents,
+                                  EventMask events) @nogc
+    {
+        SocketState overlapped;
+        if (!(oldEvents & Event.accept) && (events & Event.accept))
+        {
+            auto socket = cast(OverlappedStreamSocket) watcher.socket;
+            assert(socket !is null);
 
-			if (CreateIoCompletionPort(cast(HANDLE) socket.handle,
-									   completionPort,
-									   cast(ULONG_PTR) (cast(void*) watcher),
-									   0) !is completionPort)
-			{
-				return false;
-			}
+            if (CreateIoCompletionPort(cast(HANDLE) socket.handle,
+                                       completionPort,
+                                       cast(ULONG_PTR) (cast(void*) watcher),
+                                       0) !is completionPort)
+            {
+                return false;
+            }
 
-			try
-			{
-				overlapped = MmapPool.instance.make!SocketState;
-				socket.beginAccept(overlapped);
-			}
-			catch (SocketException e)
-			{
-				MmapPool.instance.dispose(overlapped);
-				defaultAllocator.dispose(e);
-				return false;
-			}
-		}
-		if (!(oldEvents & Event.read) && (events & Event.read)
-			|| !(oldEvents & Event.write) && (events & Event.write))
-		{
-			auto io = cast(IOWatcher) watcher;
-			assert(io !is null);
+            try
+            {
+                overlapped = MmapPool.instance.make!SocketState;
+                socket.beginAccept(overlapped);
+            }
+            catch (SocketException e)
+            {
+                MmapPool.instance.dispose(overlapped);
+                defaultAllocator.dispose(e);
+                return false;
+            }
+        }
+        if (!(oldEvents & Event.read) && (events & Event.read)
+            || !(oldEvents & Event.write) && (events & Event.write))
+        {
+            auto transport = cast(StreamTransport) watcher;
+            assert(transport !is null);
 
-			auto transport = cast(IOCPStreamTransport) io.transport;
-			assert(transport !is null);
+            if (CreateIoCompletionPort(cast(HANDLE) transport.socket.handle,
+                                       completionPort,
+                                       cast(ULONG_PTR) (cast(void*) watcher),
+                                       0) !is completionPort)
+            {
+                return false;
+            }
 
-			if (CreateIoCompletionPort(cast(HANDLE) transport.socket.handle,
-									   completionPort,
-									   cast(ULONG_PTR) (cast(void*) watcher),
-									   0) !is completionPort)
-			{
-				return false;
-			}
+            // Begin to read
+            if (!(oldEvents & Event.read) && (events & Event.read))
+            {
+                try
+                {
+                    overlapped = MmapPool.instance.make!SocketState;
+                    transport.socket.beginReceive(transport.output[], overlapped);
+                }
+                catch (SocketException e)
+                {
+                    MmapPool.instance.dispose(overlapped);
+                    defaultAllocator.dispose(e);
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
 
-			// Begin to read
-			if (!(oldEvents & Event.read) && (events & Event.read))
-			{
-				try
-				{
-					overlapped = MmapPool.instance.make!SocketState;
-					transport.socket.beginReceive(io.output[], overlapped);
-				}
-				catch (SocketException e)
-				{
-					MmapPool.instance.dispose(overlapped);
-					defaultAllocator.dispose(e);
-					return false;
-				}
-			}
-		}
-		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.
-	 */
-	override protected void poll() @nogc
-	{
-		DWORD lpNumberOfBytes;
-		ULONG_PTR key;
-		LPOVERLAPPED overlap;
-		immutable timeout = cast(immutable int) blockTime.total!"msecs";
+    /**
+     * Does the actual polling.
+     */
+    override protected void poll() @nogc
+    {
+        DWORD lpNumberOfBytes;
+        ULONG_PTR key;
+        LPOVERLAPPED overlap;
+        immutable timeout = cast(immutable int) blockTime.total!"msecs";
 
-		auto result = GetQueuedCompletionStatus(completionPort,
-												&lpNumberOfBytes,
-												&key,
-												&overlap,
-												timeout);
-		if (result == FALSE && overlap == NULL)
-		{
-			return; // Timeout
-		}
+        auto result = GetQueuedCompletionStatus(completionPort,
+                                                &lpNumberOfBytes,
+                                                &key,
+                                                &overlap,
+                                                timeout);
+        if (result == FALSE && overlap == NULL)
+        {
+            return; // Timeout
+        }
 
-		auto overlapped = (cast(SocketState) ((cast(void*) overlap) - 8));
-		assert(overlapped !is null);
-		scope (failure)
-		{
-			MmapPool.instance.dispose(overlapped);
-		}
+        auto overlapped = (cast(SocketState) ((cast(void*) overlap) - 8));
+        assert(overlapped !is null);
+        scope (failure)
+        {
+            MmapPool.instance.dispose(overlapped);
+        }
 
-		switch (overlapped.event)
-		{
-			case OverlappedSocketEvent.accept:
-				auto connection = cast(ConnectionWatcher) (cast(void*) key);
-				assert(connection !is null);
+        switch (overlapped.event)
+        {
+            case OverlappedSocketEvent.accept:
+                auto connection = cast(ConnectionWatcher) (cast(void*) key);
+                assert(connection !is null);
 
-				auto listener = cast(OverlappedStreamSocket) connection.socket;
-				assert(listener !is null);
+                auto listener = cast(OverlappedStreamSocket) connection.socket;
+                assert(listener !is null);
 
-				auto socket = listener.endAccept(overlapped);
-				auto transport = MmapPool.instance.make!IOCPStreamTransport(socket);
-				auto io = MmapPool.instance.make!IOWatcher(transport, connection.protocol);
+                auto socket = listener.endAccept(overlapped);
+                auto transport = MmapPool.instance.make!StreamTransport(socket);
 
-				connection.incoming.insertBack(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.insertBack(connection);
-				listener.beginAccept(overlapped);
-				break;
-			case OverlappedSocketEvent.read:
-				auto io = cast(IOWatcher) (cast(void*) key);
-				assert(io !is null);
-				if (!io.active)
-				{
-					MmapPool.instance.dispose(io);
-					MmapPool.instance.dispose(overlapped);
-					return;
-				}
+                pendings.enqueue(connection);
+                listener.beginAccept(overlapped);
+                break;
+            case OverlappedSocketEvent.read:
+                auto transport = cast(StreamTransport) (cast(void*) key);
+                assert(transport !is null);
 
-				auto transport = cast(IOCPStreamTransport) io.transport;
-				assert(transport !is null);
+                if (!transport.active)
+                {
+                    MmapPool.instance.dispose(transport);
+                    MmapPool.instance.dispose(overlapped);
+                    return;
+                }
 
-				int received;
-				SocketException exception;
-				try
-				{
-					received = transport.socket.endReceive(overlapped);
-				}
-				catch (SocketException e)
-				{
-					exception = e;
-				}
-				if (transport.socket.disconnected)
-				{
-					// We want to get one last notification to destroy the watcher
-					transport.socket.beginReceive(io.output[], overlapped);
-					kill(io, exception);
-				}
-				else if (received > 0)
-				{
-					immutable full = io.output.free == received;
+                int received;
+                SocketException exception;
+                try
+                {
+                    received = transport.socket.endReceive(overlapped);
+                }
+                catch (SocketException e)
+                {
+                    exception = e;
+                }
+                if (transport.socket.disconnected)
+                {
+                    // We want to get one last notification to destroy the watcher.
+                    transport.socket.beginReceive(transport.output[], overlapped);
+                    kill(transport, exception);
+                }
+                else if (received > 0)
+                {
+                    immutable full = transport.output.free == received;
 
-					io.output += received;
-					// Receive was interrupted because the buffer is full. We have to continue
-					if (full)
-					{
-						transport.socket.beginReceive(io.output[], overlapped);
-					}
-					swapPendings.insertBack(io);
-				}
-				break;
-			case OverlappedSocketEvent.write:
-				auto io = cast(IOWatcher) (cast(void*) key);
-				assert(io !is null);
+                    transport.output += received;
+                    // Receive was interrupted because the buffer is full. We have to continue.
+                    if (full)
+                    {
+                        transport.socket.beginReceive(transport.output[], overlapped);
+                    }
+                    pendings.enqueue(transport);
+                }
+                break;
+            case OverlappedSocketEvent.write:
+                auto transport = cast(StreamTransport) (cast(void*) key);
+                assert(transport !is null);
 
-				auto transport = cast(IOCPStreamTransport) io.transport;
-				assert(transport !is null);
-
-				transport.input += transport.socket.endSend(overlapped);
-				if (transport.input.length)
-				{
-					transport.socket.beginSend(transport.input[], overlapped);
-				}
-				else
-				{
-					transport.socket.beginReceive(io.output[], overlapped);
-				}
-				break;
-			default:
-				assert(false, "Unknown event");
-		}
-	}
+                transport.input += transport.socket.endSend(overlapped);
+                if (transport.input.length > 0)
+                {
+                    transport.socket.beginSend(transport.input[], overlapped);
+                }
+                else
+                {
+                    transport.socket.beginReceive(transport.output[], overlapped);
+                    if (transport.isClosing())
+                    {
+                        kill(transport);
+                    }
+                }
+                break;
+            default:
+                assert(false, "Unknown event");
+        }
+    }
 }

source/tanya/async/event/kqueue.d

@@ -2,99 +2,115 @@
  * 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.
+/*
+ * Event loop implementation for *BSD.
+ *
+ * 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.async.event.kqueue;
 
-version (OSX)
+version (D_Ddoc)
 {
-	version = MacBSD;
+}
+else version (OSX)
+{
+    version = MacBSD;
 }
 else version (iOS)
 {
-	version = MacBSD;
+    version = MacBSD;
 }
 else version (TVOS)
 {
-	version = MacBSD;
+    version = MacBSD;
 }
 else version (WatchOS)
 {
-	version = MacBSD;
+    version = MacBSD;
 }
 else version (FreeBSD)
 {
-	version = MacBSD;
+    version = MacBSD;
 }
 else version (OpenBSD)
 {
-	version = MacBSD;
+    version = MacBSD;
 }
 else version (DragonFlyBSD)
 {
-	version = MacBSD;
+    version = MacBSD;
 }
 
 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.array;
+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
 {
-	*kevp = kevent_t(args);
+    *kevp = kevent_t(args);
 }
 
 enum : short
 {
-	EVFILT_READ     =  -1,
-	EVFILT_WRITE    =  -2,
-	EVFILT_AIO      =  -3, /* attached to aio requests */
-	EVFILT_VNODE    =  -4, /* attached to vnodes */
-	EVFILT_PROC     =  -5, /* attached to struct proc */
-	EVFILT_SIGNAL   =  -6, /* attached to struct proc */
-	EVFILT_TIMER    =  -7, /* timers */
-	EVFILT_MACHPORT =  -8, /* Mach portsets */
-	EVFILT_FS       =  -9, /* filesystem events */
-	EVFILT_USER     = -10, /* User events */
-	EVFILT_VM       = -12, /* virtual memory events */
-	EVFILT_SYSCOUNT =  11
+    EVFILT_READ     =  -1,
+    EVFILT_WRITE    =  -2,
+    EVFILT_AIO      =  -3, /* attached to aio requests */
+    EVFILT_VNODE    =  -4, /* attached to vnodes */
+    EVFILT_PROC     =  -5, /* attached to struct proc */
+    EVFILT_SIGNAL   =  -6, /* attached to struct proc */
+    EVFILT_TIMER    =  -7, /* timers */
+    EVFILT_MACHPORT =  -8, /* Mach portsets */
+    EVFILT_FS       =  -9, /* filesystem events */
+    EVFILT_USER     = -10, /* User events */
+    EVFILT_VM       = -12, /* virtual memory events */
+    EVFILT_SYSCOUNT =  11
 }
 
 struct kevent_t
 {
-	uintptr_t    ident; /* identifier for this event */
-	short       filter; /* filter for event */
-	ushort       flags;
-	uint        fflags;
-	intptr_t      data;
-	void        *udata; /* opaque user data identifier */
+    uintptr_t    ident; /* identifier for this event */
+    short       filter; /* filter for event */
+    ushort       flags;
+    uint        fflags;
+    intptr_t      data;
+    void        *udata; /* opaque user data identifier */
 }
 
 enum
 {
-	/* actions */
-	EV_ADD      = 0x0001, /* add event to kq (implies enable) */
-	EV_DELETE   = 0x0002, /* delete event from kq */
-	EV_ENABLE   = 0x0004, /* enable event */
-	EV_DISABLE  = 0x0008, /* disable event (not reported) */
+    /* actions */
+    EV_ADD      = 0x0001, /* add event to kq (implies enable) */
+    EV_DELETE   = 0x0002, /* delete event from kq */
+    EV_ENABLE   = 0x0004, /* enable event */
+    EV_DISABLE  = 0x0008, /* disable event (not reported) */
 
-	/* flags */
-	EV_ONESHOT  = 0x0010, /* only report one occurrence */
-	EV_CLEAR    = 0x0020, /* clear event state after reporting */
-	EV_RECEIPT  = 0x0040, /* force EV_ERROR on success, data=0 */
-	EV_DISPATCH = 0x0080, /* disable event after reporting */
+    /* flags */
+    EV_ONESHOT  = 0x0010, /* only report one occurrence */
+    EV_CLEAR    = 0x0020, /* clear event state after reporting */
+    EV_RECEIPT  = 0x0040, /* force EV_ERROR on success, data=0 */
+    EV_DISPATCH = 0x0080, /* disable event after reporting */
 
-	EV_SYSFLAGS = 0xF000, /* reserved by system */
-	EV_FLAG1    = 0x2000, /* filter-specific flag */
+    EV_SYSFLAGS = 0xF000, /* reserved by system */
+    EV_FLAG1    = 0x2000, /* filter-specific flag */
 
-	/* returned values */
-	EV_EOF      = 0x8000, /* EOF detected */
-	EV_ERROR    = 0x4000, /* error, data contains errno */
+    /* returned values */
+    EV_EOF      = 0x8000, /* EOF detected */
+    EV_ERROR    = 0x4000, /* error, data contains errno */
 }
 
 extern(C) int kqueue() nothrow @nogc;
@@ -102,225 +118,213 @@ 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;
-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
+final class KqueueLoop : SelectorLoop
 {
-	protected int fd;
-	private kevent_t[] events;
-	private kevent_t[] changes;
-	private size_t changeCount;
+    protected int fd;
+    private Array!kevent_t events;
+    private Array!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()
-	inout const pure nothrow @safe @nogc
-	{
-		return cast(uint) events.length;
-	}
+    /**
+     * Returns: Maximal event count can be got at a time
+     *          (should be supported by the backend).
+     */
+    override protected @property uint maxEvents()
+    const pure nothrow @safe @nogc
+    {
+        return cast(uint) events.length;
+    }
 
-	this() @nogc
-	{
-		super();
+    this() @nogc
+    {
+        super();
 
-		if ((fd = kqueue()) == -1)
-		{
-			throw MmapPool.instance.make!BadLoopException("epoll initialization failed");
-		}
-		MmapPool.instance.resizeArray(events, 64);
-		MmapPool.instance.resizeArray(changes, 64);
-	}
+        if ((fd = kqueue()) == -1)
+        {
+            throw make!BadLoopException(defaultAllocator,
+                                        "kqueue initialization failed");
+        }
+        events = Array!kevent_t(64, MmapPool.instance);
+        changes = Array!kevent_t(64, MmapPool.instance);
+    }
 
-	/**
-	 * Free loop internals.
-	 */
-	~this() @nogc
-	{
-		MmapPool.instance.dispose(events);
-		MmapPool.instance.dispose(changes);
-		close(fd);
-	}
+    /**
+     * Frees loop internals.
+     */
+    ~this() @nogc
+    {
+        close(fd);
+    }
 
-	private void set(socket_t socket, short filter, ushort flags) @nogc
-	{
-		if (changes.length <= changeCount)
-		{
-			MmapPool.instance.resizeArray(changes, changeCount + maxEvents);
-		}
-		EV_SET(&changes[changeCount],
-			   cast(ulong) socket,
-			   filter,
-			   flags,
-			   0U,
-			   0L,
-			   null);
-		++changeCount;
-	}
+    private void set(SocketType socket, short filter, ushort flags) @nogc
+    {
+        if (changes.length <= changeCount)
+        {
+            changes.length = changeCount + maxEvents;
+        }
+        EV_SET(&changes[changeCount],
+               cast(ulong) socket,
+               filter,
+               flags,
+               0U,
+               0L,
+               null);
+        ++changeCount;
+    }
 
-	/**
-	 * 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 protected bool reify(ConnectionWatcher watcher,
-	                              EventMask oldEvents,
-	                              EventMask events) @nogc
-	{
-		if (events != oldEvents)
-		{
-			if (oldEvents & Event.read || oldEvents & Event.accept)
-			{
-				set(watcher.socket.handle, EVFILT_READ, EV_DELETE);
-			}
-			if (oldEvents & Event.write)
-			{
-				set(watcher.socket.handle, EVFILT_WRITE, EV_DELETE);
-			}
-		}
-		if (events & (Event.read | events & Event.accept))
-		{
-			set(watcher.socket.handle, EVFILT_READ, EV_ADD | EV_ENABLE);
-		}
-		if (events & Event.write)
-		{
-			set(watcher.socket.handle, EVFILT_WRITE, EV_ADD | EV_DISPATCH);
-		}
-		return true;
-	}
+    /**
+     * 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 protected bool reify(SocketWatcher watcher,
+                                  EventMask oldEvents,
+                                  EventMask events) @nogc
+    {
+        if (events != oldEvents)
+        {
+            if (oldEvents & Event.read || oldEvents & Event.accept)
+            {
+                set(watcher.socket.handle, EVFILT_READ, EV_DELETE);
+            }
+            if (oldEvents & Event.write)
+            {
+                set(watcher.socket.handle, EVFILT_WRITE, EV_DELETE);
+            }
+        }
+        if (events & (Event.read | events & Event.accept))
+        {
+            set(watcher.socket.handle, EVFILT_READ, EV_ADD | EV_ENABLE);
+        }
+        if (events & Event.write)
+        {
+            set(watcher.socket.handle, EVFILT_WRITE, EV_ADD | EV_DISPATCH);
+        }
+        return true;
+    }
 
-	/**
-	 * Does the actual polling.
-	 */
-	protected override void poll() @nogc
-	{
-		timespec ts;
-		blockTime.split!("seconds", "nsecs")(ts.tv_sec, ts.tv_nsec);
+    /**
+     * Does the actual polling.
+     */
+    protected override void poll() @nogc
+    {
+        timespec ts;
+        blockTime.split!("seconds", "nsecs")(ts.tv_sec, ts.tv_nsec);
 
-		if (changeCount > maxEvents) 
-		{
-			MmapPool.instance.resizeArray(events, changes.length);
-		}
+        if (changeCount > maxEvents) 
+        {
+            events.length = changes.length;
+        }
 
-		auto eventCount = kevent(fd, changes.ptr, cast(int) changeCount, events.ptr, maxEvents, &ts);
-		changeCount = 0;
+        auto eventCount = kevent(fd,
+                                 changes.get().ptr,
+                                 cast(int) changeCount,
+                                 events.get().ptr,
+                                 maxEvents,
+                                 &ts);
+        changeCount = 0;
 
-		if (eventCount < 0)
-		{
-			if (errno != EINTR)
-			{
-				throw defaultAllocator.make!BadLoopException();
-			}
-			return;
-		}
+        if (eventCount < 0)
+        {
+            if (errno != EINTR)
+            {
+                throw defaultAllocator.make!BadLoopException();
+            }
+            return;
+        }
 
-		for (int i; i < eventCount; ++i)
-		{
-			assert(connections.length > events[i].ident);
+        for (int i; i < eventCount; ++i)
+        {
+            assert(connections.length > events[i].ident);
 
-			IOWatcher io = cast(IOWatcher) connections[events[i].ident];
-			// If it is a ConnectionWatcher. Accept connections.
-			if (io is null)
-			{
-				acceptConnections(connections[events[i].ident]);
-			}
-			else if (events[i].flags & EV_ERROR)
-			{
-				kill(io, null);
-			}
-			else if (events[i].filter == EVFILT_READ)
-			{
-				auto transport = cast(SelectorStreamTransport) io.transport;
-				assert(transport !is null);
+            auto transport = cast(StreamTransport) connections[events[i].ident];
+            // If it is a ConnectionWatcher. Accept connections.
+            if (transport is null)
+            {
+                auto connection = cast(ConnectionWatcher) connections[events[i].ident];
+                assert(connection !is null);
 
-				SocketException exception;
-				try
-				{
-					ptrdiff_t received;
-					do
-					{
-						received = transport.socket.receive(io.output[]);
-						io.output += received;
-					}
-					while (received);
-				}
-				catch (SocketException e)
-				{
-					exception = e;
-				}
-				if (transport.socket.disconnected)
-				{
-					kill(io, exception);
-				}
-				else if (io.output.length)
-				{
-					swapPendings.insertBack(io);
-				}
-			}
-			else if (events[i].filter == EVFILT_WRITE)
-			{
-				auto transport = cast(SelectorStreamTransport) io.transport;
-				assert(transport !is null);
+                acceptConnections(connection);
+            }
+            else if (events[i].flags & EV_ERROR)
+            {
+                kill(transport);
+            }
+            else if (events[i].filter == EVFILT_READ)
+            {
+                SocketException exception;
+                try
+                {
+                    ptrdiff_t received;
+                    do
+                    {
+                        received = transport.socket.receive(transport.output[]);
+                        transport.output += received;
+                    }
+                    while (received);
+                }
+                catch (SocketException e)
+                {
+                    exception = e;
+                }
+                if (transport.socket.disconnected)
+                {
+                    kill(transport, exception);
+                }
+                else if (transport.output.length)
+                {
+                    pendings.enqueue(transport);
+                }
+            }
+            else if (events[i].filter == EVFILT_WRITE)
+            {
+                transport.writeReady = true;
+                if (transport.input.length)
+                {
+                    feed(transport);
+                }
+            }
+        }
+    }
 
-				transport.writeReady = true;
-				if (transport.input.length)
-				{
-					feed(transport);
-				}
-			}
-		}
-	}
+    /**
+     * Returns: The blocking time.
+     */
+    override protected @property inout(Duration) blockTime()
+    inout @nogc @safe pure nothrow
+    {
+        return min(super.blockTime, 1.dur!"seconds");
+    }
 
-	/**
-	 * Returns: The blocking time.
-	 */
-	override protected @property inout(Duration) blockTime()
-	inout @nogc @safe pure nothrow
-	{
-		return min(super.blockTime, 1.dur!"seconds");
-	}
-
-	/**
-	 * If the transport couldn't send the data, the further sending should
-	 * be handled by the event loop.
-	 *
-	 * Params:
-	 * 	transport = Transport.
-	 * 	exception = Exception thrown on sending.
-	 *
-	 * Returns: $(D_KEYWORD true) if the operation could be successfully
-	 *          completed or scheduled, $(D_KEYWORD false) otherwise (the
-	 *          transport is be destroyed then).
-	 */
-	protected override bool feed(SelectorStreamTransport transport,
-	                             SocketException exception = null) @nogc
-	{
-		if (!super.feed(transport, exception))
-		{
-			return false;
-		}
-		if (!transport.writeReady)
-		{
-			set(transport.socket.handle, EVFILT_WRITE, EV_DISPATCH);
-			return true;
-		}
-		return false;
-	}
+    /**
+     * If the transport couldn't send the data, the further sending should
+     * be handled by the event loop.
+     *
+     * Params:
+     * 	transport = Transport.
+     * 	exception = Exception thrown on sending.
+     *
+     * Returns: $(D_KEYWORD true) if the operation could be successfully
+     *          completed or scheduled, $(D_KEYWORD false) otherwise (the
+     *          transport will be destroyed then).
+     */
+    protected override bool feed(StreamTransport transport,
+                                 SocketException exception = null) @nogc
+    {
+        if (!super.feed(transport, exception))
+        {
+            return false;
+        }
+        if (!transport.writeReady)
+        {
+            set(transport.socket.handle, EVFILT_WRITE, EV_DISPATCH);
+            return true;
+        }
+        return false;
+    }
 }

source/tanya/async/event/selector.d

@@ -2,258 +2,404 @@
  * 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.
+/*
+ * This module contains base implementations for reactor event loops.
+ *
+ * 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):
+version (D_Ddoc)
+{
+}
+else 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.array;
 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;
 
-	/// Input buffer.
-	package WriteBuffer!ubyte input;
+    private SocketException exception;
 
-	private SelectorLoop loop;
+    package ReadBuffer!ubyte output;
 
-	/// Received notification that the underlying socket is write-ready.
-	package bool writeReady;
+    package WriteBuffer!ubyte input;
 
-	/**
-	 * Params:
-	 * 	loop     = Event loop.
-	 * 	socket   = Socket.
-	 */
-	this(SelectorLoop loop, ConnectedSocket socket) @nogc
-	{
-		socket_ = socket;
-		this.loop = loop;
-		input = WriteBuffer!ubyte(8192, MmapPool.instance);
-	}
+    private Protocol protocol_;
 
-	/**
-	 * Returns: Transport socket.
-	 */
-	inout(ConnectedSocket) socket() inout pure nothrow @safe @nogc
-	{
-		return socket_;
-	}
+    private bool closing;
 
-	/**
-	 * Write some data to the transport.
-	 *
-	 * Params:
-	 * 	data = Data to send.
-	 */
-	void write(ubyte[] data) @nogc
-	{
-		if (!data.length)
-		{
-			return;
-		}
-		// Try to write if the socket is write ready.
-		if (writeReady)
-		{
-			ptrdiff_t sent;
-			SocketException exception;
-			try
-			{
-				sent = socket.send(data);
-				if (sent == 0)
-				{
-					writeReady = false;
-				}
-			}
-			catch (SocketException e)
-			{
-				writeReady = false;
-				exception = e;
-			}
-			if (sent < data.length)
-			{
-				input ~= data[sent..$];
-				loop.feed(this, exception);
-			}
-		}
-		else
-		{
-			input ~= data;
-		}
-	}
+    /// Received notification that the underlying socket is write-ready.
+    package bool writeReady;
+
+    /**
+     * Params:
+     *  loop   = Event loop.
+     *  socket = Socket.
+     *
+     * Precondition: $(D_INLINECODE loop !is null && socket !is null)
+     */
+    this(SelectorLoop loop, ConnectedSocket socket) @nogc
+    in 
+    {
+        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: Socket.
+     *
+     * Postcondition: $(D_INLINECODE socket !is null)
+     */
+    override @property ConnectedSocket socket() pure nothrow @safe @nogc
+    out (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;
+        }
+    }
+
+    /**
+     * Write some data to the transport.
+     *
+     * Params:
+     *  data = Data to send.
+     */
+    void write(ubyte[] data) @nogc
+    {
+        if (!data.length)
+        {
+            return;
+        }
+        // Try to write if the socket is write ready.
+        if (writeReady)
+        {
+            ptrdiff_t sent;
+            SocketException exception;
+            try
+            {
+                sent = socket.send(data);
+                if (sent == 0)
+                {
+                    writeReady = false;
+                }
+            }
+            catch (SocketException e)
+            {
+                writeReady = false;
+                exception = e;
+            }
+            if (sent < data.length)
+            {
+                input ~= data[sent..$];
+                loop.feed(this, exception);
+            }
+        }
+        else
+        {
+            input ~= data;
+        }
+    }
 }
 
 abstract class SelectorLoop : Loop
 {
-	/// Pending connections.
-	protected ConnectionWatcher[] connections;
+    /// Pending connections.
+    protected Array!SocketWatcher connections;
 
-	this() @nogc
-	{
-		super();
-		MmapPool.instance.resizeArray(connections, maxEvents);
-	}
+    this() @nogc
+    {
+        super();
+        connections = Array!SocketWatcher(maxEvents, MmapPool.instance);
+    }
 
-	~this() @nogc
-	{
-		foreach (ref connection; connections)
-		{
-			// We want to free only IOWatchers. ConnectionWatcher are created by the
-			// user and should be freed by himself.
-			auto io = cast(IOWatcher) connection;
-			if (io !is null)
-			{
-				MmapPool.instance.dispose(io);
-				connection = null;
-			}
-		}
-		MmapPool.instance.dispose(connections);
-	}
+    ~this() @nogc
+    {
+        foreach (ref connection; connections)
+        {
+            // We want to free only the transports. ConnectionWatcher are
+            // created by the user and should be freed by himself.
+            if (cast(StreamTransport) connection !is null)
+            {
+                MmapPool.instance.dispose(connection);
+            }
+        }
+    }
 
-	/**
-	 * If the transport couldn't send the data, the further sending should
-	 * be handled by the event loop.
-	 *
-	 * Params:
-	 * 	transport = Transport.
-	 * 	exception = Exception thrown on sending.
-	 *
-	 * Returns: $(D_KEYWORD true) if the operation could be successfully
-	 *          completed or scheduled, $(D_KEYWORD false) otherwise (the
-	 *          transport will be destroyed then).
-	 */
-	protected bool feed(SelectorStreamTransport transport,
-	                    SocketException exception = null) @nogc
-	{
-		while (transport.input.length && transport.writeReady)
-		{
-			try
-			{
-				ptrdiff_t sent = transport.socket.send(transport.input[]);
-				if (sent == 0)
-				{
-					transport.writeReady = false;
-				}
-				else
-				{
-					transport.input += sent;
-				}
-			}
-			catch (SocketException e)
-			{
-				exception = e;
-				transport.writeReady = false;
-			}
-		}
-		if (exception !is null)
-		{
-			auto watcher = cast(IOWatcher) connections[transport.socket.handle];
-			assert(watcher !is null);
+    /**
+     * 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;
 
-			kill(watcher, exception);
-			return false;
-		}
-		return true;
-	}
+    /**
+     * 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);
+    }
 
-	/**
-	 * Start watching.
-	 *
-	 * Params:
-	 * 	watcher = Watcher.
-	 */
-	override void start(ConnectionWatcher watcher) @nogc
-	{
-		if (watcher.active)
-		{
-			return;
-		}
+    /**
+     * If the transport couldn't send the data, the further sending should
+     * be handled by the event loop.
+     *
+     * Params:
+     *  transport = Transport.
+     *  exception = Exception thrown on sending.
+     *
+     * Returns: $(D_KEYWORD true) if the operation could be successfully
+     *          completed or scheduled, $(D_KEYWORD false) otherwise (the
+     *          transport will be destroyed then).
+     */
+    protected bool feed(StreamTransport transport,
+                        SocketException exception = null) @nogc
+    in
+    {
+        assert(transport !is null);
+    }
+    body
+    {
+        while (transport.input.length && transport.writeReady)
+        {
+            try
+            {
+                ptrdiff_t sent = transport.socket.send(transport.input[]);
+                if (sent == 0)
+                {
+                    transport.writeReady = false;
+                }
+                else
+                {
+                    transport.input += sent;
+                }
+            }
+            catch (SocketException e)
+            {
+                exception = e;
+                transport.writeReady = false;
+            }
+        }
+        if (exception !is null)
+        {
+            kill(transport, exception);
+            return false;
+        }
+        if (transport.input.length == 0 && transport.isClosing())
+        {
+            kill(transport);
+        }
+        return true;
+    }
 
-		if (connections.length <= watcher.socket)
-		{
-			MmapPool.instance.resizeArray(connections, watcher.socket.handle + maxEvents / 2);
-		}
-		connections[watcher.socket.handle] = watcher;
+    /**
+     * Start watching.
+     *
+     * Params:
+     *  watcher = Watcher.
+     */
+    override void start(ConnectionWatcher watcher) @nogc
+    {
+        if (watcher.active)
+        {
+            return;
+        }
 
-		super.start(watcher);
-	}
+        if (connections.length <= watcher.socket)
+        {
+            connections.length = watcher.socket.handle + maxEvents / 2;
+        }
+        connections[watcher.socket.handle] = watcher;
 
-	/**
-	 * Accept incoming connections.
-	 *
-	 * Params:
-	 * 	connection = Connection watcher ready to accept.
-	 */
-	package void acceptConnections(ConnectionWatcher connection) @nogc
-	in
-	{
-		assert(connection !is null);
-	}
-	body
-	{
-		while (true)
-		{
-			ConnectedSocket client;
-			try
-			{
-				client = (cast(StreamSocket) connection.socket).accept();
-			}
-			catch (SocketException e)
-			{
-				defaultAllocator.dispose(e);
-				break;
-			}
-			if (client is null)
-			{
-				break;
-			}
+        super.start(watcher);
+    }
 
-			IOWatcher io;
-			auto transport = MmapPool.instance.make!SelectorStreamTransport(this, client);
+    /**
+     * Accept incoming connections.
+     *
+     * Params:
+     *  connection = Connection watcher ready to accept.
+     */
+    package void acceptConnections(ConnectionWatcher connection) @nogc
+    in
+    {
+        assert(connection !is null);
+    }
+    body
+    {
+        while (true)
+        {
+            ConnectedSocket client;
+            try
+            {
+                client = (cast(StreamSocket) connection.socket).accept();
+            }
+            catch (SocketException e)
+            {
+                defaultAllocator.dispose(e);
+                break;
+            }
+            if (client is null)
+            {
+                break;
+            }
 
-			if (connections.length > client.handle)
-			{
-				io = cast(IOWatcher) connections[client.handle];
-			}
-			else
-			{
-				MmapPool.instance.resizeArray(connections, client.handle + maxEvents / 2);
-			}
-			if (io is null)
-			{
-				io = MmapPool.instance.make!IOWatcher(transport,
-				                                      connection.protocol);
-				connections[client.handle] = io;
-			}
-			else
-			{
-				io(transport, connection.protocol);
-			}
+            StreamTransport transport;
 
-			reify(io, EventMask(Event.none), EventMask(Event.read, Event.write));
-			connection.incoming.insertBack(io);
-		}
+            if (connections.length > client.handle)
+            {
+                transport = cast(StreamTransport) connections[client.handle];
+            }
+            else
+            {
+                connections.length = client.handle + maxEvents / 2;
+            }
+            if (transport is null)
+            {
+                transport = MmapPool.instance.make!StreamTransport(this, client);
+                connections[client.handle] = transport;
+            }
+            else
+            {
+                transport.socket = client;
+            }
 
-		if (!connection.incoming.empty)
-		{
-			swapPendings.insertBack(connection);
-		}
-	}
+            reify(transport, EventMask(Event.none), EventMask(Event.read, Event.write));
+            connection.incoming.enqueue(transport);
+        }
+
+        if (!connection.incoming.empty)
+        {
+            pendings.enqueue(connection);
+        }
+    }
 }

source/tanya/async/iocp.d

@@ -3,14 +3,37 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * This module provides API for Windows I/O Completion Ports.
+ *
+ * Note: Available only on Windows.
+ *
+ * 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;
 
-version (Windows):
+version (Windows)
+{
+    version = WindowsDoc;
+}
+else version (D_Ddoc)
+{
+    version = WindowsDoc;
+    version (Windows)
+    {
+    }
+    else
+    {
+        private struct OVERLAPPED
+        {
+        }
+        private alias HANDLE = void*;
+    }
+}
+
+version (WindowsDoc):
 
 import core.sys.windows.winbase;
 import core.sys.windows.windef;
@@ -21,12 +44,12 @@ import core.sys.windows.windef;
  */
 class State
 {
-	/// For internal use by Windows API.
-	align(1) OVERLAPPED overlapped;
+    /// For internal use by Windows API.
+    align(1) OVERLAPPED overlapped;
 
-	/// File/socket handle.
-	HANDLE handle;
+    /// File/socket handle.
+    HANDLE handle;
 
-	/// For keeping events or event masks.
-	int event;
+    /// For keeping events or event masks.
+    int event;
 }

source/tanya/async/loop.d

@@ -3,10 +3,8 @@
  * 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)
+ * Interface for the event loop implementations and the default event loop
+ * chooser.
  *
  * ---
  * import tanya.async;
@@ -15,52 +13,57 @@
  *
  * class EchoProtocol : TransmissionControlProtocol
  * {
- * 	private DuplexTransport transport;
+ *  private DuplexTransport transport;
  *
- * 	void received(ubyte[] data) @nogc
- * 	{
- * 		transport.write(data);
- * 	}
+ *  void received(in ubyte[] data) @nogc
+ *  {
+ *      transport.write(data);
+ *  }
  *
- * 	void connected(DuplexTransport transport) @nogc
- * 	{
- * 		this.transport = transport;
- * 	}
+ *  void connected(DuplexTransport transport) @nogc
+ *  {
+ *      this.transport = transport;
+ *  }
  *
- * 	void disconnected(SocketException e = null) @nogc
- * 	{
- * 	}
+ *  void disconnected(SocketException e) @nogc
+ *  {
+ *  }
  * }
  *
  * void main()
  * {
- * 	auto address = defaultAllocator.make!InternetAddress("127.0.0.1", cast(ushort) 8192);
+ *  auto address = defaultAllocator.make!InternetAddress("127.0.0.1", cast(ushort) 8192);
  *
- * 	version (Windows)
- * 	{
- * 		auto sock = defaultAllocator.make!OverlappedStreamSocket(AddressFamily.INET);
- * 	}
- * 	else
- * 	{
- * 		auto sock = defaultAllocator.make!StreamSocket(AddressFamily.INET);
- * 		sock.blocking = false;
- * 	}
+ *  version (Windows)
+ *  {
+ *      auto sock = defaultAllocator.make!OverlappedStreamSocket(AddressFamily.inet);
+ *  }
+ *  else
+ *  {
+ *      auto sock = defaultAllocator.make!StreamSocket(AddressFamily.inet);
+ *      sock.blocking = false;
+ *  }
  *
- * 	sock.bind(address);
- * 	sock.listen(5);
+ *  sock.bind(address);
+ *  sock.listen(5);
  *
- * 	auto io = defaultAllocator.make!ConnectionWatcher(sock);
- * 	io.setProtocol!EchoProtocol;
+ *  auto io = defaultAllocator.make!ConnectionWatcher(sock);
+ *  io.setProtocol!EchoProtocol;
  *
- * 	defaultLoop.start(io);
- * 	defaultLoop.run();
+ *  defaultLoop.start(io);
+ *  defaultLoop.run();
  *
- * 	sock.shutdown();
- * 	defaultAllocator.dispose(io);
- * 	defaultAllocator.dispose(sock);
- * 	defaultAllocator.dispose(address);
+ *  sock.shutdown();
+ *  defaultAllocator.dispose(io);
+ *  defaultAllocator.dispose(sock);
+ *  defaultAllocator.dispose(address);
  * }
  * ---
+ *
+ * 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.async.loop;
 
@@ -68,7 +71,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;
@@ -80,35 +82,62 @@ import tanya.network.socket;
 version (DisableBackends)
 {
 }
+else version (D_Ddoc)
+{
+}
 else version (linux)
 {
-	import tanya.async.event.epoll;
-	version = Epoll;
+    import tanya.async.event.epoll;
+    version = Epoll;
 }
 else version (Windows)
 {
-	import tanya.async.event.iocp;
-	version = IOCP;
+    import tanya.async.event.iocp;
+    version = IOCP;
 }
 else version (OSX)
 {
-	version = Kqueue;
+    version = Kqueue;
 }
 else version (iOS)
 {
-	version = Kqueue;
+    version = Kqueue;
 }
 else version (FreeBSD)
 {
-	version = Kqueue;
+    version = Kqueue;
 }
 else version (OpenBSD)
 {
-	version = Kqueue;
+    version = Kqueue;
 }
 else version (DragonFlyBSD)
 {
-	version = Kqueue;
+    version = Kqueue;
+}
+version (unittest)
+{
+    final class TestLoop : Loop
+    {
+        override protected bool reify(SocketWatcher watcher,
+                                      EventMask oldEvents,
+                                      EventMask events) @nogc
+        {
+            return true;
+        }
+
+        override protected void poll() @nogc
+        {
+            assert(!this.done);
+            unloop();
+        }
+
+        override protected @property uint maxEvents()
+        const pure nothrow @safe @nogc
+        {
+            return 64U;
+        }
+    }
 }
 
 /**
@@ -116,11 +145,11 @@ else version (DragonFlyBSD)
  */
 enum Event : uint
 {
-	none   = 0x00,       /// No events.
-	read   = 0x01,       /// Non-blocking read call.
-	write  = 0x02,       /// Non-blocking write call.
-	accept = 0x04,       /// Connection made.
-	error  = 0x80000000, /// Sent when an error occurs.
+    none   = 0x00,       /// No events.
+    read   = 0x01,       /// Non-blocking read call.
+    write  = 0x02,       /// Non-blocking write call.
+    accept = 0x04,       /// Connection made.
+    error  = 0x80000000, /// Sent when an error occurs.
 }
 
 alias EventMask = BitFlags!Event;
@@ -130,172 +159,194 @@ alias EventMask = BitFlags!Event;
  */
 abstract class Loop
 {
-	/// Pending watchers.
-	protected Queue!Watcher* pendings;
+    private bool done = true;
 
-	/// Ditto.
-	protected Queue!Watcher* swapPendings;
+    /// Pending watchers.
+    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()
-	inout const pure nothrow @safe @nogc
-	{
-		return 128U;
-	}
+    /**
+     * Returns: Maximal event count can be got at a time
+     *          (should be supported by the backend).
+     */
+    protected @property uint maxEvents()
+    const pure nothrow @safe @nogc
+    {
+        return 128U;
+    }
 
-	/**
-	 * Initializes the loop.
-	 */
-	this() @nogc
-	{
-		pendings = MmapPool.instance.make!(Queue!Watcher)(MmapPool.instance);
-		swapPendings = MmapPool.instance.make!(Queue!Watcher)(MmapPool.instance);
-	}
+    private unittest
+    {
+        auto loop = defaultAllocator.make!TestLoop;
+        assert(loop.maxEvents == 64);
 
-	/**
-	 * Frees loop internals.
-	 */
-	~this() @nogc
-	{
-		foreach (w; *pendings)
-		{
-			MmapPool.instance.dispose(w);
-		}
-		MmapPool.instance.dispose(pendings);
+        defaultAllocator.dispose(loop);
+    }
 
-		foreach (w; *swapPendings)
-		{
-			MmapPool.instance.dispose(w);
-		}
-		MmapPool.instance.dispose(swapPendings);
-	}
+    /**
+     * Initializes the loop.
+     */
+    this() @nogc
+    {
+        pendings = Queue!Watcher(MmapPool.instance);
+    }
 
-	/**
-	 * Starts the loop.
-	 */
-	void run() @nogc
-	{
-		done_ = false;
-		do
-		{
-			poll();
+    /**
+     * Frees loop internals.
+     */
+    ~this() @nogc
+    {
+        foreach (w; pendings)
+        {
+            MmapPool.instance.dispose(w);
+        }
+    }
 
-			// Invoke pendings
-			swapPendings.each!((ref p) @nogc => p.invoke());
+    /**
+     * Starts the loop.
+     */
+    void run() @nogc
+    {
+        this.done = false;
+        do
+        {
+            poll();
 
-			swap(pendings, swapPendings);
-		}
-		while (!done_);
-	}
+            // Invoke pendings
+            foreach (ref w; this.pendings)
+            {
+                w.invoke();
+            }
+        }
+        while (!this.done);
+    }
 
-	/**
-	 * Break out of the loop.
-	 */
-	void unloop() @safe pure nothrow @nogc
-	{
-		done_ = true;
-	}
+    /**
+     * Break out of the loop.
+     */
+    void unloop() @safe pure nothrow @nogc
+    {
+        this.done = true;
+    }
 
-	/**
-	 * Start watching.
-	 *
-	 * Params:
-	 * 	watcher = Watcher.
-	 */
-	void start(ConnectionWatcher watcher) @nogc
-	{
-		if (watcher.active)
-		{
-			return;
-		}
-		watcher.active = true;
-		reify(watcher, EventMask(Event.none), EventMask(Event.accept));
-	}
+    private unittest
+    {
+        auto loop = defaultAllocator.make!TestLoop;
+        assert(loop.done);
 
-	/**
-	 * Stop watching.
-	 *
-	 * Params:
-	 * 	watcher = Watcher.
-	 */
-	void stop(ConnectionWatcher watcher) @nogc
-	{
-		if (!watcher.active)
-		{
-			return;
-		}
-		watcher.active = false;
+        loop.run();
+        assert(loop.done);
 
-		reify(watcher, EventMask(Event.accept), EventMask(Event.none));
-	}
+        defaultAllocator.dispose(loop);
+    }
 
-	/**
-	 * 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.
-	 */
-	abstract protected bool reify(ConnectionWatcher watcher,
-								  EventMask oldEvents,
-								  EventMask events) @nogc;
+    private unittest
+    {
+        auto loop = defaultAllocator.make!TestLoop;
+        auto watcher = defaultAllocator.make!DummyWatcher;
+        loop.pendings.enqueue(watcher);
 
-	/**
-	 * Returns: The blocking time.
-	 */
-	protected @property inout(Duration) blockTime()
-	inout @safe pure nothrow @nogc
-	{
-		// Don't block if we have to do.
-		return swapPendings.empty ? blockTime_ : Duration.zero;
-	}
+        assert(!watcher.invoked);
+        loop.run();
+        assert(watcher.invoked);
 
-	/**
-	 * Sets the blocking time for IO watchers.
-	 *
-	 * Params:
-	 * 	blockTime = The blocking time. Cannot be larger than
-	 * 	            $(D_PSYMBOL maxBlockTime).
-	 */
-	protected @property void blockTime(in Duration blockTime) @safe pure nothrow @nogc
-	in
-	{
-		assert(blockTime <= 1.dur!"hours", "Too long to wait.");
-		assert(!blockTime.isNegative);
-	}
-	body
-	{
-		blockTime_ = blockTime;
-	}
+        defaultAllocator.dispose(loop);
+        defaultAllocator.dispose(watcher);
+    }
 
-	/**
-	 * 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.insertBack(watcher);
-	}
+    /**
+     * Start watching.
+     *
+     * Params:
+     *  watcher = Watcher.
+     */
+    void start(ConnectionWatcher watcher) @nogc
+    {
+        if (watcher.active)
+        {
+            return;
+        }
+        watcher.active = true;
 
-	/**
-	 * Does the actual polling.
-	 */
-	abstract protected void poll() @nogc;
+        reify(watcher, EventMask(Event.none), EventMask(Event.accept));
+    }
 
-	/// Whether the event loop should be stopped.
-	private bool done_;
+    /**
+     * Stop watching.
+     *
+     * Params:
+     *  watcher = Watcher.
+     */
+    void stop(ConnectionWatcher watcher) @nogc
+    {
+        if (!watcher.active)
+        {
+            return;
+        }
+        watcher.active = false;
 
-	/// Maximal block time.
-	protected Duration blockTime_ = 1.dur!"minutes";
+        reify(watcher, EventMask(Event.accept), EventMask(Event.none));
+    }
+
+    /**
+     * 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.
+     */
+    abstract protected bool reify(SocketWatcher watcher,
+                                  EventMask oldEvents,
+                                  EventMask events) @nogc;
+
+    /**
+     * Returns: The blocking time.
+     */
+    protected @property inout(Duration) blockTime()
+    inout @safe pure nothrow @nogc
+    {
+        // Don't block if we have to do.
+        return pendings.empty ? blockTime_ : Duration.zero;
+    }
+
+    /**
+     * Sets the blocking time for IO watchers.
+     *
+     * Params:
+     *  blockTime = The blocking time. Cannot be larger than
+     *              $(D_PSYMBOL maxBlockTime).
+     */
+    protected @property void blockTime(in Duration blockTime) @safe pure nothrow @nogc
+    in
+    {
+        assert(blockTime <= 1.dur!"hours", "Too long to wait.");
+        assert(!blockTime.isNegative);
+    }
+    body
+    {
+        blockTime_ = blockTime;
+    }
+
+    private unittest
+    {
+        auto loop = defaultAllocator.make!TestLoop;
+        assert(loop.blockTime == 1.dur!"minutes");
+
+        loop.blockTime = 2.dur!"minutes";
+        assert(loop.blockTime == 2.dur!"minutes");
+
+        defaultAllocator.dispose(loop);
+    }
+
+    /**
+     * Does the actual polling.
+     */
+    abstract protected void poll() @nogc;
+
+    /// Maximal block time.
+    protected Duration blockTime_ = 1.dur!"minutes";
 }
 
 /**
@@ -303,17 +354,17 @@ abstract class Loop
  */
 class BadLoopException : Exception
 {
-	/**
-	 * Params:
-	 * 	file = The file where the exception occurred.
-	 * 	line = The line number where the exception occurred.
-	 * 	next = The previous exception in the chain of exceptions, if any.
-	 */
-	this(string file = __FILE__, size_t line = __LINE__, Throwable next = null)
-	pure nothrow const @safe @nogc
-	{
-		super("Event loop cannot be initialized.", file, line, next);
-	}
+    /**
+     * Params:
+     *  file = The file where the exception occurred.
+     *  line = The line number where the exception occurred.
+     *  next = The previous exception in the chain of exceptions, if any.
+     */
+    this(string file = __FILE__, size_t line = __LINE__, Throwable next = null)
+    pure nothrow const @safe @nogc
+    {
+        super("Event loop cannot be initialized.", file, line, next);
+    }
 }
 
 /**
@@ -325,24 +376,24 @@ class BadLoopException : Exception
  */
 @property Loop defaultLoop() @nogc
 {
-	if (defaultLoop_ !is null)
-	{
-		return defaultLoop_;
-	}
-	version (Epoll)
-	{
-		defaultLoop_ = MmapPool.instance.make!EpollLoop;
-	}
-	else version (IOCP)
-	{
-		defaultLoop_ = MmapPool.instance.make!IOCPLoop;
-	}
-	else version (Kqueue)
-	{
-		import tanya.async.event.kqueue;
-		defaultLoop_ = MmapPool.instance.make!KqueueLoop;
-	}
-	return defaultLoop_;
+    if (defaultLoop_ !is null)
+    {
+        return defaultLoop_;
+    }
+    version (Epoll)
+    {
+        defaultLoop_ = MmapPool.instance.make!EpollLoop;
+    }
+    else version (IOCP)
+    {
+        defaultLoop_ = MmapPool.instance.make!IOCPLoop;
+    }
+    else version (Kqueue)
+    {
+        import tanya.async.event.kqueue;
+        defaultLoop_ = MmapPool.instance.make!KqueueLoop;
+    }
+    return defaultLoop_;
 }
 
 /**
@@ -354,16 +405,29 @@ class BadLoopException : Exception
  * your implementation to this property.
  *
  * Params:
- * 	loop = The event loop.
+ *  loop = The event loop.
  */
 @property void defaultLoop(Loop loop) @nogc
 in
 {
-	assert(loop !is null);
+    assert(loop !is null);
 }
 body
 {
-	defaultLoop_ = loop;
+    defaultLoop_ = loop;
 }
 
 private Loop defaultLoop_;
+
+private unittest
+{
+    auto oldLoop = defaultLoop_;
+    auto loop = defaultAllocator.make!TestLoop;
+
+    defaultLoop = loop;
+    assert(defaultLoop_ is loop);
+    assert(defaultLoop is loop);
+
+    defaultLoop_ = oldLoop;
+    defaultAllocator.dispose(loop);
+}

source/tanya/async/package.d

@@ -3,10 +3,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * This package provides asynchronous capabilities.
+ *
+ * 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,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * This module contains protocol which handle data in asynchronous
+ * applications.
+ *
+ * When an event from the network arrives, a protocol method gets
+ * called and can respond to the event.
+ *
+ * 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;
 
@@ -18,28 +24,28 @@ import tanya.async.transport;
  */
 interface Protocol
 {
-	/**
-	 * Params:
-	 * 	data = Read data.
-	 */
-	void received(ubyte[] data) @nogc;
+    /**
+     * Params:
+     *  data = Read data.
+     */
+    void received(in ubyte[] data) @nogc;
 
-	/**
-	 * Called when a connection is made.
-	 *
-	 * Params:
-	 * 	transport = Protocol transport.
-	 */
-	void connected(DuplexTransport transport) @nogc;
+    /**
+     * Called when a connection is made.
+     *
+     * Params:
+     *  transport = Protocol transport.
+     */
+    void connected(DuplexTransport transport) @nogc;
 
-	/**
-	 * Called when a connection is lost.
-	 *
-	 * Params:
-	 * 	exception = $(D_PSYMBOL Exception) if an error caused
-	 * 	            the disconnect, $(D_KEYWORD null) otherwise.
-	 */
-	void disconnected(SocketException exception = null) @nogc;
+    /**
+     * Called when a connection is lost.
+     *
+     * Params:
+     *  exception = $(D_PSYMBOL Exception) if an error caused
+     *              the disconnect, $(D_KEYWORD null) otherwise.
+     */
+    void disconnected(SocketException exception) @nogc;
 }
 
 /**

source/tanya/async/transport.d

@@ -3,13 +3,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * This module contains transports which are responsible for data dilvery
+ * between two parties of an asynchronous communication.
+ *
+ * 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;
 
 /**
@@ -31,13 +35,13 @@ interface ReadTransport : Transport
  */
 interface WriteTransport : Transport
 {
-	/**
-	 * Write some data to the transport.
-	 *
-	 * Params:
-	 * 	data = Data to send.
-	 */
-	void write(ubyte[] data) @nogc;
+    /**
+     * Write some data to the transport.
+     *
+     * Params:
+     *  data = Data to send.
+     */
+    void write(ubyte[] data) @nogc;
 }
 
 /**
@@ -45,6 +49,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 +96,8 @@ interface DuplexTransport : ReadTransport, WriteTransport
  */
 interface SocketTransport : Transport
 {
-	@property inout(Socket) socket() inout pure nothrow @safe @nogc;
-}
-
-/**
- * Represents a connection-oriented socket transport.
- */
-package interface StreamTransport : DuplexTransport, SocketTransport
-{
+    /**
+     * Returns: Socket.
+     */
+    @property Socket socket() pure nothrow @safe @nogc;
 }

source/tanya/async/watcher.d

@@ -3,10 +3,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Watchers register user's interest in some event.
+ *
+ * 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,225 +23,110 @@ 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. 
  */
 abstract class Watcher
 {
-	/// Whether the watcher is active.
-	bool active;
+    /// Whether the watcher is active.
+    bool active;
 
-	/**
-	 * Invoke some action on event.
-	 */
-	void invoke() @nogc;
+    /**
+     * Invoke some action on event.
+     */
+    void invoke() @nogc;
 }
 
-class ConnectionWatcher : Watcher
+version (unittest)
 {
-	/// Watched socket.
-	private Socket socket_;
+    final class DummyWatcher : Watcher
+    {
+        bool invoked;
 
-	/// Protocol factory.
-	protected Protocol delegate() @nogc protocolFactory;
-
-	package Queue!IOWatcher incoming;
-
-	/**
-	 * Params:
-	 * 	socket = Socket.
-	 */
-	this(Socket socket) @nogc
-	{
-		socket_ = socket;
-	}
-
-	/// Ditto.
-	protected this() pure nothrow @safe @nogc
-	{
-	}
-
-	~this() @nogc
-	{
-		foreach (w; incoming)
-		{
-			MmapPool.instance.dispose(w);
-		}
-	}
-
-	/**
-	 * Params:
-	 * 	P = Protocol should be used.
-	 */
-	void setProtocol(P : Protocol)() @nogc
-	{
-		this.protocolFactory = () @nogc => cast(Protocol) MmapPool.instance.make!P;
-	}
-
-	/**
-	 * Returns: Socket.
-	 */
-	@property inout(Socket) socket() inout pure nothrow @nogc
-	{
-		return socket_;
-	}
-
-	/**
-	 * Returns: New protocol instance.
-	 */
-	@property Protocol protocol() @nogc
-	in
-	{
-		assert(protocolFactory !is null, "Protocol isn't set.");
-	}
-	body
-	{
-		return protocolFactory();
-	}
-
-	/**
-	 * Invokes new connection callback.
-	 */
-	override void invoke() @nogc
-	{
-		foreach (io; incoming)
-		{
-			io.protocol.connected(cast(DuplexTransport) io.transport);
-		}
-	}
+        override void invoke() @nogc
+        {
+            this.invoked = true;
+        }
+    }
 }
 
 /**
- * Contains a pending watcher with the invoked events or a transport can be
- * read from.
+ * Socket watcher.
  */
-class IOWatcher : ConnectionWatcher
+abstract class SocketWatcher : Watcher
 {
-	/// If an exception was thrown the transport should be already invalid.
-	private union
-	{
-		StreamTransport transport_;
-		SocketException exception_;
-	}
+    /// Watched socket.
+    protected Socket socket_;
 
-	private Protocol protocol_;
+    /**
+     * Params:
+     *  socket = Socket.
+     *
+     * Precondition: $(D_INLINECODE socket !is null)
+     */
+    this(Socket socket) pure nothrow @safe @nogc
+    in
+    {
+        assert(socket !is null);
+    }
+    body
+    {
+        socket_ = socket;
+    }
 
-	/**
-	 * 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;
-		}
-	}
+    /**
+     * 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:
+     *  socket = Socket.
+     */
+    this(Socket socket) @nogc
+    {
+        super(socket);
+        incoming = Queue!DuplexTransport(MmapPool.instance);
+    }
+
+    /**
+     * Params:
+     *  P = Protocol should be used.
+     */
+    void setProtocol(P : Protocol)() @nogc
+    {
+        this.protocolFactory = () @nogc => cast(Protocol) MmapPool.instance.make!P;
+    }
+
+    /**
+     * Invokes new connection callback.
+     */
+    override void invoke() @nogc
+    in
+    {
+        assert(protocolFactory !is null, "Protocol isn't set.");
+    }
+    body
+    {
+        foreach (transport; incoming)
+        {
+            transport.protocol = protocolFactory();
+            transport.protocol.connected(transport);
+        }
+    }
 }

source/tanya/container/entry.d

@@ -5,41 +5,107 @@
 /*
  * 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)
+import std.traits;
+import tanya.typecons;
+
+package struct SEntry(T)
 {
-	package struct ConstEqualsStruct
-	{
-		int opEquals(typeof(this) that) const @nogc
-		{
-			return true;
-		}
-	}
+    // Item content.
+    T content;
 
-	package struct MutableEqualsStruct
-	{
-		int opEquals(typeof(this) that) @nogc
-		{
-			return true;
-		}
-	}
-
-	package struct NoEqualsStruct
-	{
-	}
+    // Next item.
+    SEntry* next;
 }
 
-package struct Entry(T)
+package struct DEntry(T)
 {
-	/// Item content.
-	T content;
+    // Item content.
+    T content;
 
-	/// Next item.
-	Entry* next;
+    // Previous and next item.
+    DEntry* next, prev;
+}
+
+package struct HashEntry(K, V)
+{
+    this(ref K key, ref V value)
+    {
+        this.pair = Pair!(K, V)(key, value);
+    }
+
+    Pair!(K, V) pair;
+    HashEntry* next;
+}
+
+package enum BucketStatus : byte
+{
+    deleted = -1,
+    empty = 0,
+    used = 1,
+}
+
+package struct Bucket(T)
+{
+    this(ref T content)
+    {
+        this.content = content;
+    }
+
+    @property void content(ref T content)
+    {
+        this.content_ = content;
+        this.status = BucketStatus.used;
+    }
+
+    @property ref inout(T) content() inout
+    {
+        return this.content_;
+    }
+
+    bool opEquals(ref T content)
+    {
+        if (this.status == BucketStatus.used && this.content == content)
+        {
+            return true;
+        }
+        return false;
+    }
+
+    bool opEquals(ref T content) const
+    {
+        if (this.status == BucketStatus.used && this.content == content)
+        {
+            return true;
+        }
+        return false;
+    }
+
+    bool opEquals(ref typeof(this) that)
+    {
+        return this.content == that.content && this.status == that.status;
+    }
+
+    bool opEquals(ref typeof(this) that) const
+    {
+        return this.content == that.content && this.status == that.status;
+    }
+
+    void remove()
+    {
+        static if (hasElaborateDestructor!T)
+        {
+            destroy(this.content);
+        }
+        this.status = BucketStatus.deleted;
+    }
+
+    T content_;
+    BucketStatus status = BucketStatus.empty;
 }

source/tanya/container/package.d

@@ -3,14 +3,40 @@
  * 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.array;
 public import tanya.container.buffer;
+public import tanya.container.set;
 public import tanya.container.list;
-public import tanya.container.vector;
+public import tanya.container.string;
 public import tanya.container.queue;
+
+/**
+ * Thrown if $(D_PSYMBOL Set) cannot insert a new element because the container
+ * is full.
+ */
+class HashContainerFullException : Exception
+{
+    /**
+     * Params:
+     *  msg  = The message for the exception.
+     *  file = The file where the exception occurred.
+     *  line = The line number where the exception occurred.
+     *  next = The previous exception in the chain of exceptions, if any.
+     */
+    this(string msg,
+         string file = __FILE__,
+         size_t line = __LINE__,
+         Throwable next = null) @nogc @safe pure nothrow
+    {
+        super(msg, file, line, next);
+    }
+}

source/tanya/container/queue.d

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

source/tanya/container/set.d

@@ -0,0 +1,710 @@
+/* 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/. */
+
+/**
+ * This module implements a $(D_PSYMBOL Set) container that stores unique
+ * values without any particular order.
+ *
+ * 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.container.set;
+
+import std.algorithm.mutation;
+import std.traits;
+import tanya.container;
+import tanya.container.entry;
+import tanya.memory;
+
+/**
+ * Bidirectional range that iterates over the $(D_PSYMBOL Set)'s values.
+ *
+ * Params:
+ *  E = Element type.
+ */
+struct Range(E)
+{
+    static if (isMutable!E)
+    {
+        private alias DataRange = Array!(Bucket!(Unqual!E)).Range;
+    }
+    else
+    {
+        private alias DataRange = Array!(Bucket!(Unqual!E)).ConstRange;
+    }
+    private DataRange dataRange;
+
+    @disable this();
+
+    private this(DataRange dataRange)
+    {
+        while (!dataRange.empty && dataRange.front.status != BucketStatus.used)
+        {
+            dataRange.popFront();
+        }
+        while (!dataRange.empty && dataRange.back.status != BucketStatus.used)
+        {
+            dataRange.popBack();
+        }
+        this.dataRange = dataRange;
+    }
+
+    @property Range save()
+    {
+        return this;
+    }
+
+    @property bool empty() const
+    {
+        return this.dataRange.empty();
+    }
+
+    @property void popFront()
+    in
+    {
+        assert(!this.dataRange.empty);
+        assert(this.dataRange.front.status == BucketStatus.used);
+    }
+    out
+    {
+        assert(this.dataRange.empty
+            || this.dataRange.back.status == BucketStatus.used);
+    }
+    body
+    {
+        do
+        {
+            dataRange.popFront();
+        }
+        while (!dataRange.empty && dataRange.front.status != BucketStatus.used);
+    }
+
+    @property void popBack()
+    in
+    {
+        assert(!this.dataRange.empty);
+        assert(this.dataRange.back.status == BucketStatus.used);
+    }
+    out
+    {
+        assert(this.dataRange.empty
+            || this.dataRange.back.status == BucketStatus.used);
+    }
+    body
+    {
+        do
+        {
+            dataRange.popBack();
+        }
+        while (!dataRange.empty && dataRange.back.status != BucketStatus.used);
+    }
+
+    @property ref inout(E) front() inout
+    in
+    {
+        assert(!this.dataRange.empty);
+        assert(this.dataRange.front.status == BucketStatus.used);
+    }
+    body
+    {
+        return dataRange.front.content;
+    }
+
+    @property ref inout(E) back() inout
+    in
+    {
+        assert(!this.dataRange.empty);
+        assert(this.dataRange.back.status == BucketStatus.used);
+    }
+    body
+    {
+        return dataRange.back.content;
+    }
+
+    Range opIndex()
+    {
+        return typeof(return)(this.dataRange[]);
+    }
+
+    Range!(const E) opIndex() const
+    {
+        return typeof(return)(this.dataRange[]);
+    }
+}
+
+/**
+ * Set is a data structure that stores unique values without any particular
+ * order.
+ *
+ * This $(D_PSYMBOL Set) is implemented using closed hashing. Hash collisions
+ * are resolved with linear probing.
+ *
+ * Currently works only with integral types.
+ *
+ * Params:
+ *  T = Element type.
+ */
+struct Set(T)
+    if (isIntegral!T || is(Unqual!T == bool))
+{
+    /// The range types for $(D_PSYMBOL Set).
+    alias Range = .Range!T;
+
+    /// Ditto.
+    alias ConstRange = .Range!(const T);
+
+    invariant
+    {
+        assert(this.lengthIndex < primes.length);
+        assert(this.data.length == 0
+            || this.data.length == primes[this.lengthIndex]);
+    }
+
+    /**
+     * Constructor.
+     *
+     * Params:
+     *  n         = Minimum number of buckets.
+     *  allocator = Allocator.
+     *
+     * Precondition: $(D_INLINECODE allocator !is null).
+     */
+    this(const size_t n, shared Allocator allocator = defaultAllocator)
+    in
+    {
+        assert(allocator !is null);
+    }
+    body
+    {
+        this(allocator);
+        rehash(n);
+    }
+
+    /// Ditto.
+    this(shared Allocator allocator)
+    in
+    {
+        assert(allocator !is null);
+    }
+    body
+    {
+        this.data = typeof(this.data)(allocator);
+    }
+
+    ///
+    unittest
+    {
+        {
+            auto set = Set!int(defaultAllocator);
+            assert(set.capacity == 0);
+        }
+        {
+            auto set = Set!int(8);
+            assert(set.capacity == 13);
+        }
+    }
+
+    /**
+     * Initializes this $(D_PARAM Set) from another one.
+     *
+     * If $(D_PARAM init) is passed by reference, it will be copied.
+     * If $(D_PARAM init) is passed by value, it will be moved.
+     *
+     * Params:
+     *  S         = Source set type.
+     *  init      = Source set.
+     *  allocator = Allocator.
+     */
+    this(S)(ref S init, shared Allocator allocator = defaultAllocator)
+        if (is(Unqual!S == Set))
+    in
+    {
+        assert(allocator !is null);
+    }
+    body
+    {
+        this.data = typeof(this.data)(init.data, allocator);
+    }
+
+    /// Ditto.
+    this(S)(S init, shared Allocator allocator = defaultAllocator)
+        if (is(S == Set))
+    in
+    {
+        assert(allocator !is null);
+    }
+    body
+    {
+        this.data = typeof(this.data)(move(init.data), allocator);
+        this.lengthIndex = init.lengthIndex;
+        init.lengthIndex = 0;
+    }
+
+    /**
+     * Assigns another set.
+     *
+     * If $(D_PARAM that) is passed by reference, it will be copied.
+     * If $(D_PARAM that) is passed by value, it will be moved.
+     *
+     * Params:
+     *  S    = Content type.
+     *  that = The value should be assigned.
+     *
+     * Returns: $(D_KEYWORD this).
+     */
+    ref typeof(this) opAssign(S)(ref S that)
+        if (is(Unqual!S == Set))
+    {
+        this.data = that.data;
+        this.lengthIndex = that.lengthIndex;
+        return this;
+    }
+
+    /// Ditto.
+    ref typeof(this) opAssign(S)(S that) @trusted
+        if (is(S == Set))
+    {
+        swap(this.data, that.data);
+        swap(this.lengthIndex, that.lengthIndex);
+        return this;
+    }
+
+    /**
+     * Returns: Used allocator.
+     *
+     * Postcondition: $(D_INLINECODE allocator !is null)
+     */
+    @property shared(Allocator) allocator() const
+    out (allocator)
+    {
+        assert(allocator !is null);
+    }
+    body
+    {
+        return cast(shared Allocator) this.data.allocator;
+    }
+
+    /**
+     * Maximum amount of elements this $(D_PSYMBOL Set) can hold without
+     * resizing and rehashing. Note that it doesn't mean that the
+     * $(D_PSYMBOL Set) will hold $(I exactly) $(D_PSYMBOL capacity) elements.
+     * $(D_PSYMBOL capacity) tells the size of the container under a best-case
+     * distribution of elements.
+     *
+     * Returns: $(D_PSYMBOL Set) capacity.
+     */
+    @property size_t capacity() const
+    {
+        return this.data.length;
+    }
+
+    ///
+    unittest
+    {
+        Set!int set;
+        assert(set.capacity == 0);
+
+        set.insert(8);
+        assert(set.capacity == 3);
+    }
+
+    /**
+     * Iterates over the $(D_PSYMBOL Set) and counts the elements.
+     *
+     * Returns: Count of elements within the $(D_PSYMBOL Set).
+     */
+    @property size_t length() const
+    {
+        size_t count;
+        foreach (ref e; this.data[])
+        {
+            if (e.status == BucketStatus.used)
+            {
+                ++count;
+            }
+        }
+        return count;
+    }
+
+    ///
+    unittest
+    {
+        Set!int set;
+        assert(set.length == 0);
+
+        set.insert(8);
+        assert(set.length == 1);
+    }
+
+    private static const size_t[41] primes = [
+        3, 7, 13, 23, 29, 37, 53, 71, 97, 131, 163, 193, 239, 293, 389, 521,
+        769, 919, 1103, 1327, 1543, 2333, 3079, 4861, 6151, 12289, 24593,
+        49157, 98317, 196613, 393241, 786433, 1572869, 3145739, 6291469,
+        12582917, 25165843, 139022417, 282312799, 573292817, 1164186217,
+    ];
+
+    /// The maximum number of buckets the container can have.
+    enum size_t maxBucketCount = primes[$ - 1];
+
+    static private size_t calculateHash(ref T value)
+    {
+        static if (isIntegral!T || isSomeChar!T || is(T == bool))
+        {
+            return (cast(size_t) value);
+        }
+        else
+        {
+            static assert(false);
+        }
+    }
+
+    static private size_t locateBucket(ref const DataType buckets, size_t hash)
+    {
+        return hash % buckets.length;
+    }
+
+    private enum InsertStatus : byte
+    {
+        found = -1,
+        failed = 0,
+        added = 1,
+    }
+
+    /*
+     * Inserts the value in an empty or deleted bucket. If the value is
+     * already in there, does nothing and returns InsertStatus.found. If the
+     * hash array is full returns InsertStatus.failed.
+     */
+    private InsertStatus insertInUnusedBucket(ref T value)
+    {
+        auto bucketPosition = locateBucket(this.data, calculateHash(value));
+
+        foreach (ref e; this.data[bucketPosition .. $])
+        {
+            if (e == value) // Already in the set.
+            {
+                return InsertStatus.found;
+            }
+            else if (e.status != BucketStatus.used) // Insert the value.
+            {
+                e.content = value;
+                return InsertStatus.added;
+            }
+        }
+        return InsertStatus.failed;
+    }
+
+    /**
+     * Inserts a new element.
+     *
+     * Params:
+     *  value = Element value.
+     *
+     * Returns: Amount of new elements inserted.
+     *
+     * Throws: $(D_PSYMBOL HashContainerFullException) if the insertion failed.
+     */
+    size_t insert(T value)
+    {
+        if (this.data.length == 0)
+        {
+            this.data = DataType(primes[0], allocator);
+        }
+
+        InsertStatus status = insertInUnusedBucket(value);
+        for (; !status; status = insertInUnusedBucket(value))
+        {
+            if ((this.primes.length - 1) == this.lengthIndex)
+            {
+                throw make!HashContainerFullException(defaultAllocator,
+                                                      "Set is full");
+            }
+            rehashToSize(this.lengthIndex + 1);
+        }
+        return status == InsertStatus.added;
+    }
+
+    ///
+    unittest
+    {
+        Set!int set;
+        assert(8 !in set);
+
+        assert(set.insert(8) == 1);
+        assert(set.length == 1);
+        assert(8 in set);
+
+        assert(set.insert(8) == 0);
+        assert(set.length == 1);
+        assert(8 in set);
+
+        assert(set.remove(8));
+        assert(set.insert(8) == 1);
+    }
+
+    /**
+     * Removes an element.
+     *
+     * Params:
+     *  value = Element value.
+     *
+     * Returns: Number of elements removed, which is in the container with
+     *          unique values `1` if an element existed, and `0` otherwise.
+     */
+    size_t remove(T value)
+    {
+        if (this.data.length == 0)
+        {
+            return 0;
+        }
+
+        auto bucketPosition = locateBucket(this.data, calculateHash(value));
+        foreach (ref e; this.data[bucketPosition .. $])
+        {
+            if (e == value) // Found.
+            {
+                e.remove();
+                return 1;
+            }
+            else if (e.status == BucketStatus.empty)
+            {
+                break;
+            }
+        }
+        return 0;
+    }
+
+    ///
+    unittest
+    {
+        Set!int set;
+        assert(8 !in set);
+
+        set.insert(8);
+        assert(8 in set);
+
+        assert(set.remove(8) == 1);
+        assert(set.remove(8) == 0);
+        assert(8 !in set);
+    }
+
+    /**
+     * $(D_KEYWORD in) operator.
+     *
+     * Params:
+     *  value = Element to be searched for.
+     *
+     * Returns: $(D_KEYWORD true) if the given element exists in the container,
+     *          $(D_KEYWORD false) otherwise.
+     */
+    bool opBinaryRight(string op : "in")(auto ref T value)
+    {
+        if (this.data.length == 0)
+        {
+            return 0;
+        }
+
+        auto bucketPosition = locateBucket(this.data, calculateHash(value));
+        foreach (ref e; this.data[bucketPosition .. $])
+        {
+            if (e == value) // Found.
+            {
+                return true;
+            }
+            else if (e.status == BucketStatus.empty)
+            {
+                break;
+            }
+        }
+        return false;
+    }
+
+    /// Ditto.
+    bool opBinaryRight(string op : "in")(auto ref const T value) const
+    {
+        if (this.data.length == 0)
+        {
+            return 0;
+        }
+
+        auto bucketPosition = locateBucket(this.data, calculateHash(value));
+        foreach (ref e; this.data[bucketPosition .. $])
+        {
+            if (e.status == BucketStatus.used && e.content == value) // Found.
+            {
+                return true;
+            }
+            else if (e.status == BucketStatus.empty)
+            {
+                break;
+            }
+        }
+        return false;
+    }
+
+    ///
+    unittest
+    {
+        Set!int set;
+
+        assert(5 !in set);
+        set.insert(5);
+        assert(5 in set);
+    }
+
+    /**
+     * Sets the number of buckets in the container to at least $(D_PARAM n)
+     * and rearranges all the elements according to their hash values.
+     *
+     * If $(D_PARAM n) is greater than the current $(D_PSYMBOL capacity)
+     * and lower than or equal to $(D_PSYMBOL maxBucketCount), a rehash is
+     * forced.
+     *
+     * If $(D_PARAM n) is greater than $(D_PSYMBOL maxBucketCount),
+     * $(D_PSYMBOL maxBucketCount) is used instead as a new number of buckets.
+     *
+     * If $(D_PARAM n) is equal to the current $(D_PSYMBOL capacity), rehashing
+     * is forced without resizing the container.
+     *
+     * If $(D_PARAM n) is lower than the current $(D_PSYMBOL capacity), the
+     * function may have no effect.
+     *
+     * Rehashing is automatically performed whenever the container needs space
+     * to insert new elements.
+     *
+     * Params:
+     *  n = Minimum number of buckets.
+     */
+    void rehash(const size_t n)
+    {
+        size_t lengthIndex;
+        for (; lengthIndex < primes.length; ++lengthIndex)
+        {
+            if (primes[lengthIndex] >= n)
+            {
+                break;
+            }
+        }
+        rehashToSize(lengthIndex);
+    }
+
+    // Takes an index in the primes array.
+    private void rehashToSize(const size_t n)
+    {
+        auto storage = DataType(primes[n], allocator);
+        DataLoop: foreach (ref e1; this.data[])
+        {
+            if (e1.status == BucketStatus.used)
+            {
+                auto bucketPosition = locateBucket(storage,
+                                                   calculateHash(e1.content));
+
+                foreach (ref e2; storage[bucketPosition .. $])
+                {
+                    if (e2.status != BucketStatus.used) // Insert the value.
+                    {
+                        e2.content = e1.content;
+                        continue DataLoop;
+                    }
+                }
+                return; // Rehashing failed.
+            }
+        }
+        move(storage, this.data);
+        this.lengthIndex = n;
+    }
+
+    /**
+     * Returns: A bidirectional range that iterates over the $(D_PSYMBOL Set)'s
+     *          elements.
+     */
+    Range opIndex()
+    {
+        return typeof(return)(this.data[]);
+    }
+
+    /// Ditto.
+    ConstRange opIndex() const
+    {
+        return typeof(return)(this.data[]);
+    }
+
+    ///
+    unittest
+    {
+        Set!int set;
+        assert(set[].empty);
+
+        set.insert(8);
+        assert(!set[].empty);
+        assert(set[].front == 8);
+        assert(set[].back == 8);
+
+        set.remove(8);
+        assert(set[].empty);
+    }
+
+    private alias DataType = Array!(Bucket!T);
+    private DataType data;
+    private size_t lengthIndex;
+}
+
+// Basic insertion logic.
+private unittest
+{
+    Set!int set;
+
+    assert(set.insert(5) == 1);
+    assert(set.data[0].status == BucketStatus.empty);
+    assert(set.data[1].status == BucketStatus.empty);
+    assert(set.data[2].content == 5 && set.data[2].status == BucketStatus.used);
+    assert(set.data.length == 3);
+
+    assert(set.insert(5) == 0);
+    assert(set.data[0].status == BucketStatus.empty);
+    assert(set.data[1].status == BucketStatus.empty);
+    assert(set.data[2].content == 5 && set.data[2].status == BucketStatus.used);
+    assert(set.data.length == 3);
+
+    assert(set.insert(9) == 1);
+    assert(set.data[0].content == 9 && set.data[0].status == BucketStatus.used);
+    assert(set.data[1].status == BucketStatus.empty);
+    assert(set.data[2].content == 5 && set.data[2].status == BucketStatus.used);
+    assert(set.data.length == 3);
+
+    assert(set.insert(7) == 1);
+    assert(set.insert(8) == 1);
+    assert(set.data[0].content == 7);
+    assert(set.data[1].content == 8);
+    assert(set.data[2].content == 9);
+    assert(set.data[3].status == BucketStatus.empty);
+    assert(set.data[5].content == 5);
+    assert(set.data.length == 7);
+
+    assert(set.insert(16) == 1);
+    assert(set.data[2].content == 9);
+    assert(set.data[3].content == 16);
+    assert(set.data[4].status == BucketStatus.empty);
+}
+
+// Static checks.
+private unittest
+{
+    import std.range.primitives;
+
+    static assert(isBidirectionalRange!(Set!int.ConstRange));
+    static assert(isBidirectionalRange!(Set!int.Range));
+
+    static assert(!isInfinite!(Set!int.Range));
+    static assert(!hasLength!(Set!int.Range));
+
+    static assert(is(Set!uint));
+    static assert(is(Set!long));
+    static assert(is(Set!ulong));
+    static assert(is(Set!short));
+    static assert(is(Set!ushort));
+    static assert(is(Set!bool));
+}

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/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/format/conv.d

@@ -0,0 +1,537 @@
+/* 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/. */
+
+/**
+ * This module provides functions for converting between different types.
+ *
+ * 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.format.conv;
+
+import std.traits;
+import tanya.memory;
+
+/**
+ * Thrown if a type conversion fails.
+ */
+final class ConvException : Exception
+{
+    /**
+     * Params:
+     *  msg  = The message for the exception.
+     *  file = The file where the exception occurred.
+     *  line = The line number where the exception occurred.
+     *  next = The previous exception in the chain of exceptions, if any.
+     */
+    this(string msg,
+         string file = __FILE__,
+         size_t line = __LINE__,
+         Throwable next = null) @nogc @safe pure nothrow
+    {
+        super(msg, file, line, next);
+    }
+}
+
+/**
+ * If the source type $(D_PARAM From) and the target type $(D_PARAM To) are
+ * equal, does nothing. If $(D_PARAM From) can be implicitly converted to
+ * $(D_PARAM To), just returns $(D_PARAM from).
+ *
+ * Params:
+ *  To = Target type.
+ *
+ * Returns: $(D_PARAM from).
+ */
+template to(To)
+{
+    /**
+     * Params:
+     *  From = Source type.
+     *  from = Source value.
+     */
+    ref To to(From)(ref From from)
+    if (is(To == From))
+    {
+        return from;
+    }
+
+    /// Ditto.
+    To to(From)(From from)
+    if (is(Unqual!To == Unqual!From) || isNumeric!From && isFloatingPoint!To)
+    {
+        return from;
+    }
+}
+
+///
+pure nothrow @safe @nogc unittest
+{
+    auto val = 5.to!int();
+    assert(val == 5);
+    static assert(is(typeof(val) == int));
+}
+
+private pure nothrow @safe @nogc unittest
+{
+    int val = 5;
+    assert(val.to!int() == 5);
+}
+
+/**
+ * Performs checked conversion from an integral type $(D_PARAM From) to an
+ * integral type $(D_PARAM To).
+ *
+ * Params:
+ *  From = Source type.
+ *  To   = Target type.
+ *  from = Source value.
+ *
+ * Returns: $(D_PARAM from) converted to $(D_PARAM To).
+ *
+ * Throws: $(D_PSYMBOL ConvException) if $(D_PARAM from) is too small or too
+ *         large to be represented by $(D_PARAM To).
+ */
+To to(To, From)(From from)
+if (isIntegral!From
+ && isIntegral!To
+ && !is(Unqual!To == Unqual!From)
+ && !is(To == enum))
+{
+    static if ((isUnsigned!From && isSigned!To && From.sizeof == To.sizeof)
+            || From.sizeof > To.sizeof)
+    {
+        if (from > To.max)
+        {
+            throw make!ConvException(defaultAllocator,
+                                     "Positive integer overflow");
+        }
+    }
+    static if (isSigned!From)
+    {
+        static if (isUnsigned!To)
+        {
+            if (from < 0)
+            {
+                throw make!ConvException(defaultAllocator,
+                                         "Negative integer overflow");
+            }
+        }
+        else static if (From.sizeof > To.sizeof)
+        {
+            if (from < To.min)
+            {
+                throw make!ConvException(defaultAllocator,
+                                         "Negative integer overflow");
+            }
+        }
+    }
+    static if (From.sizeof <= To.sizeof)
+    {
+        return from;
+    }
+    else static if (isSigned!To)
+    {
+        return cast(To) from;
+    }
+    else
+    {
+        return from & To.max;
+    }
+}
+
+private pure nothrow @safe @nogc unittest
+{
+    // ubyte -> ushort
+    assert((cast(ubyte) 0).to!ushort == 0);
+    assert((cast(ubyte) 1).to!ushort == 1);
+    assert((cast(ubyte) (ubyte.max - 1)).to!ushort == ubyte.max - 1);
+    assert((cast(ubyte) ubyte.max).to!ushort == ubyte.max);
+
+    // ubyte -> short
+    assert((cast(ubyte) 0).to!short == 0);
+    assert((cast(ubyte) 1).to!short == 1);
+    assert((cast(ubyte) (ubyte.max - 1)).to!short == ubyte.max - 1);
+    assert((cast(ubyte) ubyte.max).to!short == ubyte.max);
+}
+
+private unittest
+{
+    // ubyte <- ushort
+    assert((cast(ushort) 0).to!ubyte == 0);
+    assert((cast(ushort) 1).to!ubyte == 1);
+    assert((cast(ushort) (ubyte.max - 1)).to!ubyte == ubyte.max - 1);
+    assert((cast(ushort) ubyte.max).to!ubyte == ubyte.max);
+
+    // ubyte <- short
+    assert((cast(short) 0).to!ubyte == 0);
+    assert((cast(short) 1).to!ubyte == 1);
+    assert((cast(short) (ubyte.max - 1)).to!ubyte == ubyte.max - 1);
+    assert((cast(short) ubyte.max).to!ubyte == ubyte.max);
+
+    // short <-> int
+    assert(short.min.to!int == short.min);
+    assert((short.min + 1).to!int == short.min + 1);
+    assert((cast(short) -1).to!int == -1);
+    assert((cast(short) 0).to!int == 0);
+    assert((cast(short) 1).to!int == 1);
+    assert((short.max - 1).to!int == short.max - 1);
+    assert(short.max.to!int == short.max);
+
+    assert((cast(int) short.min).to!short == short.min);
+    assert((cast(int) short.min + 1).to!short == short.min + 1);
+    assert((cast(int) -1).to!short == -1);
+    assert((cast(int) 0).to!short == 0);
+    assert((cast(int) 1).to!short == 1);
+    assert((cast(int) short.max - 1).to!short == short.max - 1);
+    assert((cast(int) short.max).to!short == short.max);
+
+    // uint <-> int
+    assert((cast(uint) 0).to!int == 0);
+    assert((cast(uint) 1).to!int == 1);
+    assert((cast(uint) (int.max - 1)).to!int == int.max - 1);
+    assert((cast(uint) int.max).to!int == int.max);
+
+    assert((cast(int) 0).to!uint == 0);
+    assert((cast(int) 1).to!uint == 1);
+    assert((cast(int) (int.max - 1)).to!uint == int.max - 1);
+    assert((cast(int) int.max).to!uint == int.max);
+}
+
+private unittest
+{
+    ConvException exception;
+    try
+    {
+        assert(int.min.to!short == int.min);
+    }
+    catch (ConvException e)
+    {
+        exception = e;
+    }
+    assert(exception !is null);
+    defaultAllocator.dispose(exception);
+}
+
+private unittest
+{
+    ConvException exception;
+    try
+    {
+        assert(int.max.to!short == int.max);
+    }
+    catch (ConvException e)
+    {
+        exception = e;
+    }
+    assert(exception !is null);
+    defaultAllocator.dispose(exception);
+}
+
+private unittest
+{
+    ConvException exception;
+    try
+    {
+        assert(uint.max.to!ushort == ushort.max);
+    }
+    catch (ConvException e)
+    {
+        exception = e;
+    }
+    assert(exception !is null);
+    defaultAllocator.dispose(exception);
+}
+
+private unittest
+{
+    ConvException exception;
+    try
+    {
+        assert((-1).to!uint == -1);
+    }
+    catch (ConvException e)
+    {
+        exception = e;
+    }
+    assert(exception !is null);
+    defaultAllocator.dispose(exception);
+}
+
+private @nogc unittest
+{
+    enum Test : int
+    {
+        one,
+        two,
+    }
+    assert(Test.one.to!int == 0);
+    assert(Test.two.to!int == 1);
+}
+
+/**
+ * Converts a number to a boolean.
+ *
+ * Params:
+ *  From = Source type.
+ *  To   = Target type.
+ *  from = Source value.
+ *
+ * Returns: $(D_KEYWORD true) if $(D_INLINECODE from > 0 && from <= 1),
+ *          otherwise $(D_KEYWORD false).
+ *
+ * Throws: $(D_PSYMBOL ConvException) if $(D_PARAM from) is greater than `1` or
+ *         less than `0`.
+ */
+To to(To, From)(From from)
+if (isNumeric!From && is(Unqual!To == bool) && !is(Unqual!To == Unqual!From))
+{
+    if (from == 0)
+    {
+        return false;
+    }
+    else if (from < 0)
+    {
+        throw make!ConvException(defaultAllocator,
+                                 "Negative number overflow");
+    }
+    else if (from <= 1)
+    {
+        return true;
+    }
+    throw make!ConvException(defaultAllocator,
+                             "Positive number overflow");
+}
+
+private @nogc unittest
+{
+    assert(0.0.to!bool == false);
+    assert(0.2.to!bool == true);
+    assert(0.5.to!bool == true);
+    assert(1.0.to!bool == true);
+
+    assert(0.to!bool == false);
+    assert(1.to!bool == true);
+}
+
+private @nogc unittest
+{
+    ConvException exception;
+    try
+    {
+        assert((-1).to!bool == true);
+    }
+    catch (ConvException e)
+    {
+        exception = e;
+    }
+    assert(exception !is null);
+    defaultAllocator.dispose(exception);
+}
+
+private @nogc unittest
+{
+    ConvException exception;
+    try
+    {
+        assert(2.to!bool == true);
+    }
+    catch (ConvException e)
+    {
+        exception = e;
+    }
+    assert(exception !is null);
+    defaultAllocator.dispose(exception);
+}
+
+/**
+ * Converts a boolean to a number. $(D_KEYWORD true) is `1`, $(D_KEYWORD false)
+ * is `0`.
+ *
+ * Params:
+ *  From = Source type.
+ *  To   = Target type.
+ *  from = Source value.
+ *
+ * Returns: `1` if $(D_PARAM from) is $(D_KEYWORD true), otherwise `0`.
+ */
+To to(To, From)(From from)
+if (is(Unqual!From == bool) && isNumeric!To && !is(Unqual!To == Unqual!From))
+{
+    return from;
+}
+
+///
+pure nothrow @safe @nogc unittest
+{
+    assert(true.to!float == 1.0);
+    assert(true.to!double == 1.0);
+    assert(true.to!ubyte == 1);
+    assert(true.to!byte == 1);
+    assert(true.to!ushort == 1);
+    assert(true.to!short == 1);
+    assert(true.to!uint == 1);
+    assert(true.to!int == 1);
+
+    assert(false.to!float == 0);
+    assert(false.to!double == 0);
+    assert(false.to!ubyte == 0);
+    assert(false.to!byte == 0);
+    assert(false.to!ushort == 0);
+    assert(false.to!short == 0);
+    assert(false.to!uint == 0);
+    assert(false.to!int == 0);
+}
+
+/**
+ * Converts a floating point number to an integral type.
+ *
+ * Params:
+ *  From = Source type.
+ *  To   = Target type.
+ *  from = Source value.
+ *
+ * Returns: Truncated $(D_PARAM from) (everything after the decimal point is
+ *          dropped).
+ *
+ * Throws: $(D_PSYMBOL ConvException) if
+ *         $(D_INLINECODE from < To.min || from > To.max).
+ */
+To to(To, From)(From from)
+if (isFloatingPoint!From
+ && isIntegral!To
+ && !is(Unqual!To == Unqual!From)
+ && !is(To == enum))
+{
+    if (from > To.max)
+    {
+        throw make!ConvException(defaultAllocator,
+                                 "Positive number overflow");
+    }
+    else if (from < To.min)
+    {
+        throw make!ConvException(defaultAllocator,
+                                 "Negative number overflow");
+    }
+    return cast(To) from;
+}
+
+///
+@nogc unittest
+{
+    assert(1.5.to!int == 1);
+    assert(2147483646.5.to!int == 2147483646);
+    assert((-2147483647.5).to!int == -2147483647);
+    assert(2147483646.5.to!uint == 2147483646);
+}
+
+private @nogc unittest
+{
+    ConvException exception;
+    try
+    {
+        assert(2147483647.5.to!int == 2147483647);
+    }
+    catch (ConvException e)
+    {
+        exception = e;
+    }
+    assert(exception !is null);
+    defaultAllocator.dispose(exception);
+}
+
+private @nogc unittest
+{
+    ConvException exception;
+    try
+    {
+        assert((-2147483648.5).to!int == -2147483648);
+    }
+    catch (ConvException e)
+    {
+        exception = e;
+    }
+    assert(exception !is null);
+    defaultAllocator.dispose(exception);
+}
+
+private @nogc unittest
+{
+    ConvException exception;
+    try
+    {
+        assert((-21474.5).to!uint == -21474);
+    }
+    catch (ConvException e)
+    {
+        exception = e;
+    }
+    assert(exception !is null);
+    defaultAllocator.dispose(exception);
+}
+
+/**
+ * Performs checked conversion from an integral type $(D_PARAM From) to an
+ * $(D_KEYWORD enum).
+ *
+ * Params:
+ *  From = Source type.
+ *  To   = Target type.
+ *  from = Source value.
+ *
+ * Returns: $(D_KEYWORD enum) value.
+ *
+ * Throws: $(D_PSYMBOL ConvException) if $(D_PARAM from) is not a member of
+ *         $(D_PSYMBOL To).
+
+ */
+To to(To, From)(From from)
+if (isIntegral!From && is(To == enum))
+{
+    foreach (m; EnumMembers!To)
+    {
+        if (from == m)
+        {
+            return m;
+        }
+    }
+    throw make!ConvException(defaultAllocator,
+                             "Value not found in enum '" ~ To.stringof ~ "'");
+}
+
+///
+@nogc unittest
+{
+    enum Test : int
+    {
+        one,
+        two,
+    }
+    static assert(is(typeof(1.to!Test) == Test));
+    assert(0.to!Test == Test.one);
+    assert(1.to!Test == Test.two);
+}
+
+private @nogc unittest
+{
+    enum Test : uint
+    {
+        one,
+        two,
+    }
+
+    ConvException exception;
+    try
+    {
+        assert(5.to!Test == Test.one);
+    }
+    catch (ConvException e)
+    {
+        exception = e;
+    }
+    assert(exception !is null);
+    defaultAllocator.dispose(exception);
+}

source/tanya/format/package.d

@@ -3,14 +3,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * This package contains formatting and conversion functions.
+ *
+ * Copyright: Eugene Wissner 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.crypto;
+module tanya.format;
 
-public import tanya.crypto.bit;
-public import tanya.crypto.des;
-public import tanya.crypto.mode;
-public import tanya.crypto.symmetric;
+public import tanya.format.conv;

source/tanya/math/package.d

@@ -3,11 +3,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * This package provides mathematical functions.
+ *
+ * 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 +18,7 @@ public import tanya.math.random;
 
 version (unittest)
 {
-	import std.algorithm.iteration;
+    import std.algorithm.iteration;
 }
 
 /**
@@ -26,12 +28,12 @@ version (unittest)
  * is used to allocate the result.
  *
  * Params:
- * 	I = Base type.
- * 	G = Exponent type.
- * 	H = Divisor type:
- * 	x = Base.
- * 	y = Exponent.
- * 	z = Divisor.
+ *  I = Base type.
+ *  G = Exponent type.
+ *  H = Divisor type:
+ *  x = Base.
+ *  y = Exponent.
+ *  z = Divisor.
  *
  * Returns: Reminder of the division of $(D_PARAM x) to the power $(D_PARAM y)
  *          by $(D_PARAM z).
@@ -39,134 +41,163 @@ 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;
-	H result;
+    G mask = G.max / 2 + 1;
+    H result;
 
-	if (y == 0)
-	{
-		return 1 % z;
-	}
-	else if (y == 1)
-	{
-		return x % z;
-	}
-	do
-	{
-		immutable bit = y & mask;
-		if (!result && bit)
-		{
-			result = x;
-			continue;
-		}
+    if (y == 0)
+    {
+        return 1 % z;
+    }
+    else if (y == 1)
+    {
+        return x % z;
+    }
+    do
+    {
+        immutable bit = y & mask;
+        if (!result && bit)
+        {
+            result = x;
+            continue;
+        }
 
-		result *= result;
-		if (bit)
-		{
-			result *= x;
-		}
-		result %= z;
-	}
-	while (mask >>= 1);
+        result *= result;
+        if (bit)
+        {
+            result *= x;
+        }
+        result %= z;
+    }
+    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)
-	if (is(I == Integer))
+I pow(I)(const auto ref I x, const auto ref I y, const auto ref I z)
+    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;
-	auto tmp2 = Integer(x.allocator), tmp1 = Integer(x, x.allocator);
-	Integer result = Integer(x.allocator);
+    size_t i;
+    auto tmp1 = Integer(x, x.allocator);
+    auto result = Integer(x.allocator);
+    bool firstBit;
 
-	if (x.length == 0 && i != 0)
-	{
-		i = 0;
-	}
-	else
-	{
-		result = 1;
-	}
-	while (i)
-	{
-		--i;
-		for (ubyte mask = 0x01; mask; mask <<= 1)
-		{
-			if (y.rep[i] & mask)
-			{
-				result *= tmp1;
-				result %= z;
-			}
-			tmp2 = tmp1;
-			tmp1 *= tmp2;
-			tmp1 %= z;
-		}
-	}
-	return result;
+    if (x.size == 0 && y.size != 0)
+    {
+        i = y.size;
+    }
+    else
+    {
+        result = 1;
+    }
+    while (i < y.size)
+    {
+        for (uint mask = 0x01; mask != 0x10000000; mask <<= 1)
+        {
+            if (y.rep[i] & mask)
+            {
+                result *= tmp1;
+                result %= z;
+            }
+            auto tmp2 = tmp1;
+            tmp1 *= tmp2;
+            tmp1 %= z;
+        }
+        ++i;
+    }
+    return result;
 }
 
 ///
 pure nothrow @safe @nogc unittest
 {
-	assert(pow(3, 5, 7) == 5);
-	assert(pow(2, 2, 1) == 0);
-	assert(pow(3, 3, 3) == 0);
-	assert(pow(7, 4, 2) == 1);
-	assert(pow(53, 0, 2) == 1);
-	assert(pow(53, 1, 3) == 2);
-	assert(pow(53, 2, 5) == 4);
-	assert(pow(0, 0, 5) == 1);
-	assert(pow(0, 5, 5) == 0);
+    assert(pow(3, 5, 7) == 5);
+    assert(pow(2, 2, 1) == 0);
+    assert(pow(3, 3, 3) == 0);
+    assert(pow(7, 4, 2) == 1);
+    assert(pow(53, 0, 2) == 1);
+    assert(pow(53, 1, 3) == 2);
+    assert(pow(53, 2, 5) == 4);
+    assert(pow(0, 0, 5) == 1);
+    assert(pow(0, 5, 5) == 0);
 }
 
 ///
 unittest
 {
-	assert(cast(long) pow(Integer(3), Integer(5), Integer(7)) == 5);
-	assert(cast(long) pow(Integer(2), Integer(2), Integer(1)) == 0);
-	assert(cast(long) pow(Integer(3), Integer(3), Integer(3)) == 0);
-	assert(cast(long) pow(Integer(7), Integer(4), Integer(2)) == 1);
-	assert(cast(long) pow(Integer(53), Integer(0), Integer(2)) == 1);
-	assert(cast(long) pow(Integer(53), Integer(1), Integer(3)) == 2);
-	assert(cast(long) pow(Integer(53), Integer(2), Integer(5)) == 4);
-	assert(cast(long) pow(Integer(0), Integer(0), Integer(5)) == 1);
-	assert(cast(long) pow(Integer(0), Integer(5), Integer(5)) == 0);
+    assert(pow(Integer(3), Integer(5), Integer(7)) == 5);
+    assert(pow(Integer(2), Integer(2), Integer(1)) == 0);
+    assert(pow(Integer(3), Integer(3), Integer(3)) == 0);
+    assert(pow(Integer(7), Integer(4), Integer(2)) == 1);
+    assert(pow(Integer(53), Integer(0), Integer(2)) == 1);
+    assert(pow(Integer(53), Integer(1), Integer(3)) == 2);
+    assert(pow(Integer(53), Integer(2), Integer(5)) == 4);
+    assert(pow(Integer(0), Integer(0), Integer(5)) == 1);
+    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,
-	                  74843, 74747, 74759, 74761, 74771, 74779, 74797, 74821,
-	                  74827, 9973, 104729, 15485867, 49979693, 104395303,
-	                  593441861, 104729, 15485867, 49979693, 104395303,
-	                  593441861, 899809363, 982451653];
+    uint[30] known = [74623, 74653, 74687, 74699, 74707, 74713, 74717, 74719,
+                      74843, 74747, 74759, 74761, 74771, 74779, 74797, 74821,
+                      74827, 9973, 104729, 15485867, 49979693, 104395303,
+                      593441861, 104729, 15485867, 49979693, 104395303,
+                      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:
-	 * 	msg  = Message to output.
-	 * 	file = The file where the exception occurred.
-	 * 	line = The line number where the exception occurred.
-	 * 	next = The previous exception in the chain of exceptions, if any.
-	 */
-	this(string msg,
-	     string file = __FILE__,
-	     size_t line = __LINE__,
-	     Throwable next = null) pure @safe nothrow const @nogc
-	{
-		super(msg, file, line, next);
-	}
+    /**
+     * Params:
+     *  msg  = Message to output.
+     *  file = The file where the exception occurred.
+     *  line = The line number where the exception occurred.
+     *  next = The previous exception in the chain of exceptions, if any.
+     */
+    this(string msg,
+         string file = __FILE__,
+         size_t line = __LINE__,
+         Throwable next = null) pure @safe nothrow const @nogc
+    {
+        super(msg, file, line, next);
+    }
 }
 
 /**
@@ -48,103 +48,115 @@ class EntropyException : Exception
  */
 abstract class EntropySource
 {
-	/// Amount of already generated entropy.
-	protected ushort size_;
+    /// Amount of already generated entropy.
+    protected ushort size_;
 
-	/**
-	 * Returns: Minimum bytes required from the entropy source.
-	 */
-	@property immutable(ubyte) threshold() const @safe pure nothrow;
+    /**
+     * Returns: Minimum bytes required from the entropy source.
+     */
+    @property ubyte threshold() const pure nothrow @safe @nogc;
 
-	/**
-	 * Returns: Whether this entropy source is strong.
-	 */
-	@property immutable(bool) strong() const @safe pure nothrow;
+    /**
+     * Returns: Whether this entropy source is strong.
+     */
+    @property bool strong() const pure nothrow @safe @nogc;
 
-	/**
-	 * Returns: Amount of already generated entropy.
-	 */
-	@property ushort size() const @safe pure nothrow
-	{
-		return size_;
-	}
+    /**
+     * Returns: Amount of already generated entropy.
+     */
+    @property ushort size() const pure nothrow @safe @nogc
+    {
+        return size_;
+    }
 
-	/**
-	 * Params:
-	 * 	size = Amount of already generated entropy. Cannot be smaller than the
-	 * 	       already set value.
-	 */
-	@property void size(ushort size) @safe pure nothrow
-	{
-		size_ = size;
-	}
+    /**
+     * Params:
+     *  size = Amount of already generated entropy. Cannot be smaller than the
+     *         already set value.
+     */
+    @property void size(ushort size) pure nothrow @safe @nogc
+    {
+        size_ = size;
+    }
 
-	/**
-	 * Poll the entropy source.
-	 *
-	 * Params:
-	 * 	output = Buffer to save the generate random sequence (the method will
-	 * 	         to fill the buffer).
-	 *
-	 * Returns: Number of bytes that were copied to the $(D_PARAM output)
-	 *          or $(D_PSYMBOL Nullable!ubyte.init) on error.
-	 */
-	Nullable!ubyte poll(out ubyte[maxGather] output);
+    /**
+     * Poll the entropy source.
+     *
+     * Params:
+     *  output = Buffer to save the generate random sequence (the method will
+     *           to fill the buffer).
+     *
+     * Returns: Number of bytes that were copied to the $(D_PARAM output)
+     *          or $(D_PSYMBOL Nullable!ubyte.init) on error.
+     */
+    Nullable!ubyte poll(out ubyte[maxGather] output) @nogc;
 }
 
 version (linux)
 {
-	extern (C) long syscall(long number, ...) nothrow;
+    extern (C) long syscall(long number, ...) nothrow @system @nogc;
 
-	/**
-	 * Uses getrandom system call.
-	 */
-	class PlatformEntropySource : EntropySource
-	{
-		/**
-		 * Returns: Minimum bytes required from the entropy source.
-		 */
-		override @property immutable(ubyte) threshold() const @safe pure nothrow
-		{
-			return 32;
-		}
+    /**
+     * Uses getrandom system call.
+     */
+    class PlatformEntropySource : EntropySource
+    {
+        /**
+         * Returns: Minimum bytes required from the entropy source.
+         */
+        override @property ubyte threshold() const pure nothrow @safe @nogc
+        {
+            return 32;
+        }
 
-		/**
-		 * Returns: Whether this entropy source is strong.
-		 */
-		override @property immutable(bool) strong() const @safe pure nothrow
-		{
-			return true;
-		}
+        /**
+         * Returns: Whether this entropy source is strong.
+         */
+        override @property bool strong() const pure nothrow @safe @nogc
+        {
+            return true;
+        }
 
-		/**
-		 * Poll the entropy source.
-		 *
-		 * Params:
-		 * 	output = Buffer to save the generate random sequence (the method will
-		 * 	         to fill the buffer).
-		 *
-		 * Returns: Number of bytes that were copied to the $(D_PARAM output)
-		 *          or $(D_PSYMBOL Nullable!ubyte.init) on error.
-		 */
-		override Nullable!ubyte poll(out ubyte[maxGather] output) nothrow
-		out (length)
-		{
-			assert(length <= maxGather);
-		}
-		body
-		{
-			// int getrandom(void *buf, size_t buflen, unsigned int flags);
-			auto length = syscall(318, output.ptr, output.length, 0);
-			Nullable!ubyte ret;
+        /**
+         * Poll the entropy source.
+         *
+         * Params:
+         *  output = Buffer to save the generate random sequence (the method will
+         *           to fill the buffer).
+         *
+         * Returns: Number of bytes that were copied to the $(D_PARAM output)
+         *          or $(D_PSYMBOL Nullable!ubyte.init) on error.
+         */
+        override Nullable!ubyte poll(out ubyte[maxGather] output) nothrow @nogc
+        out (length)
+        {
+            assert(length <= maxGather);
+        }
+        body
+        {
+            // int getrandom(void *buf, size_t buflen, unsigned int flags);
+            auto length = syscall(318, output.ptr, output.length, 0);
+            Nullable!ubyte ret;
 
-			if (length >= 0)
-			{
-				ret = cast(ubyte) length;
-			}
-			return ret;
-		}
-	}
+            if (length >= 0)
+            {
+                ret = cast(ubyte) length;
+            }
+            return ret;
+        }
+    }
+
+    version (X86_64)
+    {
+        private unittest
+        {
+            auto entropy = defaultAllocator.make!Entropy();
+            ubyte[blockSize] output;
+            output = entropy.random;
+
+            defaultAllocator.dispose(entropy);
+        }
+    }
 }
 
 /**
@@ -156,165 +168,166 @@ version (linux)
  *
  * output = entropy.random;
  *
- * defaultAllocator.finalize(entropy);
+ * defaultAllocator.dispose(entropy);
  * ---
  */
 class Entropy
 {
-	/// Entropy sources.
-	protected EntropySource[] sources;
+    /// Entropy sources.
+    protected EntropySource[] sources;
 
-	private ubyte sourceCount_;
+    private ubyte sourceCount_;
 
-	private shared Allocator allocator;
+    private shared Allocator allocator;
 
-	/// Entropy accumulator.
-	protected SHA!(maxGather * 8, 512) accumulator;
+    /// Entropy accumulator.
+    protected SHA!(maxGather * 8, 512) accumulator;
 
-	/**
-	 * Params:
-	 *  maxSources = Maximum amount of entropy sources can be set.
-	 * 	allocator  = Allocator to allocate entropy sources available on the
-	 * 	             system.
-	 */
-	this(size_t maxSources = 20, shared Allocator allocator = defaultAllocator)
-	in
-	{
-		assert(maxSources > 0 && maxSources <= ubyte.max);
-		assert(allocator !is null);
-	}
-	body
-	{
-		allocator.resizeArray(sources, maxSources);
+    /**
+     * Params:
+     *  maxSources = Maximum amount of entropy sources can be set.
+     *  allocator  = Allocator to allocate entropy sources available on the
+     *               system.
+     */
+    this(const size_t maxSources = 20,
+         shared Allocator allocator = defaultAllocator) @nogc
+    in
+    {
+        assert(maxSources > 0 && maxSources <= ubyte.max);
+        assert(allocator !is null);
+    }
+    body
+    {
+        allocator.resize(sources, maxSources);
 
-		version (linux)
-		{
-			this ~= allocator.make!PlatformEntropySource;
-		}
-	}
+        version (linux)
+        {
+            this ~= allocator.make!PlatformEntropySource;
+        }
+    }
 
-	/**
-	 * Returns: Amount of the registered entropy sources.
-	 */
-	@property ubyte sourceCount() const @safe pure nothrow
-	{
-		return sourceCount_;
-	}
+    /**
+     * Returns: Amount of the registered entropy sources.
+     */
+    @property ubyte sourceCount() const pure nothrow @safe @nogc
+    {
+        return sourceCount_;
+    }
 
-	/**
-	 * Add an entropy source.
-	 *
-	 * Params:
-	 * 	source = Entropy source.
-	 *
-	 * Returns: $(D_PSYMBOL this).
-	 *
-	 * See_Also:
-	 * 	$(D_PSYMBOL EntropySource)
-	 */
-	Entropy opOpAssign(string Op)(EntropySource source) @safe pure nothrow
-		if (Op == "~")
-	in
-	{
-		assert(sourceCount_ <= sources.length);
-	}
-	body
-	{
-		sources[sourceCount_++] = source;
-		return this;
-	}
+    /**
+     * Add an entropy source.
+     *
+     * Params:
+     *  source = Entropy source.
+     *
+     * Returns: $(D_PSYMBOL this).
+     *
+     * See_Also:
+     *  $(D_PSYMBOL EntropySource)
+     */
+    Entropy opOpAssign(string Op)(EntropySource source) pure nothrow @safe @nogc
+        if (Op == "~")
+    in
+    {
+        assert(sourceCount_ <= sources.length);
+    }
+    body
+    {
+        sources[sourceCount_++] = source;
+        return this;
+    }
 
-	/**
-	 * Returns: Generated random sequence.
-	 *
-	 * Throws: $(D_PSYMBOL EntropyException) if no strong entropy source was
-	 *         registered or it failed.
-	 */
-	@property ubyte[blockSize] random()
-	in
-	{
-		assert(sourceCount_ > 0, "No entropy sources defined.");
-	}
-	body
-	{
-		bool haveStrong;
-		ushort done;
-		ubyte[blockSize] output;
+    /**
+     * Returns: Generated random sequence.
+     *
+     * Throws: $(D_PSYMBOL EntropyException) if no strong entropy source was
+     *         registered or it failed.
+     */
+    @property ubyte[blockSize] random() @nogc
+    in
+    {
+        assert(sourceCount_ > 0, "No entropy sources defined.");
+    }
+    body
+    {
+        bool haveStrong;
+        ushort done;
+        ubyte[blockSize] output;
 
-		do
-		{
-			ubyte[maxGather] buffer;
+        do
+        {
+            ubyte[maxGather] buffer;
 
-			// Run through our entropy sources
-			for (ubyte i; i < sourceCount; ++i)
-			{
-				auto outputLength = sources[i].poll(buffer);
+            // Run through our entropy sources
+            for (ubyte i; i < sourceCount; ++i)
+            {
+                auto outputLength = sources[i].poll(buffer);
 
-				if (!outputLength.isNull)
-				{
-					if (outputLength > 0)
-					{
-						update(i, buffer, outputLength);
-						sources[i].size = cast(ushort) (sources[i].size + outputLength);
-					}
-					if (sources[i].size < sources[i].threshold)
-					{
-						continue;
-					}
-					else if (sources[i].strong)
-					{
-						haveStrong = true;
-					}
-				}
-				done = 257;
-			}
-		}
-		while (++done < 256);
+                if (!outputLength.isNull)
+                {
+                    if (outputLength > 0)
+                    {
+                        update(i, buffer, outputLength);
+                        sources[i].size = cast(ushort) (sources[i].size + outputLength);
+                    }
+                    if (sources[i].size < sources[i].threshold)
+                    {
+                        continue;
+                    }
+                    else if (sources[i].strong)
+                    {
+                        haveStrong = true;
+                    }
+                }
+                done = 257;
+            }
+        }
+        while (++done < 256);
 
-		if (!haveStrong)
-		{
-			throw allocator.make!EntropyException("No strong entropy source defined.");
-		}
+        if (!haveStrong)
+        {
+            throw allocator.make!EntropyException("No strong entropy source defined.");
+        }
 
-		output = accumulator.finish();
+        output = accumulator.finish();
 
-		// Reset accumulator and counters and recycle existing entropy
-		accumulator.start();
+        // Reset accumulator and counters and recycle existing entropy
+        accumulator.start();
 
-		// Perform second SHA-512 on entropy
-		output = sha512Of(output);
+        // Perform second SHA-512 on entropy
+        output = sha512Of(output);
 
-		for (ubyte i = 0; i < sourceCount; ++i)
-		{
-			sources[i].size = 0;
-		}
-		return output;
-	}
+        for (ubyte i = 0; i < sourceCount; ++i)
+        {
+            sources[i].size = 0;
+        }
+        return output;
+    }
 
-	/**
-	 * Update entropy accumulator.
-	 *
-	 * Params:
-	 * 	sourceId = Entropy source index in $(D_PSYMBOL sources).
-	 * 	data     = Data got from the entropy source.
-	 * 	length   = Length of the received data.
-	 */
-	protected void update(in ubyte sourceId,
-	                      ref ubyte[maxGather] data,
-	                      ubyte length) @safe pure nothrow
-	{
-		ubyte[2] header;
+    /**
+     * Update entropy accumulator.
+     *
+     * Params:
+     *  sourceId = Entropy source index in $(D_PSYMBOL sources).
+     *  data     = Data got from the entropy source.
+     *  length   = Length of the received data.
+     */
+    protected void update(in ubyte sourceId,
+                          ref ubyte[maxGather] data,
+                          ubyte length) pure nothrow @safe @nogc
+    {
+        ubyte[2] header;
 
-		if (length > blockSize)
-		{
-			data[0..64] = sha512Of(data);
-			length = blockSize;
-		}
+        if (length > blockSize)
+        {
+            data[0 .. 64] = sha512Of(data);
+            length = blockSize;
+        }
 
-		header[0] = sourceId;
-		header[1] = length;
+        header[0] = sourceId;
+        header[1] = length;
 
-		accumulator.put(header);
-		accumulator.put(data[0..length]);
-	}
+        accumulator.put(header);
+        accumulator.put(data[0 .. length]);
+    }
 }

source/tanya/memory/allocator.d

@@ -3,7 +3,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * This module contains the interface for implementing custom allocators.
+ *
+ * Allocators are classes encapsulating memory allocation strategy. This allows
+ * to decouple memory management from the algorithms and the data. 
+ *
+ * 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 +20,54 @@ module tanya.memory.allocator;
  */
 interface Allocator
 {
-	/**
-	 * Returns: Alignment offered.
-	 */
-	@property uint alignment() const shared pure nothrow @safe @nogc;
+    /**
+     * Returns: Alignment offered.
+     */
+    @property uint alignment() const shared pure nothrow @safe @nogc;
 
-	/**
-	 * Allocates $(D_PARAM size) bytes of memory.
-	 *
-	 * Params:
-	 * 	size = Amount of memory to allocate.
-	 *
-	 * Returns: Pointer to the new allocated memory.
-	 */
-	void[] allocate(in size_t size) shared nothrow @nogc;
+    /**
+     * Allocates $(D_PARAM size) bytes of memory.
+     *
+     * Params:
+     *  size = Amount of memory to allocate.
+     *
+     * Returns: Pointer to the new allocated memory.
+     */
+    void[] allocate(const size_t size) shared nothrow @nogc;
 
-	/**
-	 * 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;
+    /**
+     * 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;
 
-	/**
-	 * Increases or decreases the size of a memory block.
-	 *
-	 * Params:
-	 * 	p    = A pointer to the memory block.
-	 * 	size = Size of the reallocated block.
-	 *
-	 * Returns: Pointer to the allocated memory.
-	 */
-	bool reallocate(ref void[] p, in size_t size) shared nothrow @nogc;
+    /**
+     * Increases or decreases the size of a memory block.
+     *
+     * Params:
+     *  p    = A pointer to the memory block.
+     *  size = Size of the reallocated block.
+     *
+     * Returns: Pointer to the allocated memory.
+     */
+    bool reallocate(ref void[] p, const size_t size) shared nothrow @nogc;
 
-	/**
-	 * Expands a memory block in place.
-	 *
-	 * Params:
-	 * 	p    = A pointer to the memory block.
-	 * 	size = Size of the reallocated block.
-	 *
-	 * Returns: $(D_KEYWORD true) if successful, $(D_KEYWORD false) otherwise.
-	 */
-	bool expand(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_;
-	}
+    /**
+     * 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.
+     *  size = Size of the reallocated block.
+     *
+     * Returns: $(D_KEYWORD true) if successful, $(D_KEYWORD false) otherwise.
+     */
+    bool reallocateInPlace(ref void[] p, const size_t size)
+    shared nothrow @nogc;
 }

source/tanya/memory/mallocator.d

@@ -0,0 +1,210 @@
+/* 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/. */
+
+/**
+ * Allocator based on $(D_PSYMBOL malloc), $(D_PSYMBOL realloc) and $(D_PSYMBOL free).
+ *
+ * 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 tanya.memory.allocator;
+
+/**
+ * Wrapper for $(D_PSYMBOL malloc)/$(D_PSYMBOL realloc)/$(D_PSYMBOL 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(const size_t size) shared nothrow @nogc
+    {
+        if (size == 0)
+        {
+            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);
+
+        p = Mallocator.instance.allocate(0);
+        assert(p.length == 0);
+    }
+
+    /**
+     * 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;
+    }
+
+    ///
+    @nogc nothrow unittest
+    {
+        void[] p;
+        assert(!Mallocator.instance.reallocateInPlace(p, 8));
+    }
+
+    /**
+     * 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);
+    }
+
+    // Fails with false.
+    private @nogc nothrow unittest
+    {
+        void[] p = Mallocator.instance.allocate(20);
+        void[] oldP = p;
+        assert(!Mallocator.instance.reallocate(p, size_t.max - Mallocator.psize * 2));
+        assert(oldP is p);
+        Mallocator.instance.deallocate(p);
+    }
+
+    /**
+     * Returns: The alignment offered.
+     */
+    @property uint alignment() shared const pure nothrow @safe @nogc
+    {
+        return (void*).alignof;
+    }
+
+    private nothrow @nogc unittest
+    {
+        assert(Mallocator.instance.alignment == (void*).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)
+        {
+            const 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 ushort psize = 8;
+
+    private shared static Mallocator instance_;
+}

source/tanya/memory/package.d

@@ -3,7 +3,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Dynamic memory management.
+ *
+ * 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 +13,76 @@
 module tanya.memory;
 
 import core.exception;
-public import std.experimental.allocator : make, makeArray;
+import std.algorithm.iteration;
+public import std.experimental.allocator : make;
 import std.traits;
 public import tanya.memory.allocator;
-public import tanya.memory.types;
+import tanya.memory.mmappool;
+
+/**
+ * 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 +91,38 @@ shared Allocator allocator;
 
 shared static this() nothrow @trusted @nogc
 {
-	import tanya.memory.mmappool;
-	allocator = MmapPool.instance;
+    allocator = MmapPool.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;
+}
+
+private nothrow @nogc unittest
+{
+    import tanya.memory.mallocator;
+
+    auto oldAllocator = defaultAllocator;
+    defaultAllocator = Mallocator.instance;
+    assert(defaultAllocator is Mallocator.instance);
+
+    defaultAllocator = oldAllocator;
 }
 
 /**
@@ -42,101 +130,166 @@ 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))
-	{
-		enum stateSize = __traits(classInstanceSize, T);
-	}
-	else
-	{
-		enum stateSize = T.sizeof;
-	}
+    static if (is(T == class) || is(T == interface))
+    {
+        enum stateSize = __traits(classInstanceSize, T);
+    }
+    else
+    {
+        enum stateSize = T.sizeof;
+    }
 }
 
 /**
  * Params:
- * 	size      = Raw size.
- * 	alignment = Alignment.
+ *  size      = Raw size.
+ *  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
- * allocated part of the array is initialized only if $(D_PARAM Init) 
- * is set. This function can be trusted only in the data structures that
- * can ensure that the array is allocated/rellocated/deallocated with the
- * same allocator.
+ * may throw $(D_PSYMBOL OutOfMemoryError). The new
+ * allocated part of the array isn't initialized. This function can be trusted
+ * only in the data structures that can ensure that the array is
+ * allocated/rellocated/deallocated with the same allocator.
  *
  * Params:
- * 	T         = Element type of the array being created.
- * 	Init      = If should be initialized.
- * 	Throws    = If $(D_PSYMBOL OutOfMemoryError) should be throwsn.
- * 	allocator = The allocator used for getting memory.
- * 	array     = A reference to the array being changed.
- * 	length    = New array length.
+ *  T         = Element type of the array being created.
+ *  allocator = The allocator used for getting memory.
+ *  array     = A reference to the array being changed.
+ *  length    = New array length.
  *
- * Returns: $(D_KEYWORD true) upon success, $(D_KEYWORD false) if memory could
- *          not be reallocated. In the latter
+ * Returns: $(D_PARAM array).
  */
-package(tanya) bool resize(T,
-                           bool Init = true,
-                           bool Throws = true)
-                          (shared Allocator allocator,
-                           ref T[] array,
-                           in size_t length) @trusted
+package(tanya) T[] resize(T)(shared Allocator allocator,
+                             auto ref T[] array,
+                             const size_t length) @trusted
 {
-	void[] buf = array;
-	static if (Init)
-	{
-		immutable oldLength = array.length;
-	}
-	if (!allocator.reallocate(buf, length * T.sizeof))
-	{
-		static if (Throws)
-		{
-			onOutOfMemoryError;
-		}
-		return false;
-	}
-	// Casting from void[] is unsafe, but we know we cast to the original type.
-	array = cast(T[]) buf;
+    if (length == 0)
+    {
+        if (allocator.deallocate(array))
+        {
+            return null;
+        }
+        else
+        {
+            onOutOfMemoryErrorNoGC();
+        }
+    }
 
-	static if (Init)
-	{
-		if (oldLength < length)
-		{
-			array[oldLength .. $] = T.init;
-		}
-	}
-	return true;
+    void[] buf = array;
+    if (!allocator.reallocate(buf, length * T.sizeof))
+    {
+        onOutOfMemoryErrorNoGC();
+    }
+    // Casting from void[] is unsafe, but we know we cast to the original type.
+    array = cast(T[]) buf;
+
+    return array;
 }
-package(tanya) alias resizeArray = resize;
 
-///
-unittest
+private unittest
 {
-	int[] p;
+    int[] p;
 
-	defaultAllocator.resizeArray(p, 20);
-	assert(p.length == 20);
+    p = defaultAllocator.resize(p, 20);
+    assert(p.length == 20);
 
-	defaultAllocator.resizeArray(p, 30);
-	assert(p.length == 30);
+    p = defaultAllocator.resize(p, 30);
+    assert(p.length == 30);
 
-	defaultAllocator.resizeArray(p, 10);
-	assert(p.length == 10);
+    p = defaultAllocator.resize(p, 10);
+    assert(p.length == 10);
 
-	defaultAllocator.resizeArray(p, 0);
-	assert(p is null);
+    p = defaultAllocator.resize(p, 0);
+    assert(p is null);
+}
+
+/*
+ * Destroys the object.
+ * Returns the memory should be freed.
+ */
+package(tanya) void[] finalize(T)(ref T* p)
+{
+    static if (hasElaborateDestructor!T)
+    {
+        destroy(*p);
+    }
+    return (cast(void*) p)[0 .. T.sizeof];
+}
+
+package(tanya) void[] finalize(T)(ref T p)
+    if (is(T == class) || is(T == interface))
+{
+    if (p is null)
+    {
+        return null;
+    }
+    static if (is(T == interface))
+    {
+        version(Windows)
+        {
+            import core.sys.windows.unknwn : IUnknown;
+            static assert(!is(T : IUnknown), "COM interfaces can't be destroyed in "
+                                           ~ __PRETTY_FUNCTION__);
+        }
+        auto ob = cast(Object) p;
+    }
+    else
+    {
+        alias ob = p;
+    }
+    auto ptr = cast(void*) ob;
+    auto support = ptr[0 .. typeid(ob).initializer.length];
+
+    auto ppv = cast(void**) ptr;
+    if (!*ppv)
+    {
+        return null;
+    }
+    auto pc = cast(ClassInfo*) *ppv;
+    scope (exit)
+    {
+        *ppv = null;
+    }
+
+    auto c = *pc;
+    do
+    {
+        // Assume the destructor is @nogc. Leave it nothrow since the destructor
+        // shouldn't throw and if it does, it is an error anyway.
+        if (c.destructor)
+        {
+            (cast(void function (Object) nothrow @safe @nogc) c.destructor)(ob);
+        }
+    }
+    while ((c = c.base) !is null);
+
+    if (ppv[1]) // if monitor is not null
+    {
+        _d_monitordelete(cast(Object) ptr, true);
+    }
+    return support;
+}
+
+package(tanya) void[] finalize(T)(ref T[] p)
+{
+    static if (hasElaborateDestructor!(typeof(p[0])))
+    {
+        p.each!((ref e) => destroy(e));
+    }
+    return p;
 }
 
 /**
@@ -145,90 +298,41 @@ unittest
  * allocator.
  *
  * Params:
- * 	T         = Type of $(D_PARAM p).
- * 	allocator = Allocator the $(D_PARAM p) was allocated with.
- * 	p         = Object or array to be destroyed.
+ *  T         = Type of $(D_PARAM p).
+ *  allocator = Allocator the $(D_PARAM p) was allocated with.
+ *  p         = Object or array to be destroyed.
  */
-void dispose(T)(shared Allocator allocator, auto ref T* p)
-{
-	static if (hasElaborateDestructor!T)
-	{
-		destroy(*p);
-	}
-	() @trusted { allocator.deallocate((cast(void*) p)[0 .. T.sizeof]); }();
-	p = null;
-}
-
-/// Ditto.
 void dispose(T)(shared Allocator allocator, auto ref T p)
-	if (is(T == class) || is(T == interface))
 {
-	if (p is null)
-	{
-		return;
-	}
-	static if (is(T == interface))
-	{
-		version(Windows)
-		{
-			import core.sys.windows.unknwn : IUnknown;
-			static assert(!is(T: IUnknown), "COM interfaces can't be destroyed in "
-										 ~ __PRETTY_FUNCTION__);
-		}
-		auto ob = cast(Object) p;
-	}
-	else
-	{
-		alias ob = p;
-	}
-	auto ptr = cast(void *) ob;
-
-	auto support = ptr[0 .. typeid(ob).initializer.length];
-	scope (success)
-	{
-		() @trusted { allocator.deallocate(support); }();
-		p = null;
-	}
-
-	auto ppv = cast(void**) ptr;
-	if (!*ppv)
-	{
-		return;
-	}
-	auto pc = cast(ClassInfo*) *ppv;
-	scope (exit)
-	{
-		*ppv = null;
-	}
-
-	auto c = *pc;
-	do
-	{
-		// Assume the destructor is @nogc. Leave it nothrow since the destructor
-		// shouldn't throw and if it does, it is an error anyway.
-		if (c.destructor)
-		{
-			(cast(void function (Object) nothrow @safe @nogc) c.destructor)(ob);
-		}
-	}
-	while ((c = c.base) !is null);
-
-	if (ppv[1]) // if monitor is not null
-	{
-		_d_monitordelete(cast(Object) ptr, true);
-	}
+    () @trusted { allocator.deallocate(finalize(p)); }();
+    p = null;
 }
 
-/// Ditto.
-void dispose(T)(shared Allocator allocator, auto ref T[] array)
+private unittest
 {
-	static if (hasElaborateDestructor!(typeof(array[0])))
-	{
-	foreach (ref e; array)
-	{
-	    destroy(e);
-	}
-	}
-	() @trusted { allocator.deallocate(array); }();
-	array = null;
+    struct S
+    {
+        ~this()
+        {
+        }
+    }
+    auto p = cast(S[]) defaultAllocator.allocate(S.sizeof);
+
+    defaultAllocator.dispose(p);
+}
+
+// Works with interfaces.
+private unittest
+{
+    interface I
+    {
+    }
+    class C : I
+    {
+    }
+    auto c = defaultAllocator.make!C();
+    I i = c;
+
+    defaultAllocator.dispose(i);
+    defaultAllocator.dispose(i);
 }

source/tanya/memory/smartref.d

@@ -0,0 +1,924 @@
+/* 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/. */
+
+/**
+ * Smart pointers.
+ *
+ * A smart pointer is an object that wraps a raw pointer or a reference
+ * (class, array) to manage its lifetime.
+ *
+ * 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.memory.smartref;
+
+import core.exception;
+import std.algorithm.comparison;
+import std.algorithm.mutation;
+import std.conv;
+import std.range;
+import std.traits;
+import tanya.memory;
+
+package template Payload(T)
+{
+    static if (is(T == class) || is(T == interface) || isArray!T)
+    {
+        alias Payload = T;
+    }
+    else
+    {
+        alias Payload = T*;
+    }
+}
+
+package final class RefCountedStore(T)
+{
+    T payload;
+    size_t counter = 1;
+
+    size_t opUnary(string op)()
+    if (op == "--" || op == "++")
+    in
+    {
+        assert(this.counter > 0);
+    }
+    body
+    {
+        mixin("return " ~ op ~ "counter;");
+    }
+
+    int opCmp(const size_t counter)
+    {
+        if (this.counter > counter)
+        {
+            return 1;
+        }
+        else if (this.counter < counter)
+        {
+            return -1;
+        }
+        else
+        {
+            return 0;
+        }
+    }
+}
+
+package void separateDeleter(T)(RefCountedStore!T storage,
+                                shared Allocator allocator)
+{
+    allocator.dispose(storage.payload);
+    allocator.dispose(storage);
+}
+
+package void unifiedDeleter(T)(RefCountedStore!T storage,
+                               shared Allocator allocator)
+{
+    auto ptr1 = finalize(storage);
+    auto ptr2 = finalize(storage.payload);
+    allocator.deallocate(ptr1.ptr[0 .. ptr1.length + ptr2.length]);
+}
+
+/**
+ * Reference-counted object containing a $(D_PARAM T) value as payload.
+ * $(D_PSYMBOL RefCounted) keeps track of all references of an object, and
+ * when the reference count goes down to zero, frees the underlying store.
+ *
+ * Params:
+ *  T = Type of the reference-counted value.
+ */
+struct RefCounted(T)
+{
+    private alias Storage = RefCountedStore!(Payload!T);
+
+    private Storage storage;
+    private void function(Storage storage,
+                          shared Allocator allocator) @nogc deleter;
+
+    invariant
+    {
+        assert(this.storage is null || this.allocator_ !is null);
+        assert(this.storage is null || this.deleter !is null);
+    }
+
+    /**
+     * Takes ownership over $(D_PARAM value), setting the counter to 1.
+     * $(D_PARAM value) may be a pointer, an object or a dynamic array.
+     *
+     * Params:
+     *  value     = Value whose ownership is taken over.
+     *  allocator = Allocator used to destroy the $(D_PARAM value) and to
+     *              allocate/deallocate internal storage.
+     *
+     * Precondition: $(D_INLINECODE allocator !is null)
+     */
+    this(Payload!T value, shared Allocator allocator = defaultAllocator)
+    {
+        this(allocator);
+        this.storage = allocator.make!Storage();
+        this.deleter = &separateDeleter!(Payload!T);
+
+        this.storage.payload = value;
+    }
+
+    /// Ditto.
+    this(shared Allocator allocator)
+    in
+    {
+        assert(allocator !is null);
+    }
+    body
+    {
+        this.allocator_ = allocator;
+    }
+
+    /**
+     * Increases the reference counter by one.
+     */
+    this(this)
+    {
+        if (count != 0)
+        {
+            ++this.storage;
+        }
+    }
+
+    /**
+     * Decreases the reference counter by one.
+     *
+     * If the counter reaches 0, destroys the owned object.
+     */
+    ~this()
+    {
+        if (this.storage !is null && !(this.storage > 0 && --this.storage))
+        {
+            deleter(this.storage, allocator);
+        }
+    }
+
+    /**
+     * Takes ownership over $(D_PARAM rhs). Initializes this
+     * $(D_PSYMBOL RefCounted) if needed.
+     *
+     * If it is the last reference of the previously owned object,
+     * it will be destroyed.
+     *
+     * To reset $(D_PSYMBOL RefCounted) assign $(D_KEYWORD null).
+     *
+     * If the allocator wasn't set before, $(D_PSYMBOL defaultAllocator) will
+     * be used. If you need a different allocator, create a new
+     * $(D_PSYMBOL RefCounted) and assign it.
+     *
+     * Params:
+     *  rhs = New object.
+     *
+     * Returns: $(D_KEYWORD this).
+     */
+    ref typeof(this) opAssign(Payload!T rhs)
+    {
+        if (this.storage is null)
+        {
+            this.storage = allocator.make!Storage();
+            this.deleter = &separateDeleter!(Payload!T);
+        }
+        else if (this.storage > 1)
+        {
+            --this.storage;
+            this.storage = allocator.make!Storage();
+            this.deleter = &separateDeleter!(Payload!T);
+        }
+        else
+        {
+            finalize(this.storage.payload);
+            this.storage.payload = Payload!T.init;
+        }
+        this.storage.payload = rhs;
+        return this;
+    }
+
+    private @nogc unittest
+    {
+        auto rc = defaultAllocator.refCounted!int(5);
+        rc = defaultAllocator.make!int(7);
+        assert(*rc == 7);
+    }
+
+    /// Ditto.
+    ref typeof(this) opAssign(typeof(null))
+    {
+        if (this.storage is null)
+        {
+            return this;
+        }
+        else if (this.storage > 1)
+        {
+            --this.storage;
+        }
+        else
+        {
+            deleter(this.storage, allocator);
+        }
+        this.storage = null;
+
+        return this;
+    }
+
+    private @nogc unittest
+    {
+        RefCounted!int rc;
+        assert(!rc.isInitialized);
+        rc = null;
+        assert(!rc.isInitialized);
+    }
+
+    /// Ditto.
+    ref typeof(this) opAssign(typeof(this) rhs)
+    {
+        swap(this.allocator_, rhs.allocator_);
+        swap(this.storage, rhs.storage);
+        swap(this.deleter, rhs.deleter);
+        return this;
+    }
+
+    /**
+     * Returns: Reference to the owned object.
+     *
+     * Precondition: $(D_INLINECODE cound > 0).
+     */
+    inout(Payload!T) get() inout
+    in
+    {
+        assert(count > 0, "Attempted to access an uninitialized reference");
+    }
+    body
+    {
+        return this.storage.payload;
+    }
+
+    version (D_Ddoc)
+    {
+        /**
+         * Dereferences the pointer. It is defined only for pointers, not for
+         * reference types like classes, that can be accessed directly.
+         *
+         * Params:
+         *  op = Operation. 
+         *
+         * Returns: Reference to the pointed value.
+         */
+        ref inout(T) opUnary(string op)() inout
+        if (op == "*");
+    }
+    else static if (isPointer!(Payload!T))
+    {
+        ref inout(T) opUnary(string op)() inout
+        if (op == "*")
+        {
+            return *this.storage.payload;
+        }
+    }
+
+    /**
+     * Returns: Whether this $(D_PSYMBOL RefCounted) already has an internal 
+     *          storage.
+     */
+    @property bool isInitialized() const
+    {
+        return this.storage !is null;
+    }
+
+    /**
+     * Returns: The number of $(D_PSYMBOL RefCounted) instances that share
+     *          ownership over the same pointer (including $(D_KEYWORD this)).
+     *          If this $(D_PSYMBOL RefCounted) isn't initialized, returns `0`.
+     */
+    @property size_t count() const
+    {
+        return this.storage is null ? 0 : this.storage.counter;
+    }
+
+    mixin DefaultAllocator;
+    alias get this;
+}
+
+///
+unittest
+{
+    auto rc = RefCounted!int(defaultAllocator.make!int(5), defaultAllocator);
+    auto val = rc.get();
+
+    *val = 8;
+    assert(*rc.storage.payload == 8);
+
+    val = null;
+    assert(rc.storage.payload !is null);
+    assert(*rc.storage.payload == 8);
+
+    *rc = 9;
+    assert(*rc.storage.payload == 9);
+}
+
+private @nogc unittest
+{
+    auto rc = defaultAllocator.refCounted!int(5);
+
+    void func(RefCounted!int param) @nogc
+    {
+        assert(param.count == 2);
+        param = defaultAllocator.make!int(7);
+        assert(param.count == 1);
+        assert(*param == 7);
+    }
+    func(rc);
+    assert(rc.count == 1);
+    assert(*rc == 5);
+}
+
+private @nogc unittest
+{
+    RefCounted!int rc;
+
+    void func(RefCounted!int param) @nogc
+    {
+        assert(param.count == 0);
+        param = defaultAllocator.make!int(7);
+        assert(param.count == 1);
+        assert(*param == 7);
+    }
+    func(rc);
+    assert(rc.count == 0);
+}
+
+private unittest
+{
+    RefCounted!int rc1, rc2;
+    static assert(is(typeof(rc1 = rc2)));
+}
+
+version (unittest)
+{
+    private class A
+    {
+        uint *destroyed;
+
+        this(ref uint destroyed) @nogc
+        {
+            this.destroyed = &destroyed;
+        }
+
+        ~this() @nogc
+        {
+            ++(*destroyed);
+        }
+    }
+
+    private struct B
+    {
+        int prop;
+        @disable this();
+        this(int param1) @nogc
+        {
+            prop = param1;
+        }
+    }
+}
+
+private @nogc unittest
+{
+    uint destroyed;
+    auto a = defaultAllocator.make!A(destroyed);
+
+    assert(destroyed == 0);
+    {
+        auto rc = RefCounted!A(a, defaultAllocator);
+        assert(rc.count == 1);
+
+        void func(RefCounted!A rc) @nogc
+        {
+            assert(rc.count == 2);
+        }
+        func(rc);
+
+        assert(rc.count == 1);
+    }
+    assert(destroyed == 1);
+
+    RefCounted!int rc;
+    assert(rc.count == 0);
+    rc = defaultAllocator.make!int(8);
+    assert(rc.count == 1);
+}
+
+private @nogc unittest
+{
+    auto rc = RefCounted!int(defaultAllocator);
+    assert(!rc.isInitialized);
+    assert(rc.allocator is defaultAllocator);
+}
+
+private @nogc unittest
+{
+    auto rc = defaultAllocator.refCounted!int(5);
+    assert(rc.count == 1);
+
+    void func(RefCounted!int rc) @nogc
+    {
+        assert(rc.count == 2);
+        rc = null;
+        assert(!rc.isInitialized);
+        assert(rc.count == 0);
+    }
+
+    assert(rc.count == 1);
+    func(rc);
+    assert(rc.count == 1);
+
+    rc = null;
+    assert(!rc.isInitialized);
+    assert(rc.count == 0);
+}
+
+private unittest
+{
+    auto rc = defaultAllocator.refCounted!int(5);
+    assert(*rc == 5);
+
+    void func(RefCounted!int rc) @nogc
+    {
+        assert(rc.count == 2);
+        rc = defaultAllocator.refCounted!int(4);
+        assert(*rc == 4);
+        assert(rc.count == 1);
+    }
+    func(rc);
+    assert(*rc == 5);
+}
+
+private unittest
+{
+    static assert(is(typeof(RefCounted!int.storage.payload) == int*));
+    static assert(is(typeof(RefCounted!A.storage.payload) == A));
+
+    static assert(is(RefCounted!B));
+    static assert(is(RefCounted!A));
+}
+
+/**
+ * Constructs a new object of type $(D_PARAM T) and wraps it in a
+ * $(D_PSYMBOL RefCounted) using $(D_PARAM args) as the parameter list for
+ * the constructor of $(D_PARAM T).
+ *
+ * This function is more efficient than the using of $(D_PSYMBOL RefCounted)
+ * directly, since it allocates only ones (the internal storage and the
+ * object).
+ *
+ * Params:
+ *  T         = Type of the constructed object.
+ *  A         = Types of the arguments to the constructor of $(D_PARAM T).
+ *  allocator = Allocator.
+ *  args      = Constructor arguments of $(D_PARAM T).
+ * 
+ * Returns: Newly created $(D_PSYMBOL RefCounted!T).
+ *
+ * Precondition: $(D_INLINECODE allocator !is null)
+ */
+RefCounted!T refCounted(T, A...)(shared Allocator allocator, auto ref A args)
+if (!is(T == interface) && !isAbstractClass!T
+ && !isAssociativeArray!T && !isArray!T)
+in
+{
+    assert(allocator !is null);
+}
+body
+{
+    auto rc = typeof(return)(allocator);
+
+    const storageSize = alignedSize(stateSize!(RefCounted!T.Storage));
+    const size = alignedSize(stateSize!T + storageSize);
+
+    auto mem = (() @trusted => allocator.allocate(size))();
+    if (mem is null)
+    {
+        onOutOfMemoryError();
+    }
+    scope (failure)
+    {
+        () @trusted { allocator.deallocate(mem); }();
+    }
+    rc.storage = emplace!((RefCounted!T.Storage))(mem[0 .. storageSize]);
+
+    static if (is(T == class))
+    {
+        rc.storage.payload = emplace!T(mem[storageSize .. $], args);
+    }
+    else
+    {
+        auto ptr = (() @trusted => (cast(T*) mem[storageSize .. $].ptr))();
+        rc.storage.payload = emplace!T(ptr, args);
+    }
+    rc.deleter = &unifiedDeleter!(Payload!T);
+    return rc;
+}
+
+/**
+ * Constructs a new array with $(D_PARAM size) elements and wraps it in a
+ * $(D_PSYMBOL RefCounted).
+ *
+ * Params:
+ *  T         = Array type.
+ *  size      = Array size.
+ *  allocator = Allocator.
+ *
+ * Returns: Newly created $(D_PSYMBOL RefCounted!T).
+ *
+ * Precondition: $(D_INLINECODE allocator !is null
+ *                           && size <= size_t.max / ElementType!T.sizeof)
+ */
+RefCounted!T refCounted(T)(shared Allocator allocator, const size_t size)
+@trusted
+if (isArray!T)
+in
+{
+    assert(allocator !is null);
+    assert(size <= size_t.max / ElementType!T.sizeof);
+}
+body
+{
+    auto payload = allocator.resize!(ElementType!T)(null, size);
+    return RefCounted!T(payload, allocator);
+}
+
+///
+unittest
+{
+    auto rc = defaultAllocator.refCounted!int(5);
+    assert(rc.count == 1);
+
+    void func(RefCounted!int param) @nogc
+    {
+        if (param.count == 2)
+        {
+            func(param);
+        }
+        else
+        {
+            assert(param.count == 3);
+        }
+    }
+    func(rc);
+
+    assert(rc.count == 1);
+}
+
+private @nogc unittest
+{
+    struct E
+    {
+    }
+    auto b = defaultAllocator.refCounted!B(15);
+    static assert(is(typeof(b.storage.payload) == B*));
+    static assert(is(typeof(b.prop) == int));
+    static assert(!is(typeof(defaultAllocator.refCounted!B())));
+
+    static assert(is(typeof(defaultAllocator.refCounted!E())));
+    static assert(!is(typeof(defaultAllocator.refCounted!E(5))));
+    {
+        auto rc = defaultAllocator.refCounted!B(3);
+        assert(rc.get().prop == 3);
+    }
+    {
+        auto rc = defaultAllocator.refCounted!E();
+        assert(rc.count);
+    }
+}
+
+private @nogc unittest
+{
+    auto rc = defaultAllocator.refCounted!(int[])(5);
+    assert(rc.length == 5);
+}
+
+private @nogc unittest
+{
+    auto p1 = defaultAllocator.make!int(5);
+    auto p2 = p1;
+    auto rc = RefCounted!int(p1, defaultAllocator);
+    assert(rc.get() is p2);
+}
+
+private @nogc unittest
+{
+    static bool destroyed = false;
+
+    struct F
+    {
+        ~this() @nogc
+        {
+            destroyed = true;
+        }
+    }
+    {
+        auto rc = defaultAllocator.refCounted!F();
+    }
+    assert(destroyed);
+}
+
+/**
+ * $(D_PSYMBOL Unique) stores an object that gets destroyed at the end of its scope.
+ *
+ * Params:
+ *  T = Value type.
+ */
+struct Unique(T)
+{
+    private Payload!T payload;
+
+    invariant
+    {
+        assert(payload is null || allocator_ !is null);
+    }
+
+    /**
+     * Takes ownership over $(D_PARAM value), setting the counter to 1.
+     * $(D_PARAM value) may be a pointer, an object or a dynamic array.
+     *
+     * Params:
+     *  value     = Value whose ownership is taken over.
+     *  allocator = Allocator used to destroy the $(D_PARAM value) and to
+     *              allocate/deallocate internal storage.
+     *
+     * Precondition: $(D_INLINECODE allocator !is null)
+     */
+    this(Payload!T value, shared Allocator allocator = defaultAllocator)
+    {
+        this(allocator);
+        this.payload = value;
+    }
+
+    /// Ditto.
+    this(shared Allocator allocator)
+    in
+    {
+        assert(allocator !is null);
+    }
+    body
+    {
+        this.allocator_ = allocator;
+    }
+
+    /**
+     * $(D_PSYMBOL Unique) is noncopyable.
+     */
+    @disable this(this);
+
+    /**
+     * Destroys the owned object.
+     */
+    ~this()
+    {
+        allocator.dispose(this.payload);
+    }
+
+    /**
+     * Initialized this $(D_PARAM Unique) and takes ownership over
+     * $(D_PARAM rhs).
+     *
+     * To reset $(D_PSYMBOL Unique) assign $(D_KEYWORD null).
+     *
+     * If the allocator wasn't set before, $(D_PSYMBOL defaultAllocator) will
+     * be used. If you need a different allocator, create a new
+     * $(D_PSYMBOL Unique) and assign it.
+     *
+     * Params:
+     *  rhs = New object.
+     *
+     * Returns: $(D_KEYWORD this).
+     */
+    ref typeof(this) opAssign(Payload!T rhs)
+    {
+        allocator.dispose(this.payload);
+        this.payload = rhs;
+        return this;
+    }
+
+    /// Ditto.
+    ref typeof(this) opAssign(typeof(null))
+    {
+        allocator.dispose(this.payload);
+        return this;
+    }
+
+    /// Ditto.
+    ref typeof(this) opAssign(typeof(this) rhs)
+    {
+        swap(this.allocator_, rhs.allocator_);
+        swap(this.payload, rhs.payload);
+
+        return this;
+    }
+
+    ///
+    @nogc unittest
+    {
+        auto rc = defaultAllocator.unique!int(5);
+        rc = defaultAllocator.make!int(7);
+        assert(*rc == 7);
+    }
+
+    /**
+     * Returns: Reference to the owned object.
+     */
+    inout(Payload!T) get() inout
+    {
+        return this.payload;
+    }
+
+    version (D_Ddoc)
+    {
+        /**
+         * Dereferences the pointer. It is defined only for pointers, not for
+         * reference types like classes, that can be accessed directly.
+         *
+         * Params:
+         *  op = Operation. 
+         *
+         * Returns: Reference to the pointed value.
+         */
+        ref inout(T) opUnary(string op)() inout
+        if (op == "*");
+    }
+    else static if (isPointer!(Payload!T))
+    {
+        ref inout(T) opUnary(string op)() inout
+        if (op == "*")
+        {
+            return *this.payload;
+        }
+    }
+
+    /**
+     * Returns: Whether this $(D_PSYMBOL Unique) holds some value.
+     */
+    @property bool isInitialized() const
+    {
+        return this.payload !is null;
+    }
+
+    ///
+    @nogc unittest
+    {
+        Unique!int u;
+        assert(!u.isInitialized);
+    }
+
+    /**
+     * Sets the internal pointer to $(D_KEYWORD). The allocator isn't changed.
+     *
+     * Returns: Reference to the owned object.
+     */
+    Payload!T release()
+    {
+        auto payload = this.payload;
+        this.payload = null;
+        return payload;
+    }
+
+    ///
+    @nogc unittest
+    {
+        auto u = defaultAllocator.unique!int(5);
+        assert(u.isInitialized);
+
+        auto i = u.release();
+        assert(*i == 5);
+        assert(!u.isInitialized);
+    }
+
+    mixin DefaultAllocator;
+    alias get this;
+}
+
+///
+@nogc unittest
+{
+    auto p = defaultAllocator.make!int(5);
+    auto s = Unique!int(p, defaultAllocator);
+    assert(*s == 5);
+}
+
+///
+@nogc unittest
+{
+    static bool destroyed = false;
+
+    struct F
+    {
+        ~this() @nogc
+        {
+            destroyed = true;
+        }
+    }
+    {
+        auto s = Unique!F(defaultAllocator.make!F(), defaultAllocator);
+    }
+    assert(destroyed);
+}
+
+/**
+ * Constructs a new object of type $(D_PARAM T) and wraps it in a
+ * $(D_PSYMBOL Unique) using $(D_PARAM args) as the parameter list for
+ * the constructor of $(D_PARAM T).
+ *
+ * Params:
+ *  T         = Type of the constructed object.
+ *  A         = Types of the arguments to the constructor of $(D_PARAM T).
+ *  allocator = Allocator.
+ *  args      = Constructor arguments of $(D_PARAM T).
+ * 
+ * Returns: Newly created $(D_PSYMBOL Unique!T).
+ *
+ * Precondition: $(D_INLINECODE allocator !is null)
+ */
+Unique!T unique(T, A...)(shared Allocator allocator, auto ref A args)
+if (!is(T == interface) && !isAbstractClass!T
+ && !isAssociativeArray!T && !isArray!T)
+in
+{
+    assert(allocator !is null);
+}
+body
+{
+    auto payload = allocator.make!(T, shared Allocator, A)(args);
+    return Unique!T(payload, allocator);
+}
+
+/**
+ * Constructs a new array with $(D_PARAM size) elements and wraps it in a
+ * $(D_PSYMBOL Unique).
+ *
+ * Params:
+ *  T         = Array type.
+ *  size      = Array size.
+ *  allocator = Allocator.
+ *
+ * Returns: Newly created $(D_PSYMBOL Unique!T).
+ *
+ * Precondition: $(D_INLINECODE allocator !is null
+ *                           && size <= size_t.max / ElementType!T.sizeof)
+ */
+Unique!T unique(T)(shared Allocator allocator, const size_t size)
+@trusted
+if (isArray!T)
+in
+{
+    assert(allocator !is null);
+    assert(size <= size_t.max / ElementType!T.sizeof);
+}
+body
+{
+    auto payload = allocator.resize!(ElementType!T)(null, size);
+    return Unique!T(payload, allocator);
+}
+
+private unittest
+{
+    static assert(is(typeof(defaultAllocator.unique!B(5))));
+    static assert(is(typeof(defaultAllocator.unique!(int[])(5))));
+}
+
+private unittest
+{
+    auto s = defaultAllocator.unique!int(5);
+    assert(*s == 5);
+
+    s = null;
+    assert(s is null);
+}
+
+private unittest
+{
+    auto s = defaultAllocator.unique!int(5);
+    assert(*s == 5);
+
+    s = defaultAllocator.unique!int(4);
+    assert(*s == 4);
+}
+
+private @nogc unittest
+{
+    auto p1 = defaultAllocator.make!int(5);
+    auto p2 = p1;
+
+    auto rc = Unique!int(p1, defaultAllocator);
+    assert(rc.get() is p2);
+}
+
+private @nogc unittest
+{
+    auto rc = Unique!int(defaultAllocator);
+    assert(rc.allocator is defaultAllocator);
+}

source/tanya/memory/types.d

@@ -3,455 +3,299 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Smart pointers.
+ *
+ * $(RED Deprecated. Use $(D_PSYMBOL tanya.memory.smartref) instead.
+ * This module will be removed in 0.8.0.)
+ *
+ * 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)
  */
+deprecated("Use tanya.memory.smartref instead")
 module tanya.memory.types;
 
 import core.exception;
 import std.algorithm.comparison;
 import std.algorithm.mutation;
 import std.conv;
+import std.range;
 import std.traits;
 import tanya.memory;
-
-/**
- * Reference-counted object containing a $(D_PARAM T) value as payload.
- * $(D_PSYMBOL RefCounted) keeps track of all references of an object, and
- * when the reference count goes down to zero, frees the underlying store.
- *
- * Params:
- * 	T = Type of the reference-counted value.
- */
-struct RefCounted(T)
-{
-	static if (is(T == class) || is(T == interface))
-	{
-		private alias Payload = T;
-	}
-	else
-	{
-		private alias Payload = T*;
-	}
-
-	private class Storage
-	{
-		private Payload payload;
-		private size_t counter = 1;
-
-		private final size_t opUnary(string op)() pure nothrow @safe @nogc
-			if (op == "--" || op == "++")
-		in
-		{
-			assert(counter > 0);
-		}
-		body
-		{
-			mixin("return " ~ op ~ "counter;");
-		}
-
-		private final int opCmp(size_t counter) const pure nothrow @safe @nogc
-		{
-			if (this.counter > counter)
-			{
-				return 1;
-			}
-			else if (this.counter < counter)
-			{
-				return -1;
-			}
-			else
-			{
-				return 0;
-			}
-		}
-
-		private final int opEquals(size_t counter) const pure nothrow @safe @nogc
-		{
-			return this.counter == counter;
-		}
-	}
-
-	private final class RefCountedStorage : Storage
-	{
-		private shared Allocator allocator;
-
-		this(shared Allocator allocator) pure nothrow @safe @nogc
-		in
-		{
-			assert(allocator !is null);
-		}
-		body
-		{
-			this.allocator = allocator;
-		}
-
-		~this() nothrow @nogc
-		{
-			allocator.dispose(payload);
-		}
-	}
-
-	private Storage storage;
-
-	invariant
-	{
-		assert(storage is null || allocator_ !is null);
-	}
-
-	/**
-	 * Takes ownership over $(D_PARAM value), setting the counter to 1.
-	 * $(D_PARAM value) may be a pointer, an object or a dynamic array.
-	 *
-	 * Params:
-	 * 	value     = Value whose ownership is taken over.
-	 * 	allocator = Allocator used to destroy the $(D_PARAM value) and to
-	 * 	            allocate/deallocate internal storage.
-	 *
-	 * Precondition: $(D_INLINECODE allocator !is null)
-	 */
-	this(Payload value, shared Allocator allocator = defaultAllocator)
-	{
-		this(allocator);
-		storage = allocator.make!RefCountedStorage(allocator);
-		move(value, storage.payload);
-	}
-
-	/// Ditto.
-	this(shared Allocator allocator)
-	in
-	{
-		assert(allocator !is null);
-	}
-	body
-	{
-		this.allocator_ = allocator;
-	}
-
-	/**
-	 * Increases the reference counter by one.
-	 */
-	this(this)
-	{
-		if (count != 0)
-		{
-			++storage;
-		}
-	}
-
-	/**
-	 * Decreases the reference counter by one.
-	 *
-	 * If the counter reaches 0, destroys the owned object.
-	 */
-	~this()
-	{
-		if (storage !is null && !(storage.counter && --storage))
-		{
-			allocator_.dispose(storage);
-		}
-	}
-
-	/**
-	 * Takes ownership over $(D_PARAM rhs). Initializes this
-	 * $(D_PSYMBOL RefCounted) if needed.
-	 *
-	 * If it is the last reference of the previously owned object,
-	 * it will be destroyed.
-	 *
-	 * To reset the $(D_PSYMBOL RefCounted) assign $(D_KEYWORD null).
-	 *
-	 * If the allocator wasn't set before, $(D_PSYMBOL defaultAllocator) will
-	 * be used. If you need a different allocator, create a new
-	 * $(D_PSYMBOL RefCounted) and assign it.
-	 *
-	 * Params:
-	 * 	rhs = $(D_KEYWORD this).
-	 */
-	ref typeof(this) opAssign(Payload rhs)
-	{
-		if (storage is null)
-		{
-			storage = allocator.make!RefCountedStorage(allocator);
-		}
-		else if (storage > 1)
-		{
-			--storage;
-			storage = allocator.make!RefCountedStorage(allocator);
-		}
-		else if (cast(RefCountedStorage) storage is null)
-		{
-			// Created with refCounted. Always destroyed togethter with the pointer.
-			assert(storage.counter != 0);
-			allocator.dispose(storage);
-			storage = allocator.make!RefCountedStorage(allocator);
-		}
-		else
-		{
-			allocator.dispose(storage.payload);
-		}
-		move(rhs, storage.payload);
-		return this;
-	}
-
-	/// Ditto.
-	ref typeof(this) opAssign(typeof(null))
-	{
-		if (storage is null)
-		{
-			return this;
-		}
-		else if (storage > 1)
-		{
-			--storage;
-			storage = null;
-		}
-		else if (cast(RefCountedStorage) storage is null)
-		{
-			// Created with refCounted. Always destroyed togethter with the pointer.
-			assert(storage.counter != 0);
-			allocator.dispose(storage);
-			return this;
-		}
-		else
-		{
-			allocator.dispose(storage.payload);
-		}
-		return this;
-	}
-
-	/// Ditto.
-	ref typeof(this) opAssign(typeof(this) rhs)
-	{
-		swap(allocator_, rhs.allocator_);
-		swap(storage, rhs.storage);
-		return this;
-	}
-
-	/**
-	 * Returns: Reference to the owned object.
-	 */
-	inout(Payload) get() inout pure nothrow @safe @nogc
-	in
-	{
-		assert(count > 0, "Attempted to access an uninitialized reference.");
-	}
-	body
-	{
-		return storage.payload;
-	}
-
-	static if (isPointer!Payload)
-	{
-		/**
-		 * Params:
-		 * 	op = Operation. 
-		 *
-		 * Dereferences the pointer. It is defined only for pointers, not for
-		 * reference types like classes, that can be accessed directly.
-		 *
-		 * Returns: Reference to the pointed value.
-		 */
-		ref T opUnary(string op)()
-			if (op == "*")
-		{
-			return *storage.payload;
-		}
-	}
-
-	/**
-	 * Returns: Whether this $(D_PSYMBOL RefCounted) already has an internal 
-	 *          storage.
-	 */
-	@property bool isInitialized() const
-	{
-		return storage !is null;
-	}
-
-	/**
-	 * Returns: The number of $(D_PSYMBOL RefCounted) instances that share
-	 *          ownership over the same pointer (including $(D_KEYWORD this)).
-	 *          If this $(D_PSYMBOL RefCounted) isn't initialized, returns `0`.
-	 */
-	@property size_t count() const
-	{
-		return storage is null ? 0 : storage.counter;
-	}
-
-	mixin DefaultAllocator;
-	alias get this;
-}
-
-///
-unittest
-{
-	auto rc = RefCounted!int(defaultAllocator.make!int(5), defaultAllocator);
-	auto val = rc.get;
-
-	*val = 8;
-	assert(*rc.storage.payload == 8);
-
-	val = null;
-	assert(rc.storage.payload !is null);
-	assert(*rc.storage.payload == 8);
-
-	*rc = 9;
-	assert(*rc.storage.payload == 9);
-}
+public import tanya.memory.smartref : RefCounted, Payload;
 
 version (unittest)
 {
-	private class A
-	{
-		uint *destroyed;
-
-		this(ref uint destroyed) @nogc
-		{
-			this.destroyed = &destroyed;
-		}
-
-		~this() @nogc
-		{
-			++(*destroyed);
-		}
-	}
-
-	private struct B
-	{
-		int prop;
-		@disable this();
-		this(int param1) @nogc
-		{
-			prop = param1;
-		}
-	}
+    private struct B
+    {
+        int prop;
+        @disable this();
+        this(int param1) @nogc
+        {
+            prop = param1;
+        }
+    }
 }
 
-private unittest
+/**
+ * $(D_PSYMBOL Scoped) stores an object that gets destroyed at the end of its scope.
+ *
+ * Params:
+ *  T = Value type.
+ */
+struct Scoped(T)
 {
-	uint destroyed;
-	auto a = defaultAllocator.make!A(destroyed);
+    private Payload!T payload;
 
-	assert(destroyed == 0);
-	{
-		auto rc = RefCounted!A(a, defaultAllocator);
-		assert(rc.count == 1);
+    invariant
+    {
+        assert(payload is null || allocator_ !is null);
+    }
 
-		void func(RefCounted!A rc)
-		{
-			assert(rc.count == 2);
-		}
-		func(rc);
+    /**
+     * Takes ownership over $(D_PARAM value), setting the counter to 1.
+     * $(D_PARAM value) may be a pointer, an object or a dynamic array.
+     *
+     * Params:
+     *  value     = Value whose ownership is taken over.
+     *  allocator = Allocator used to destroy the $(D_PARAM value) and to
+     *              allocate/deallocate internal storage.
+     *
+     * Precondition: $(D_INLINECODE allocator !is null)
+     */
+    this()(auto ref Payload!T value,
+           shared Allocator allocator = defaultAllocator)
+    {
+        this(allocator);
 
-		assert(rc.count == 1);
-	}
-	assert(destroyed == 1);
+        move(value, this.payload);
+        static if (__traits(isRef, value))
+        {
+            value = null;
+        }
+    }
 
-	RefCounted!int rc;
-	assert(rc.count == 0);
-	rc = defaultAllocator.make!int(8);
-	assert(rc.count == 1);
+    /// Ditto.
+    this(shared Allocator allocator)
+    in
+    {
+        assert(allocator !is null);
+    }
+    body
+    {
+        this.allocator_ = allocator;
+    }
+
+    /**
+     * $(D_PSYMBOL Scoped) is noncopyable.
+     */
+    @disable this(this);
+
+    /**
+     * Destroys the owned object.
+     */
+    ~this()
+    {
+        if (this.payload !is null)
+        {
+            allocator.dispose(this.payload);
+        }
+    }
+
+    /**
+     * Initialized this $(D_PARAM Scoped) and takes ownership over
+     * $(D_PARAM rhs).
+     *
+     * To reset $(D_PSYMBOL Scoped) assign $(D_KEYWORD null).
+     *
+     * If the allocator wasn't set before, $(D_PSYMBOL defaultAllocator) will
+     * be used. If you need a different allocator, create a new
+     * $(D_PSYMBOL Scoped) and assign it.
+     *
+     * Params:
+     *  rhs = New object.
+     *
+     * Returns: $(D_KEYWORD this).
+     */
+    ref typeof(this) opAssign()(auto ref Payload!T rhs)
+    {
+        allocator.dispose(this.payload);
+        move(rhs, this.payload);
+
+        return this;
+    }
+
+    /// Ditto.
+    ref typeof(this) opAssign(typeof(null))
+    {
+        allocator.dispose(this.payload);
+        return this;
+    }
+
+    /// Ditto.
+    ref typeof(this) opAssign(typeof(this) rhs)
+    {
+        swap(this.allocator_, rhs.allocator_);
+        swap(this.payload, rhs.payload);
+
+        return this;
+    }
+
+    /**
+     * Returns: Reference to the owned object.
+     */
+    Payload!T get() pure nothrow @safe @nogc
+    {
+        return payload;
+    }
+
+    version (D_Ddoc)
+    {
+        /**
+         * Params:
+         *  op = Operation. 
+         *
+         * Dereferences the pointer. It is defined only for pointers, not for
+         * reference types like classes, that can be accessed directly.
+         *
+         * Returns: Reference to the pointed value.
+         */
+        ref T opUnary(string op)()
+            if (op == "*");
+    }
+    else static if (isPointer!(Payload!T))
+    {
+        ref T opUnary(string op)()
+            if (op == "*")
+        {
+            return *payload;
+        }
+    }
+
+    mixin DefaultAllocator;
+    alias get this;
 }
 
-private unittest
+///
+@nogc unittest
 {
-	static assert(is(typeof(RefCounted!int.storage.payload) == int*));
-	static assert(is(typeof(RefCounted!A.storage.payload) == A));
+    auto p = defaultAllocator.make!int(5);
+    auto s = Scoped!int(p, defaultAllocator);
+    assert(p is null);
+    assert(*s == 5);
+}
 
-	static assert(is(RefCounted!B));
-	static assert(is(RefCounted!A));
+///
+@nogc unittest
+{
+    static bool destroyed = false;
+
+    struct F
+    {
+        ~this() @nogc
+        {
+            destroyed = true;
+        }
+    }
+    {
+        auto s = Scoped!F(defaultAllocator.make!F(), defaultAllocator);
+    }
+    assert(destroyed);
 }
 
 /**
  * Constructs a new object of type $(D_PARAM T) and wraps it in a
- * $(D_PSYMBOL RefCounted) using $(D_PARAM args) as the parameter list for
+ * $(D_PSYMBOL Scoped) using $(D_PARAM args) as the parameter list for
  * the constructor of $(D_PARAM T).
  *
- * This function is more efficient than the using of $(D_PSYMBOL RefCounted)
- * directly, since it allocates only ones (the internal storage and the
- * object).
- *
  * Params:
- * 	T    = Type of the constructed object.
- * 	A    = Types of the arguments to the constructor of $(D_PARAM T).
- * 	args = Constructor arguments of $(D_PARAM T).
+ *  T         = Type of the constructed object.
+ *  A         = Types of the arguments to the constructor of $(D_PARAM T).
+ *  allocator = Allocator.
+ *  args      = Constructor arguments of $(D_PARAM T).
  * 
- * Returns: Newly created $(D_PSYMBOL RefCounted!T).
+ * Returns: Newly created $(D_PSYMBOL Scoped!T).
+ *
+ * Precondition: $(D_INLINECODE allocator !is null)
  */
-RefCounted!T refCounted(T, A...)(shared Allocator allocator, auto ref A args)
-	if (!is(T == interface) && !isAbstractClass!T
-         && !isArray!T && !isAssociativeArray!T)
+Scoped!T scoped(T, A...)(shared Allocator allocator, auto ref A args)
+    if (!is(T == interface) && !isAbstractClass!T
+     && !isAssociativeArray!T && !isArray!T)
+in
 {
-	auto rc = typeof(return)(allocator);
-
-	immutable storageSize = alignedSize(stateSize!(RefCounted!T.Storage));
-	immutable size = alignedSize(stateSize!T + storageSize);
-
-	auto mem = (() @trusted => allocator.allocate(size))();
-	if (mem is null)
-	{
-		onOutOfMemoryError();
-	}
-	scope (failure)
-	{
-		() @trusted { allocator.deallocate(mem); }();
-	}
-	rc.storage = emplace!(RefCounted!T.Storage)(mem[0 .. storageSize]);
-
-	static if (is(T == class))
-	{
-		rc.storage.payload = emplace!T(mem[storageSize .. $], args);
-	}
-	else
-	{
-		auto ptr = (() @trusted => (cast(T*) mem[storageSize .. $].ptr))();
-		rc.storage.payload = emplace!T(ptr, args);
-	}
-	return rc;
+    assert(allocator !is null);
+}
+body
+{
+    auto payload = allocator.make!(T, shared Allocator, A)(args);
+    return Scoped!T(payload, allocator);
 }
 
-///
-unittest
+/**
+ * Constructs a new array with $(D_PARAM size) elements and wraps it in a
+ * $(D_PSYMBOL Scoped).
+ *
+ * Params:
+ *  T         = Array type.
+ *  size      = Array size.
+ *  allocator = Allocator.
+ *
+ * Returns: Newly created $(D_PSYMBOL Scoped!T).
+ *
+ * Precondition: $(D_INLINECODE allocator !is null
+ *                           && size <= size_t.max / ElementType!T.sizeof)
+ */
+Scoped!T scoped(T)(shared Allocator allocator, const size_t size)
+@trusted
+    if (isArray!T)
+in
 {
-	auto rc = defaultAllocator.refCounted!int(5);
-	assert(rc.count == 1);
+    assert(allocator !is null);
+    assert(size <= size_t.max / ElementType!T.sizeof);
+}
+body
+{
+    auto payload = allocator.resize!(ElementType!T)(null, size);
+    return Scoped!T(payload, allocator);
+}
 
-	void func(RefCounted!int param)
-	{
-		if (param.count == 2)
-		{
-			func(param);
-		}
-		else
-		{
-			assert(param.count == 3);
-		}
-	}
-	func(rc);
+private unittest
+{
+    static assert(is(typeof(defaultAllocator.scoped!B(5))));
+    static assert(is(typeof(defaultAllocator.scoped!(int[])(5))));
+}
 
-	assert(rc.count == 1);
+private unittest
+{
+    auto s = defaultAllocator.scoped!int(5);
+    assert(*s == 5);
+
+    s = null;
+    assert(s is null);
+}
+
+private unittest
+{
+    auto s = defaultAllocator.scoped!int(5);
+    assert(*s == 5);
+
+    s = defaultAllocator.scoped!int(4);
+    assert(*s == 4);
 }
 
 private @nogc unittest
 {
-	struct E
-	{
-	}
-	auto b = defaultAllocator.refCounted!B(15);
-	static assert(is(typeof(b.storage.payload) == B*));
-	static assert(is(typeof(b.prop) == int));
-	static assert(!is(typeof(defaultAllocator.refCounted!B())));
+    auto p1 = defaultAllocator.make!int(5);
+    auto p2 = p1;
+    auto rc = Scoped!int(p1, defaultAllocator);
 
-	static assert(is(typeof(defaultAllocator.refCounted!E())));
-	static assert(!is(typeof(defaultAllocator.refCounted!E(5))));
-	{
-		auto rc = defaultAllocator.refCounted!B(3);
-		assert(rc.get.prop == 3);
-	}
-	{
-		auto rc = defaultAllocator.refCounted!E();
-		assert(rc.count);
-	}
+    assert(p1 is null);
+    assert(rc.get() is p2);
+}
+
+private @nogc unittest
+{
+    auto rc = Scoped!int(defaultAllocator);
+    assert(rc.allocator is defaultAllocator);
 }

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/net/inet.d

@@ -0,0 +1,356 @@
+/* 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/. */
+
+/**
+ * Internet utilities.
+ *
+ * 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.net.inet;
+
+import std.math;
+import std.range.primitives;
+import std.traits;
+
+version (unittest)
+{
+    version (Windows)
+    {
+        import core.sys.windows.winsock2;
+        version = PlattformUnittest;
+    }
+    else version (Posix)
+    {
+        import core.sys.posix.arpa.inet;
+        version = PlattformUnittest;
+    }
+}
+
+/**
+ * Represents an unsigned integer as an $(D_KEYWORD ubyte) range.
+ *
+ * The range is bidirectional. The byte order is always big-endian.
+ *
+ * It can accept any unsigned integral type but the value should fit
+ * in $(D_PARAM L) bytes.
+ *
+ * Params:
+ *  L = Desired range length.
+ */
+struct NetworkOrder(uint L)
+    if (L > ubyte.sizeof && L <= ulong.sizeof)
+{
+    static if (L > uint.sizeof)
+    {
+        private alias StorageType = ulong;
+    }
+    else static if (L > ushort.sizeof)
+    {
+        private alias StorageType = uint;
+    }
+    else static if (L > ubyte.sizeof)
+    {
+        private alias StorageType = ushort;
+    }
+    else
+    {
+        private alias StorageType = ubyte;
+    }
+
+    private StorageType value;
+    private size_t size = L;
+
+    const pure nothrow @safe @nogc invariant
+    {
+        assert(this.size <= L);
+    }
+
+    /**
+     * Constructs a new range.
+     *
+     * $(D_PARAM T) can be any unsigned type but $(D_PARAM value) cannot be
+     * larger than the maximum can be stored in $(D_PARAM L) bytes. Otherwise
+     * an assertion failure will be caused.
+     *
+     * Params:
+     *  T      = Value type.
+     *  value  = The value should be represented by this range.
+     *
+     * Precondition: $(D_INLINECODE value <= 2 ^^ (length * 8) - 1).
+     */
+    this(T)(const T value)
+        if (isUnsigned!T)
+    in
+    {
+        assert(value <= pow(2, L * 8) - 1);
+    }
+    body
+    {
+        this.value = value & StorageType.max;
+    }
+
+    /**
+     * Returns: LSB.
+     *
+     * Precondition: $(D_INLINECODE length > 0).
+     */
+    @property ubyte back() const
+    in
+    {
+        assert(this.length > 0);
+    }
+    body
+    {
+        return this.value & 0xff;
+    }
+
+    /**
+     * Returns: MSB.
+     *
+     * Precondition: $(D_INLINECODE length > 0).
+     */
+    @property ubyte front() const
+    in
+    {
+        assert(this.length > 0);
+    }
+    body
+    {
+        return (this.value >> ((this.length - 1) * 8)) & 0xff;
+    }
+
+    /**
+     * Eliminates the LSB.
+     *
+     * Precondition: $(D_INLINECODE length > 0).
+     */
+    void popBack()
+    in
+    {
+        assert(this.length > 0);
+    }
+    body
+    {
+        this.value >>= 8;
+        --this.size;
+    }
+
+    /**
+     * Eliminates the MSB.
+     *
+     * Precondition: $(D_INLINECODE length > 0).
+     */
+    void popFront()
+    in
+    {
+        assert(this.length > 0);
+    }
+    body
+    {
+        this.value &= StorageType.max >> ((StorageType.sizeof - this.length) * 8);
+        --this.size;
+    }
+
+    /**
+     * Returns: Copy of this range.
+     */
+    typeof(this) save() const
+    {
+        return this;
+    }
+
+    /**
+     * Returns: Whether the range is empty.
+     */
+    @property bool empty() const
+    {
+        return this.length == 0;
+    }
+
+    /**
+     * Returns: Byte length.
+     */
+    @property size_t length() const
+    {
+        return this.size;
+    }
+}
+
+///
+pure nothrow @safe @nogc unittest
+{
+    auto networkOrder = NetworkOrder!3(0xae34e2u);
+    assert(!networkOrder.empty);
+    assert(networkOrder.front == 0xae);
+
+    networkOrder.popFront();
+    assert(networkOrder.length == 2);
+    assert(networkOrder.front == 0x34);
+    assert(networkOrder.back == 0xe2);
+
+    networkOrder.popBack();
+    assert(networkOrder.length == 1);
+    assert(networkOrder.front == 0x34);
+    assert(networkOrder.front == 0x34);
+
+    networkOrder.popFront();
+    assert(networkOrder.empty);
+}
+
+// Static.
+private unittest
+{
+    static assert(isBidirectionalRange!(NetworkOrder!4));
+    static assert(isBidirectionalRange!(NetworkOrder!8));
+    static assert(!is(NetworkOrder!9));
+    static assert(!is(NetworkOrder!1));
+}
+
+// Tests against the system's htonl, htons.
+version (PlattformUnittest)
+{
+    private unittest
+    {
+        for (uint counter; counter <= 8 * uint.sizeof; ++counter)
+        {
+            const value = pow(2, counter) - 1;
+            const inNetworkOrder = htonl(value);
+            const p = cast(ubyte*) &inNetworkOrder;
+            auto networkOrder = NetworkOrder!4(value);
+
+            assert(networkOrder.length == 4);
+            assert(!networkOrder.empty);
+            assert(networkOrder.front == *p);
+            assert(networkOrder.back == *(p + 3));
+
+            networkOrder.popBack();
+            assert(networkOrder.length == 3);
+            assert(networkOrder.front == *p);
+            assert(networkOrder.back == *(p + 2));
+
+            networkOrder.popFront();
+            assert(networkOrder.length == 2);
+            assert(networkOrder.front == *(p + 1));
+            assert(networkOrder.back == *(p + 2));
+
+            networkOrder.popFront();
+            assert(networkOrder.length == 1);
+            assert(networkOrder.front == *(p + 2));
+            assert(networkOrder.back == *(p + 2));
+
+            networkOrder.popBack();
+            assert(networkOrder.length == 0);
+            assert(networkOrder.empty);
+        }
+
+        for (ushort counter; counter <= 8 * ushort.sizeof; ++counter)
+        {
+            const value = cast(ushort) (pow(2, counter) - 1);
+            const inNetworkOrder = htons(value);
+            const p = cast(ubyte*) &inNetworkOrder;
+
+            auto networkOrder = NetworkOrder!2(value);
+
+            assert(networkOrder.length == 2);
+            assert(!networkOrder.empty);
+            assert(networkOrder.front == *p);
+            assert(networkOrder.back == *(p + 1));
+
+            networkOrder.popBack();
+            assert(networkOrder.length == 1);
+            assert(networkOrder.front == *p);
+            assert(networkOrder.back == *p);
+
+            networkOrder.popBack();
+            assert(networkOrder.length == 0);
+            assert(networkOrder.empty);
+
+            networkOrder = NetworkOrder!2(value);
+
+            networkOrder.popFront();
+            assert(networkOrder.length == 1);
+            assert(networkOrder.front == *(p + 1));
+            assert(networkOrder.back == *(p + 1));
+
+            networkOrder.popFront();
+            assert(networkOrder.length == 0);
+            assert(networkOrder.empty);
+        }
+    }
+}
+
+/**
+ * Converts the $(D_KEYWORD ubyte) input range $(D_PARAM range) to
+ * $(D_PARAM T).
+ *
+ * The byte order of $(D_PARAM r) is assumed to be big-endian. The length
+ * cannot be larger than $(D_INLINECODE T.sizeof). Otherwise an assertion
+ * failure will be caused.
+ *
+ * Params:
+ *  T     = Desired return type.
+ *  R     = Range type.
+ *  range = Input range.
+ *
+ * Returns: Integral representation of $(D_PARAM range) with the host byte
+ *          order.
+ */
+T toHostOrder(T = size_t, R)(R range)
+    if (isInputRange!R
+     && !isInfinite!R
+     && is(Unqual!(ElementType!R) == ubyte)
+     && isUnsigned!T)
+{
+    T ret;
+    ushort pos = T.sizeof * 8;
+
+    for (; !range.empty && range.front == 0; pos -= 8, range.popFront())
+    {
+    }
+    for (; !range.empty; range.popFront())
+    {
+        assert(pos != 0);
+        pos -= 8;
+        ret |= (cast(T) range.front) << pos;
+    }
+
+    return ret >> pos;
+}
+
+///
+pure nothrow @safe @nogc unittest
+{
+    const value = 0xae34e2u;
+    auto networkOrder = NetworkOrder!4(value);
+    assert(networkOrder.toHostOrder() == value);
+}
+
+// Tests against the system's htonl, htons.
+version (PlattformUnittest)
+{
+    private unittest
+    {
+        for (uint counter; counter <= 8 * uint.sizeof; ++counter)
+        {
+            const value = pow(2, counter) - 1;
+            const inNetworkOrder = htonl(value);
+            const p = cast(ubyte*) &inNetworkOrder;
+            auto networkOrder = NetworkOrder!4(value);
+
+            assert(p[0 .. uint.sizeof].toHostOrder() == value);
+        }
+        for (ushort counter; counter <= 8 * ushort.sizeof; ++counter)
+        {
+            const value = cast(ushort) (pow(2, counter) - 1);
+            const inNetworkOrder = htons(value);
+            const p = cast(ubyte*) &inNetworkOrder;
+            auto networkOrder = NetworkOrder!2(value);
+
+            assert(p[0 .. ushort.sizeof].toHostOrder() == value);
+        }
+    }
+}

source/tanya/net/package.d

@@ -3,13 +3,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Metaprogramming.
+ * Network programming.
  *
- * Copyright: Eugene Wissner 2016.
+ * 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.meta;
+module tanya.net;
 
-public import tanya.meta.gen;
+public import tanya.net.inet;
+public import tanya.net.uri;

source/tanya/net/uri.d

@@ -0,0 +1,580 @@
+/* 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/. */
+
+/**
+ * URL parser.
+ *
+ * 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.net.uri;
+
+import std.ascii : isAlphaNum, isDigit;
+import std.traits : isSomeString;
+import std.uni : isAlpha, isNumber;
+import tanya.memory;
+
+/**
+ * Thrown if an invalid URI was specified.
+ */
+final class URIException : Exception
+{
+    /**
+     * Params:
+     *  msg  = The message for the exception.
+     *  file = The file where the exception occurred.
+     *  line = The line number where the exception occurred.
+     *  next = The previous exception in the chain of exceptions, if any.
+     */
+    this(string msg,
+         string file = __FILE__,
+         size_t line = __LINE__,
+         Throwable next = null) @nogc @safe pure nothrow
+    {
+        super(msg, file, line, next);
+    }
+}
+
+/**
+ * A Unique Resource Locator.
+ */
+struct URL
+{
+    /// The URL scheme.
+    const(char)[] scheme;
+
+    /// The username.
+    const(char)[] user;
+
+    /// The password.
+    const(char)[] pass;
+
+    /// The hostname.
+    const(char)[] host;
+
+    /// The port number.
+    ushort port;
+
+    /// The path.
+    const(char)[] path;
+
+    /// The query string.
+    const(char)[] query;
+
+    /// The anchor.
+    const(char)[] fragment;
+
+    /**
+     * Attempts to parse an URL from a string.
+     * Output string data (scheme, user, etc.) are just slices of input string
+     * (e.g., no memory allocation and copying).
+     *
+     * Params:
+     *  source = The string containing the URL.
+     *
+     * Throws: $(D_PSYMBOL URIException) if the URL is malformed.
+     */
+    this(const char[] source) @nogc
+    {
+        auto value = source;
+        ptrdiff_t pos = -1, endPos = value.length, start;
+
+        foreach (i, ref c; source)
+        {
+            if (pos == -1 && c == ':')
+            {
+                pos = i;
+            }
+            if (endPos == value.length && (c == '?' || c == '#'))
+            {
+                endPos = i;
+            }
+        }
+
+        // Check if the colon is a part of the scheme or the port and parse
+        // the appropriate part
+        if (value.length > 1 && value[0] == '/' && value[1] == '/')
+        {
+            // Relative scheme
+            start = 2;
+        }
+        else if (pos > 0)
+        {
+            // Validate scheme
+            // [ toLower(alpha) | digit | "+" | "-" | "." ]
+            foreach (ref c; value[0 .. pos])
+            {
+                if (!c.isAlphaNum && c != '+' && c != '-' && c != '.')
+                {
+                    if (endPos > pos)
+                    {
+                        if (!parsePort(value[pos .. $]))
+                        {
+                            throw make!URIException(defaultAllocator,
+                                                    "Failed to parse port");
+                        }
+                    }
+                    goto ParsePath;
+                }
+            }
+
+            if (value.length == pos + 1) // only scheme is available
+            {
+                this.scheme = value[0 .. $ - 1];
+                return;
+            }
+            else if (value.length > pos + 1 && value[pos + 1] == '/')
+            {
+                this.scheme = value[0 .. pos];
+
+                if (value.length > pos + 2 && value[pos + 2] == '/')
+                {
+                    start = pos + 3;
+                    if (this.scheme == "file"
+                     && value.length > start
+                     && value[start] == '/')
+                    {
+                        // Windows drive letters
+                        if (value.length - start > 2 && value[start + 2] == ':')
+                        {
+                            ++start;
+                        }
+                        goto ParsePath;
+                    }
+                }
+                else
+                {
+                    start = pos + 1;
+                    goto ParsePath;
+                }
+            }
+            else // certain schemas like mailto: and zlib: may not have any / after them
+            {
+                
+                if (!parsePort(value[pos .. $]))
+                {
+                    this.scheme = value[0 .. pos];
+                    start = pos + 1;
+                    goto ParsePath;
+                }
+            }
+        }
+        else if (pos == 0 && parsePort(value[pos .. $]))
+        {
+            // An URL shouldn't begin with a port number
+            throw defaultAllocator.make!URIException("URL begins with port");
+        }
+        else
+        {
+            goto ParsePath;
+        }
+
+        // Parse host
+        pos = -1;
+        for (ptrdiff_t i = start; i < value.length; ++i)
+        {
+            if (value[i] == '@')
+            {
+                pos = i;
+            }
+            else if (value[i] == '/')
+            {
+                endPos = i;
+                break;
+            }
+        }
+
+        // Check for login and password
+        if (pos != -1)
+        {
+            // *( unreserved / pct-encoded / sub-delims / ":" )
+            foreach (i, c; value[start .. pos])
+            {
+                if (c == ':')
+                {
+                    if (this.user is null)
+                    {
+                        this.user = value[start .. start + i];
+                        this.pass = value[start + i + 1 .. pos]; 
+                    }
+                }
+                else if (!c.isAlpha &&
+                         !c.isNumber &&
+                         c != '!' &&
+                         c != ';' &&
+                         c != '=' &&
+                         c != '_' &&
+                         c != '~' &&
+                         !(c >= '$' && c <= '.'))
+                {
+                    this.scheme = this.user = this.pass = null;
+                    throw make!URIException(defaultAllocator,
+                                            "Restricted characters in user information");
+                }
+            }
+            if (this.user is null)
+            {
+                this.user = value[start .. pos];
+            }
+
+            start = ++pos;
+        }
+
+        pos = endPos;
+        if (endPos <= 1 || value[start] != '[' || value[endPos - 1] != ']')
+        {
+            // Short circuit portscan
+            // IPv6 embedded address
+            for (ptrdiff_t i = endPos - 1; i >= start; --i)
+            {
+                if (value[i] == ':')
+                {
+                    pos = i;
+                    if  (this.port == 0 && !parsePort(value[i .. endPos]))
+                    {
+                        this.scheme = this.user = this.pass = null;
+                        throw defaultAllocator.make!URIException("Invalid port");
+                    }
+                    break;
+                }
+            }
+        }
+
+        // Check if we have a valid host, if we don't reject the string as url
+        if (pos <= start)
+        {
+            this.scheme = this.user = this.pass = null;
+            throw defaultAllocator.make!URIException("Invalid host");
+        }
+
+        this.host = value[start .. pos];
+
+        if (endPos == value.length)
+        {
+            return;
+        }
+
+        start = endPos;
+
+    ParsePath:
+        endPos = value.length;
+        pos = -1;
+        foreach (i, ref c; value[start .. $])
+        {
+            if (c == '?' && pos == -1)
+            {
+                pos = start + i;
+            }
+            else if (c == '#')
+            {
+                endPos = start + i;
+                break;
+            }
+        }
+        if (pos == -1)
+        {
+            pos = endPos;
+        }
+
+        if (pos > start)
+        {
+            this.path = value[start .. pos];
+        }
+        if (endPos >= ++pos)
+        {
+            this.query = value[pos .. endPos];
+        }
+        if (++endPos <= value.length)
+        {
+            this.fragment = value[endPos .. $];
+        }
+    }
+
+    /*
+     * Attempts to parse and set the port.
+     *
+     * Params:
+     *  port = String beginning with a colon followed by the port number and
+     *         an optional path (query string and/or fragment), like:
+     *         `:12345/some_path` or `:12345`.
+     *
+     * Returns: Whether the port could be found.
+     */
+    private bool parsePort(const char[] port) pure nothrow @safe @nogc
+    {
+        ptrdiff_t i = 1;
+        float lPort = 0;
+
+        for (; i < port.length && port[i].isDigit() && i <= 6; ++i)
+        {
+            lPort += (port[i] - '0') / cast(float)(10 ^^ (i - 1));
+        }
+        if (i == 1 && (i == port.length || port[i] == '/'))
+        {
+            return true;
+        }
+        else if (i == port.length || port[i] == '/')
+        {
+            lPort *= 10 ^^ (i - 2);
+            if (lPort > ushort.max)
+            {
+                return false;
+            }
+            this.port = cast(ushort) lPort;
+            return true;
+        }
+        return false;
+    }
+}
+
+///
+@nogc unittest
+{
+    auto u = URL("example.org");
+    assert(u.path == "example.org"); 
+
+    u = URL("relative/path");
+    assert(u.path == "relative/path"); 
+
+    // Host and scheme
+    u = URL("https://example.org");
+    assert(u.scheme == "https");
+    assert(u.host == "example.org");
+    assert(u.path is null);
+    assert(u.port == 0);
+    assert(u.fragment is null);
+
+    // With user and port and path
+    u = URL("https://hilary:putnam@example.org:443/foo/bar");
+    assert(u.scheme == "https");
+    assert(u.host == "example.org");
+    assert(u.path == "/foo/bar");
+    assert(u.port == 443);
+    assert(u.user == "hilary");
+    assert(u.pass == "putnam");
+    assert(u.fragment is null);
+
+    // With query string
+    u = URL("https://example.org/?login=true");
+    assert(u.scheme == "https");
+    assert(u.host == "example.org");
+    assert(u.path == "/");
+    assert(u.query == "login=true");
+    assert(u.fragment is null);
+
+    // With query string and fragment
+    u = URL("https://example.org/?login=false#label");
+    assert(u.scheme == "https");
+    assert(u.host == "example.org");
+    assert(u.path == "/");
+    assert(u.query == "login=false");
+    assert(u.fragment == "label");
+
+    u = URL("redis://root:password@localhost:2201/path?query=value#fragment");
+    assert(u.scheme == "redis");
+    assert(u.user == "root");
+    assert(u.pass == "password");
+    assert(u.host == "localhost");
+    assert(u.port == 2201);
+    assert(u.path == "/path");
+    assert(u.query == "query=value");
+    assert(u.fragment == "fragment");
+}
+
+private unittest
+{
+    auto u = URL("127.0.0.1");
+    assert(u.path == "127.0.0.1");
+
+    u = URL("http://127.0.0.1");
+    assert(u.scheme == "http");
+    assert(u.host == "127.0.0.1");
+
+    u = URL("http://127.0.0.1:9000");
+    assert(u.scheme == "http");
+    assert(u.host == "127.0.0.1");
+    assert(u.port == 9000);
+
+    u = URL("//example.net");
+    assert(u.host == "example.net");
+    assert(u.scheme is null);
+
+    u = URL("//example.net?q=before:after");
+    assert(u.host == "example.net");
+    assert(u.query == "q=before:after");
+
+    u = URL("localhost:8080");
+    assert(u.host == "localhost");
+    assert(u.port == 8080);
+
+    u = URL("ftp:");
+    assert(u.scheme == "ftp");
+
+    u = URL("file:///C:\\Users");
+    assert(u.scheme == "file");
+    assert(u.path == "C:\\Users");
+
+    u = URL("localhost:66000");
+    assert(u.scheme == "localhost");
+    assert(u.path == "66000");
+
+    u = URL("file:///home/");
+    assert(u.scheme == "file");
+    assert(u.path == "/home/");
+
+    u = URL("file:///home/?q=asdf");
+    assert(u.scheme == "file");
+    assert(u.path == "/home/");
+    assert(u.query == "q=asdf");
+
+    u = URL("http://secret@example.org");
+    assert(u.scheme == "http");
+    assert(u.host == "example.org");
+    assert(u.user == "secret");
+
+    u = URL("h_tp://:80");
+    assert(u.path == "h_tp://:80");
+    assert(u.port == 0);
+
+    u = URL("zlib:/home/user/file.gz");
+    assert(u.scheme == "zlib");
+    assert(u.path == "/home/user/file.gz");
+}
+
+private @nogc unittest
+{
+    URIException exception;
+    try
+    {
+        auto u = URL("h_tp:asdf");
+    }
+    catch (URIException e)
+    {
+        exception = e;
+    }
+    assert(exception !is null);
+    defaultAllocator.dispose(exception);
+}
+
+private @nogc unittest
+{
+    URIException exception;
+    try
+    {
+        auto u = URL("http://:80");
+    }
+    catch (URIException e)
+    {
+        exception = e;
+    }
+    assert(exception !is null);
+    defaultAllocator.dispose(exception);
+}
+
+private @nogc unittest
+{
+    URIException exception;
+    try
+    {
+        auto u = URL(":80");
+    }
+    catch (URIException e)
+    {
+        exception = e;
+    }
+    assert(exception !is null);
+    defaultAllocator.dispose(exception);
+}
+
+private @nogc unittest
+{
+    URIException exception;
+    try
+    {
+        auto u = URL("http://user1:pass1@user2:pass2@example.org");
+    }
+    catch (URIException e)
+    {
+        exception = e;
+    }
+    assert(exception !is null);
+    defaultAllocator.dispose(exception);
+}
+
+private @nogc unittest
+{
+    URIException exception;
+    try
+    {
+        auto u = URL("http://blah.com:port");
+    }
+    catch (URIException e)
+    {
+        exception = e;
+    }
+    assert(exception !is null);
+    defaultAllocator.dispose(exception);
+}
+
+private @nogc unittest
+{
+    URIException exception;
+    try
+    {
+        auto u = URL(":/");
+    }
+    catch (URIException e)
+    {
+        exception = e;
+    }
+    assert(exception !is null);
+    defaultAllocator.dispose(exception);
+}
+
+/**
+ * Attempts to parse an URL from a string and returns the specified component
+ * of the URL or $(D_PSYMBOL URL) if no component is specified.
+ *
+ * Params:
+ *  T      = "scheme", "host", "port", "user", "pass", "path", "query",
+ *           "fragment" or $(D_KEYWORD null) for a struct with all components.
+ *  source = The string containing the URL.
+ *
+ * Returns: Requested URL component.
+ */
+URL parseURL(const char[] source) @nogc
+{
+    return URL(source);
+}
+
+/// Ditto.
+auto parseURL(string T)(const char[] source)
+if (T == "scheme"
+ || T == "host"
+ || T == "user"
+ || T == "pass"
+ || T == "path"
+ || T == "query"
+ || T == "fragment"
+ || T == "port")
+{
+    auto ret = URL(source);
+    return mixin("ret." ~ T);
+}
+
+///
+@nogc unittest
+{
+    auto u = parseURL("http://example.org:5326");
+    assert(u.scheme == parseURL!"scheme"("http://example.org:5326"));
+    assert(u.host == parseURL!"host"("http://example.org:5326"));
+    assert(u.user == parseURL!"user"("http://example.org:5326"));
+    assert(u.pass == parseURL!"pass"("http://example.org:5326"));
+    assert(u.path == parseURL!"path"("http://example.org:5326"));
+    assert(u.query == parseURL!"query"("http://example.org:5326"));
+    assert(u.fragment == parseURL!"fragment"("http://example.org:5326"));
+    assert(u.port == parseURL!"port"("http://example.org:5326"));
+}

source/tanya/network/inet.d

@@ -0,0 +1,19 @@
+/* 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/. */
+
+/**
+ * Internet utilities.
+ *
+ * $(RED Deprecated. Use $(D_PSYMBOL tanya.net.inet) instead.
+ * This module will be removed in 0.8.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)
+ */
+deprecated("Use tanya.net.inet instead")
+module tanya.network.inet;
+
+public import tanya.net.inet;

source/tanya/network/package.d

@@ -0,0 +1,17 @@
+/* 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/. */
+
+/**
+ * Network programming.
+ *
+ * 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.network;
+
+public import tanya.network.inet;
+public import tanya.network.socket;
+public import tanya.network.url;

source/tanya/os/error.d

@@ -0,0 +1,337 @@
+/* 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/. */
+
+/**
+ * This module provides a portable way of using operating system error codes.
+ *
+ * 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.os.error;
+
+// Socket API error.
+private template SAError(int posix, int wsa = posix)
+{
+    version (Windows)
+    {
+        enum SAError = 10000 + wsa;
+    }
+    else
+    {
+        alias SAError = posix;
+    }
+}
+
+// Error for Windows and Posix separately.
+private template NativeError(int posix, int win)
+{
+    version (Windows)
+    {
+        alias NativeError = win;
+    }
+    else
+    {
+        alias NativeError = posix;
+    }
+}
+
+version (Windows)
+{
+    private enum eProtocolError = -71;
+}
+else version (OpenBSD)
+{
+    private enum eProtocolError = -71;
+}
+else
+{
+    private enum eProtocolError = 71;
+}
+
+/**
+ * System error code.
+ */
+struct ErrorCode
+{
+    /**
+     * Error code numbers.
+     */
+    enum ErrorNo : int
+    {
+        /// The operation completed successfully.
+        success                   = 0,
+
+        /// Operation not permitted.
+        noPermission              = NativeError!(1, 5),
+
+        /// Interrupted system call.
+        interrupted               = SAError!4,
+
+        /// Bad file descriptor.
+        badDescriptor             = SAError!9,
+
+        /// An operation on a non-blocking socket would block.
+        wouldBlock                = SAError!(11, 35),
+
+        /// Out of memory.
+        noMemory                  = NativeError!(12, 14),
+
+        /// Access denied.
+        accessDenied              = SAError!13,
+
+        /// An invalid pointer address detected.
+        fault                     = SAError!14,
+
+        /// No such device.
+        noSuchDevice              = NativeError!(19, 20),
+
+        /// An invalid argument was supplied.
+        invalidArgument           = SAError!22,
+
+        /// The limit on the number of open file descriptors.
+        tooManyDescriptors        = NativeError!(23, 331),
+
+        /// The limit on the number of open file descriptors.
+        noDescriptors             = SAError!24,
+
+        /// Broken pipe.
+        brokenPipe                = NativeError!(32, 109),
+
+        /// The name was too long.
+        nameTooLong               = SAError!(36, 63),
+
+        /// A socket operation was attempted on a non-socket.
+        notSocket                 = SAError!(88, 38),
+
+        /// Protocol error.
+        protocolError             = eProtocolError,
+
+        /// Message too long.
+        messageTooLong            = SAError!(90, 40),
+
+        /// Wrong protocol type for socket.
+        wrongProtocolType         = SAError!(91, 41),
+
+        /// Protocol not available.
+        noProtocolOption          = SAError!(92, 42),
+
+        /// The protocol is not implemented orR has not been configured.
+        protocolNotSupported      = SAError!(93, 43),
+
+        /// The support for the specified socket type does not exist in this
+        /// address family.
+        socketNotSupported        = SAError!(94, 44),
+
+        /// The address family is no supported by the protocol family.
+        operationNotSupported     = SAError!(95, 45),
+
+        /// Address family specified is not supported.
+        addressFamilyNotSupported = SAError!(97, 47),
+
+        /// Address already in use.
+        addressInUse              = SAError!(98, 48),
+
+        /// The network is not available.
+        networkDown               = SAError!(100, 50),
+
+        /// No route to host.
+        networkUnreachable        = SAError!(101, 51),
+
+        /// Network dropped connection because of reset.
+        networkReset              = SAError!(102, 52),
+
+        /// The connection has been aborted.
+        connectionAborted         = SAError!(103, 53),
+
+        /// Connection reset by peer.
+        connectionReset           = SAError!(104, 54),
+
+        /// No free buffer space is available for a socket operation.
+        noBufferSpace             = SAError!(105, 55),
+
+        /// Transport endpoint is already connected.
+        alreadyConnected          = SAError!(106, 56),
+
+        /// Transport endpoint is not connected.
+        notConnected              = SAError!(107, 57),
+
+        /// Cannot send after transport endpoint shutdown.
+        shutdown                  = SAError!(108, 58),
+
+        /// The connection attempt timed out, or the connected host has failed
+        /// to respond.
+        timedOut                  = SAError!(110, 60),
+
+        /// Connection refused.
+        connectionRefused         = SAError!(111, 61),
+
+        /// Host is down.
+        hostDown                  = SAError!(112, 64),
+
+        /// No route to host.
+        hostUnreachable           = SAError!(113, 65),
+
+        /// Operation already in progress.
+        alreadyStarted            = SAError!(114, 37),
+
+        /// Operation now in progress.
+        inProgress                = SAError!(115, 36),
+
+        /// Operation cancelled.
+        cancelled                 = SAError!(125, 103),
+    }
+
+    /**
+     * Constructor.
+     *
+     * Params:
+     *  value = Numeric error code.
+     */
+    this(const ErrorNo value) pure nothrow @safe @nogc
+    {
+        this.value_ = value;
+    }
+
+    ///
+    pure nothrow @safe @nogc unittest
+    {
+        ErrorCode ec;
+        assert(ec == ErrorCode.success);
+
+        ec = ErrorCode.fault;
+        assert(ec == ErrorCode.fault);
+    }
+
+    /**
+     * Resets this $(D_PSYMBOL ErrorCode) to default
+     * ($(D_PSYMBOL ErrorCode.success)).
+     */
+    void reset() pure nothrow @safe @nogc
+    {
+        this.value_ = ErrorNo.success;
+    }
+
+    ///
+    pure nothrow @safe @nogc unittest
+    {
+        auto ec = ErrorCode(ErrorCode.fault);
+        assert(ec == ErrorCode.fault);
+
+        ec.reset();
+        assert(ec == ErrorCode.success);
+    }
+
+    /**
+     * Returns: Numeric error code.
+     */
+    ErrorNo opCast(T : ErrorNo)() const
+    {
+        return this.value_;
+    }
+
+    /// Ditto.
+    ErrorNo opCast(T : int)() const
+    {
+        return this.value_;
+    }
+
+    ///
+    pure nothrow @safe @nogc unittest
+    {
+        ErrorCode ec = ErrorCode.fault;
+        auto errorNo = cast(ErrorCode.ErrorNo) ec;
+
+        assert(errorNo == ErrorCode.fault);
+        static assert(is(typeof(cast(int) ec)));
+    }
+
+    /**
+     * Assigns another error code or error code number.
+     *
+     * Params:
+     *  that = Numeric error code.
+     *
+     * Returns: $(D_KEYWORD this).
+     */
+    ref ErrorCode opAssign(const ErrorNo that) pure nothrow @safe @nogc
+    {
+        this.value_ = that;
+        return this;
+    }
+
+    /// Ditto.
+    ref ErrorCode opAssign()(auto ref const ErrorCode that)
+    pure nothrow @safe @nogc
+    {
+        this.value_ = that.value_;
+        return this;
+    }
+
+    ///
+    pure nothrow @safe @nogc unittest
+    {
+        {
+            ErrorCode ec;
+            assert(ec == ErrorCode.success);
+
+            ec = ErrorCode.fault;
+            assert(ec == ErrorCode.fault);
+        }
+        {
+            auto ec1 = ErrorCode(ErrorCode.fault);
+            ErrorCode ec2;
+            assert(ec2 == ErrorCode.success);
+
+            ec2 = ec1;
+            assert(ec1 == ec2);
+        }
+    }
+
+    /**
+     * Equality with another error code or error code number.
+     *
+     * Params:
+     *  that = Numeric error code.
+     *
+     * Returns: Whether $(D_KEYWORD this) and $(D_PARAM that) are equal.
+     */
+    bool opEquals(const ErrorNo that) const pure nothrow @safe @nogc
+    {
+        return this.value_ == that;
+    }
+
+    /// Ditto.
+    bool opEquals()(auto ref const ErrorCode that)
+    const pure nothrow @safe @nogc
+    {
+        return this.value_ == that.value_;
+    }
+
+    ///
+    pure nothrow @safe @nogc unittest
+    {
+        {
+            ErrorCode ec1 = ErrorCode.fault;
+            ErrorCode ec2 = ErrorCode.accessDenied;
+
+            assert(ec1 != ec2);
+            assert(ec1 != ErrorCode.accessDenied);
+            assert(ErrorCode.fault != ec2);
+        }
+        {
+            ErrorCode ec1 = ErrorCode.fault;
+            ErrorCode ec2 = ErrorCode.fault;
+
+            assert(ec1 == ec2);
+            assert(ec1 == ErrorCode.fault);
+            assert(ErrorCode.fault == ec2);
+        }
+    }
+
+    private ErrorNo value_ = ErrorNo.success;
+
+    alias ErrorNo this;
+}

source/tanya/os/package.d

@@ -0,0 +1,16 @@
+/* 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/. */
+
+/**
+ * This package provides platform-independent interfaces to operating system
+ * functionality.
+ *
+ * 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.os;
+
+public import tanya.os.error;

source/tanya/typecons.d

@@ -0,0 +1,107 @@
+/* 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/. */
+
+/**
+ * Type constructors.
+ *
+ * This module contains templates that allow to build new types from the
+ * available ones.
+ *
+ * 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.typecons;
+
+import std.meta;
+
+/**
+ * $(D_PSYMBOL Pair) can store two heterogeneous objects.
+ *
+ * The objects can by accessed by index as $(D_INLINECODE obj[0]) and
+ * $(D_INLINECODE obj[1]) or by optional names (e.g.
+ * $(D_INLINECODE obj.first)).
+ *
+ * $(D_PARAM Specs) contains a list of object types and names. First
+ * comes the object type, then an optional string containing the name.
+ * If you want the object be accessible only by its index (`0` or `1`),
+ * just skip the name.
+ *
+ * Params:
+ *  Specs = Field types and names.
+ */
+template Pair(Specs...)
+{
+    template parseSpecs(int fieldCount, Specs...)
+    {
+        static if (Specs.length == 0)
+        {
+            alias parseSpecs = AliasSeq!();
+        }
+        else static if (is(Specs[0]) && fieldCount < 2)
+        {
+            static if (is(typeof(Specs[1]) == string))
+            {
+                alias parseSpecs
+                    = AliasSeq!(Specs[0],
+                                parseSpecs!(fieldCount + 1, Specs[2 .. $]));
+            }
+            else
+            {
+                alias parseSpecs
+                    = AliasSeq!(Specs[0],
+                                parseSpecs!(fieldCount + 1, Specs[1 .. $]));
+            }
+        }
+        else
+        {
+            static assert(false, "Invalid argument: " ~ Specs[0].stringof);
+        }
+    }
+
+    struct Pair
+    {
+        /// Field types.
+        alias Types = parseSpecs!(0, Specs);
+
+        static assert(Types.length == 2, "Invalid argument count.");
+
+        // Create field aliases.
+        static if (is(typeof(Specs[1]) == string))
+        {
+            mixin("alias " ~ Specs[1] ~ " = expand[0];");
+        }
+        static if (is(typeof(Specs[2]) == string))
+        {
+            mixin("alias " ~ Specs[2] ~ " = expand[1];");
+        }
+        else static if (is(typeof(Specs[3]) == string))
+        {
+            mixin("alias " ~ Specs[3] ~ " = expand[1];");
+        }
+
+        /// Represents the values of the $(D_PSYMBOL Pair) as a list of values.
+        Types expand;
+
+        alias expand this;
+    }
+}
+
+///
+unittest
+{
+    static assert(is(Pair!(int, int)));
+    static assert(!is(Pair!(int, 5)));
+
+    static assert(is(Pair!(int, "first", int)));
+    static assert(is(Pair!(int, "first", int, "second")));
+    static assert(is(Pair!(int, "first", int)));
+
+    static assert(is(Pair!(int, int, "second")));
+    static assert(!is(Pair!("first", int, "second", int)));
+    static assert(!is(Pair!(int, int, int)));
+
+    static assert(!is(Pair!(int, "first")));
+}