range.primitive: Add missing rparen to the docs

... for ranges.

Also adds "put" for the output ranges.

Fix #34.

.gitignore

@@ -1,9 +1,12 @@
 # Binary
 *.[oa]
 *.exe
+*.lib
 
 # D
 .dub
+dub.selections.json
+
 __test__*__
 __test__*__.core
 /tanya-test-*

.travis.yml

@@ -7,9 +7,10 @@ os:
 language: d
 
 d:
-  - dmd-2.076.0
+  - dmd-2.079.0
-  - dmd-2.075.1
+  - dmd-2.078.3
-  - dmd-2.074.1
+  - dmd-2.077.1
+  - dmd-2.076.1
 
 env: 
   matrix:
@@ -22,7 +23,7 @@ addons:
       - gcc-multilib
 
 before_script:
-  - if [ "$PS1" = '(dmd-2.076.0)' ]; then
+  - if [ "$PS1" = '(dmd-2.079.0)' ]; then
       export UNITTEST="unittest-cov";
     fi
 

CONTRIBUTING.md

@@ -1,3 +1,4 @@
+
 # Contributing
 
 Tanya is a project in active development, therefore any help is appreciated. Thank you for considering contributing
@@ -7,9 +8,9 @@ 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
+* **Reporting a problem**: [Report](https://github.com/caraus-ecms/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
+* **Fixing issues**: [The bug tracker](https://github.com/caraus-ecms/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.
@@ -21,21 +22,14 @@ and implement this.
 
 ## Opening an issue
 
-If you have found a bug, an error, have some question, or suggestion, open in issue. I'll try to answer as soon
+If you have found a bug, an error, have some question, or suggestion,
-as I can. Tanya uses an external
+[Open an issue](https://github.com/caraus-ecms/tanya/issues). I'll try to answer as soon as I can. There is also a
-[bug tracker](https://issues.caraus.io/projects/tanya/issues). You should
+list of open issues that mirror the current development process and progress. If you're looking for a challenge, just
-[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 them. Such issues belong mostly to a larger part of the library that is
+You can also look at the [milestones](https://github.com/Dlackware/gnome/milestones) to see what is planned for a
-currently in development. The category specifies then the git branch development happens on. The remaining issues
+specific release.
-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).
 
 
 ## Contribution process
@@ -44,7 +38,7 @@ to be fixed till a specific release. Version numbers refer to the versions in th
 
 I accept GitHub pull requests. Creating a pull request is like sending a patch with the 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:
+with `git clone` and create a new branch where you want to work. For example:
 
 ```shell
 git checkout -b bugfix-x
@@ -61,32 +55,53 @@ described on GitHub to finish the process. See
 [Using Pull Requests](https://help.github.com/articles/about-pull-requests/) for more information.
 
 Please ensure that your 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
+on upstream/master before submitting the pull request. See [Syncing a fork](https://help.github.com/articles/syncing-a-fork/) for a
 step-by-step guide.
 
 ### Fixing a bug
 
-Add an unittest that demonstrates the bug along with a short description:
+Add a unit test that demonstrates the bug along with a short description or link to the original bug.
-
-```d
-// Issue ###: https://issues.caraus.io/issues/###.
-private unittest
-{
-}
-```
 
 ### Adding new features
 
 * Use Ddoc to document the feature.
-* Add some unittests that prevent new bugs and demonstrate how the feature is supposed to work.
+* Add some unit tests to prevent bugs.
+* [Documented D unit tests](https://dlang.org/spec/ddoc.html#using_ddoc_to_generate_examples) go into the documentation and can be used as an usage
+example. These tests should be readable and not complicated since they demonstrate how the feature is supposed to work.
+* More advanced tests should be put into a separate not documented unittest block.
+
+### Writing unit tests
+
+```d
+///
+unittest
+{
+    // A documented unit test has three slashes in front of it.
+}
+
+// Issue ##: https://github.com/caraus-ecms/tanya/issues/##.
+unittest
+{
+    // Not documented unit test may still have a description.
+}
+```
 
 ### Style guide
 
 Make sure your changes follow [The D Style](https://dlang.org/dstyle.html) (including
-[Additional Requirements for Phobos](https://dlang.org/dstyle.html#phobos).
+[Additional Requirements for Phobos](https://dlang.org/dstyle.html#phobos)).
 
+You can also use [dscanner](https://github.com/dlang-community/D-Scanner) to test the new code against the
+most guidlines. The root of this repository contains
+[dscanner.ini](https://github.com/caraus-ecms/tanya/blob/master/dscanner.ini), configuration file with settings for an
+automatic style check. Just go to the top-level directory and issue (this assumes `dscanner` is installed in your
+system):
+
+```shell
+dscanner --styleCheck source
+```
 
 ## Questions and suggestions
 
-* [Open an issue](https://issues.caraus.io/projects/tanya/issues)
+* [Open an issue](https://github.com/caraus-ecms/tanya/issues)
 * [Send an email](mailto:info@caraus.de)

README.md

@@ -12,10 +12,9 @@ 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
 Garbage Collector heap. Everything in the library is usable in @nogc code.
-Tanya extends Phobos functionality and provides alternative implementations for
+Tanya provides data structures and utilities to facilitate painless systems
-data structures and utilities that depend on the Garbage Collector in Phobos.
+programming in D.
 
-* [Bug tracker](https://issues.caraus.io/projects/tanya/issues)
 * [API Documentation](https://docs.caraus.io/tanya)
 * [Contribution guidelines](CONTRIBUTING.md)
 
@@ -24,11 +23,16 @@ data structures and utilities that depend on the Garbage Collector in Phobos.
 
 Tanya consists of the following packages and (top-level) modules:
 
+* `algorithm`: Collection of generic algorithms.
 * `async`: Event loop (epoll, kqueue and IOCP).
 * `container`: Queue, Array, Singly and doubly linked lists, Buffers, UTF-8
-string, Hash set.
+string, Hash table.
+* `conv`: This module provides functions for converting between different
+types.
 * `encoding`: This package provides tools to work with text encodings.
+* `exception`: Common exceptions and errors.
 * `format`: Formatting and conversion functions.
+* `hash`: Hash algorithms.
 * `math`: Arbitrary precision integer and a set of functions.
 * `memory`: Tools for manual memory management (allocators, smart pointers).
 * `meta`: Template metaprogramming. This package contains utilities to acquire
@@ -41,11 +45,15 @@ After finishing the new socket implementation will land in the `net` package and
 `network` will be deprecated.
 * `os`: Platform-independent interfaces to operating system functionality.
 * `range`: Generic functions and templates for D ranges.
+* `test`: Test suite for unittest-blocks.
 * `typecons`: Templates that allow to build new types based on the available
 ones.
 
 
-## Basic usage
+## NogcD
+
+To achieve programming without the Garbage Collection tanya uses a subset of D:
+NogcD.
 
 ### Allocators
 
@@ -109,7 +117,7 @@ catch (Exception e)
 }
 ```
 
-### Containers
+### Built-in array operations and 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
@@ -139,40 +147,75 @@ int i = arr[7]; // Access 8th element.
 There are more containers in the `tanya.container` package.
 
 
+### Immutability
+
+Immutability doesn't play nice with manual memory management since the
+allocated storage should be initialized (mutated) and then released (mutated).
+`immutable` is used only for non-local immutable declarations (that are
+evaluated at compile time), static immutable data, strings (`immutable(char)[]`,
+`immutable(wchar)[]` and `immutable(dchar)[]`).
+
+
+### Unsupported features
+
+The following features depend on GC and aren't supported:
+
+- `lazy` parameters (allocate a closure which is evaluated when then the
+parameter is used)
+
+- `synchronized` blocks
+
+
 ## Development
 
 ### Supported compilers
 
 | DMD     | GCC       |
-|:-------:|:--------------:|
+|:-------:|:---------:|
-| 2.076.0 | *gdc-5* branch |
+| 2.079.0 | *master*  |
-| 2.075.1 |                |
+| 2.078.3 |           |
-| 2.074.1 |                |
+| 2.077.1 |           |
+| 2.076.1 |           |
 
 ### Current status
 
 Following modules are under development:
 
 | 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) |
+| Hash table | 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)                                    |
 
 ### Release management
 
-3-week release cycle.
+Tanya is still under active development and it isn't possible to provide great
+backwards-compatibility at this stage. This won't change until 1.0.0. Almost
+every release contains new features or API changes alongside bug fixes. Thus:
 
-Deprecated features are removed after one release (in approximately 6 weeks after deprecating).
+- Patch releases add new functionality and bug fixes in a backwards-compatible
+manner
+
+- Minor releases contain API breakages
+
+- Major release number is always the same: `0.x.x`
+
+Deprecated functionality is where possible marked as such before getting
+removed. It is left in the library for one release: If 0.8.1 deprecates some
+feature, it is removed in the next release: 0.9.0.
 
 ## Further characteristics
 
-* Tanya is a native D library without any external dependencies.
+- Tanya is a native D library
 
-* Tanya is cross-platform. The development happens on a 64-bit Linux, but it
+- Tanya is cross-platform. The development happens on a 64-bit Linux, but it
-is being tested on Windows and FreeBSD as well.
+is being tested on Windows and FreeBSD as well
 
-* The library isn't thread-safe yet.
+- Tanya favours generic algorithms therefore there is no auto-decoding. Char
+arrays are handled as any other array type
+
+- The library isn't thread-safe yet
+
+- Complex numbers (`cfloat`, `cdouble`, `creal`, `ifloat`, `idouble`, `ireal`)
+aren't supported
 
 
 ## Feedback

appveyor.yml

@@ -4,22 +4,28 @@ os: Visual Studio 2015
 environment:
   matrix:
     - DC: dmd
-      DVersion: 2.076.0
+      DVersion: 2.079.0
       arch: x64
     - DC: dmd
-      DVersion: 2.076.0
+      DVersion: 2.079.0
       arch: x86
     - DC: dmd
-      DVersion: 2.075.1
+      DVersion: 2.078.3
       arch: x64
     - DC: dmd
-      DVersion: 2.075.1
+      DVersion: 2.078.3
       arch: x86
     - DC: dmd
-      DVersion: 2.074.1
+      DVersion: 2.077.1
       arch: x64
     - DC: dmd
-      DVersion: 2.074.1
+      DVersion: 2.077.1
+      arch: x86
+    - DC: dmd
+      DVersion: 2.076.1
+      arch: x64
+    - DC: dmd
+      DVersion: 2.076.1
       arch: x86
 
 skip_tags: true

arch/build.ninja

@@ -5,9 +5,10 @@ rule archive
   command = ar rcs $out $in
 
 build abs.o: gas x64/linux/math/abs.S
+build log.o: gas x64/linux/math/log.S
 build cmp.o: gas x64/linux/memory/cmp.S
 build fill.o: gas x64/linux/memory/fill.S
 build copy.o: gas x64/linux/memory/copy.S
 build syscall.o: gas x64/linux/syscall.S
 
-build tanya.a: archive syscall.o copy.o fill.o cmp.o abs.o
+build tanya.a: archive syscall.o copy.o fill.o cmp.o log.o abs.o

arch/x64/linux/math/log.S

@@ -0,0 +1,48 @@
+	.text
+
+
+// logl.
+	.globl _D5tanya4math8nbtheory9__T2lnTeZ2lnFNaNbNiNfeZe
+	.type _D5tanya4math8nbtheory9__T2lnTeZ2lnFNaNbNiNfeZe, @function
+
+_D5tanya4math8nbtheory9__T2lnTeZ2lnFNaNbNiNfeZe:
+	fldln2 // Put lb(e) onto the FPU stack
+	fldt 8(%rsp) // Put the argument onto the FPU stack
+	fyl2x // %st1 * lb(%st0)
+	ret
+
+
+// log.
+	.globl _D5tanya4math8nbtheory9__T2lnTdZ2lnFNaNbNiNfdZd
+	.type _D5tanya4math8nbtheory9__T2lnTdZ2lnFNaNbNiNfdZd, @function
+
+_D5tanya4math8nbtheory9__T2lnTdZ2lnFNaNbNiNfdZd:
+	movsd %xmm0, -8(%rsp) // Put the argument onto the stack
+
+	fldln2 // Put lb(e) onto the FPU stack
+	fldl -8(%rsp) // Put a double onto the FPU stack
+	fyl2x // %st1 * lb(%st0)
+
+	 // The result is on the FPU stack, but returned in %xmm0
+	fstpl -8(%rsp)
+	movsd -8(%rsp), %xmm0
+
+	ret
+
+
+// logf.
+	.globl _D5tanya4math8nbtheory9__T2lnTfZ2lnFNaNbNiNffZf
+	.type _D5tanya4math8nbtheory9__T2lnTfZ2lnFNaNbNiNffZf, @function
+
+_D5tanya4math8nbtheory9__T2lnTfZ2lnFNaNbNiNffZf:
+	movss %xmm0, -4(%rsp) // Put the argument onto the stack
+
+	fldln2 // Put lb(e) onto the FPU stack
+	flds -4(%rsp) // Put a float onto the FPU stack
+	fyl2x // %st1 * lb(%st0)
+
+	 // The result is on the FPU stack, but returned in %xmm0
+	fstps -4(%rsp)
+	movss -4(%rsp), %xmm0
+
+	ret

arch/x64/linux/memory/fill.S

@@ -37,6 +37,11 @@ _D5tanya6memory2op10fillMemoryFNaNbNiAvmZv:
 
 		mov %rsi,  %r8
 
+		// If the length is less than the number of misaligned bytes,
+		// write one byte at a time and exit
+		cmp %rax, %rcx
+		jg aligned_1
+
 	naligned:
 		mov %dl, (%r8) // Write a byte
 

dscanner.ini

@@ -74,7 +74,7 @@ lambda_return_check="skip-unittest"
 ; Check for auto function without return statement
 auto_function_check="skip-unittest"
 ; Check for sortedness of imports
-imports_sortedness="disabled"
+imports_sortedness="skip-unittest"
 ; Check for explicitly annotated unittests
 explicitly_annotated_unittests="disabled"
 ; Check for useless usage of the final attribute

dub.json

@@ -1,18 +1,27 @@
 {
 	"name": "tanya",
-	"description": "General purpose, @nogc library. Containers, networking, metaprogramming, memory management, utilities",
+	"description": "@nogc library. Containers, networking, metaprogramming, memory management, utilities",
 	"license": "MPL-2.0",
-	"copyright": "(c) Eugene Wissner <info@caraus.de>",
+	"copyright": "© Eugene Wissner <info@caraus.de>",
 	"authors": [
 		"Eugene Wissner"
 	],
 
 	"targetType": "library",
 
+	"dependencies-linux": {
+		"mir-linux-kernel": "~>1.0.0"
+	},
+
 	"configurations": [
 		{
 			"name": "library",
-			"targetType": "library",
+			"targetType": "staticLibrary",
+			"versions": ["TanyaPhobos"]
+		},
+		{
+			"name": "dynamic",
+			"targetType": "dynamicLibrary",
 			"versions": ["TanyaPhobos"]
 		},
 		{
@@ -23,5 +32,7 @@
 			"lflags": ["arch/tanya.a"],
 			"versions": ["TanyaNative"]
 		}
-	]
+	],
+
+	"libs-windows": ["advapi32"]
 }

source/tanya/algorithm/mutation.d

@@ -0,0 +1,275 @@
+/* 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/. */
+
+/**
+ * Algorithms that modify its arguments.
+ *
+ * Copyright: Eugene Wissner 2017-2018.
+ * 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)
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/algorithm/mutation.d,
+ *                 tanya/algorithm/mutation.d)
+ */
+module tanya.algorithm.mutation;
+
+import tanya.memory.op;
+import tanya.meta.trait;
+
+private void deinitialize(bool zero, T)(ref T value)
+{
+    static if (is(T == U[S], U, size_t S))
+    {
+        foreach (ref e; value)
+        {
+            deinitialize!zero(e);
+        }
+    }
+    else
+    {
+        static if (isNested!T)
+        {
+            // Don't override the context pointer.
+            enum size_t size = T.sizeof - (void*).sizeof;
+        }
+        else
+        {
+            enum size_t size = T.sizeof;
+        }
+        static if (zero)
+        {
+            fill!0((cast(void*) &value)[0 .. size]);
+        }
+        else
+        {
+            copy(typeid(T).initializer()[0 .. size], (&value)[0 .. 1]);
+        }
+    }
+}
+
+/**
+ * Moves $(D_PARAM source) into $(D_PARAM target) assuming that
+ * $(D_PARAM target) isn't initialized.
+ *
+ * Moving the $(D_PARAM source) copies it into the $(D_PARAM target) and places
+ * the $(D_PARAM source) into a valid but unspecified state, which means that
+ * after moving $(D_PARAM source) can be destroyed or assigned a new value, but
+ * accessing it yields an unspecified value. No postblits or destructors are
+ * called. If the $(D_PARAM target) should be destroyed before, use
+ * $(D_PSYMBOL move).
+ *
+ * $(D_PARAM source) and $(D_PARAM target) must be different objects.
+ *
+ * Params:
+ *  T      = Object type.
+ *  source = Source object.
+ *  target = Target object.
+ *
+ * See_Also: $(D_PSYMBOL move),
+ *           $(D_PSYMBOL hasElaborateCopyConstructor),
+ *           $(D_PSYMBOL hasElaborateDestructor).
+ *
+ * Precondition: `&source !is &target`.
+ */
+void moveEmplace(T)(ref T source, ref T target) @system
+in
+{
+    assert(&source !is &target, "Source and target must be different");
+}
+do
+{
+    static if (is(T == struct) || isStaticArray!T)
+    {
+        copy((&source)[0 .. 1], (&target)[0 .. 1]);
+
+        static if (hasElaborateCopyConstructor!T || hasElaborateDestructor!T)
+        {
+            if (typeid(T).initializer().ptr is null)
+            {
+                deinitialize!true(source);
+            }
+            else
+            {
+                deinitialize!false(source);
+            }
+        }
+    }
+    else
+    {
+        target = source;
+    }
+}
+
+///
+@nogc nothrow pure @system unittest
+{
+    static struct S
+    {
+        int member = 5;
+
+        this(this) @nogc nothrow pure @safe
+        {
+            assert(false);
+        }
+    }
+    S source, target = void;
+    moveEmplace(source, target);
+    assert(target.member == 5);
+
+    int x1 = 5, x2;
+    moveEmplace(x1, x2);
+    assert(x2 == 5);
+}
+
+// Is pure.
+@nogc nothrow pure @system unittest
+{
+    struct S
+    {
+        this(this)
+        {
+        }
+    }
+    S source, target = void;
+    static assert(is(typeof({ moveEmplace(source, target); })));
+}
+
+// Moves nested.
+@nogc nothrow pure @system unittest
+{
+    struct Nested
+    {
+        void method() @nogc nothrow pure @safe
+        {
+        }
+    }
+    Nested source, target = void;
+    moveEmplace(source, target);
+    assert(source == target);
+}
+
+// Emplaces static arrays.
+@nogc nothrow pure @system unittest
+{
+    static struct S
+    {
+        size_t member;
+        this(size_t i) @nogc nothrow pure @safe
+        {
+            this.member = i;
+        }
+        ~this() @nogc nothrow pure @safe
+        {
+        }
+    }
+    S[2] source = [ S(5), S(5) ], target = void;
+    moveEmplace(source, target);
+    assert(source[0].member == 0);
+    assert(target[0].member == 5);
+    assert(source[1].member == 0);
+    assert(target[1].member == 5);
+}
+
+/**
+ * Moves $(D_PARAM source) into $(D_PARAM target) assuming that
+ * $(D_PARAM target) isn't initialized.
+ *
+ * Moving the $(D_PARAM source) copies it into the $(D_PARAM target) and places
+ * the $(D_PARAM source) into a valid but unspecified state, which means that
+ * after moving $(D_PARAM source) can be destroyed or assigned a new value, but
+ * accessing it yields an unspecified value. $(D_PARAM target) is destroyed before
+ * the new value is assigned. If $(D_PARAM target) isn't initialized and
+ * therefore shouldn't be destroyed, $(D_PSYMBOL moveEmplace) can be used.
+ *
+ * If $(D_PARAM target) isn't specified, $(D_PSYMBOL move) returns the source
+ * as rvalue without calling its copy constructor or destructor.
+ *
+ * $(D_PARAM source) and $(D_PARAM target) are the same object,
+ * $(D_PSYMBOL move) does nothing.
+ *
+ * Params:
+ *  T      = Object type.
+ *  source = Source object.
+ *  target = Target object.
+ *
+ * See_Also: $(D_PSYMBOL moveEmplace).
+ */
+void move(T)(ref T source, ref T target)
+{
+    if ((() @trusted => &source is &target)())
+    {
+        return;
+    }
+    static if (hasElaborateDestructor!T)
+    {
+        target.__xdtor();
+    }
+    (() @trusted => moveEmplace(source, target))();
+}
+
+/// ditto
+T move(T)(ref T source) @trusted
+{
+    T target = void;
+    moveEmplace(source, target);
+    return target;
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static struct S
+    {
+        int member = 5;
+
+        this(this) @nogc nothrow pure @safe
+        {
+            assert(false);
+        }
+    }
+    S source, target = void;
+    move(source, target);
+    assert(target.member == 5);
+    assert(move(target).member == 5);
+
+    int x1 = 5, x2;
+    move(x1, x2);
+    assert(x2 == 5);
+    assert(move(x2) == 5);
+}
+
+// Moves if source is target.
+@nogc nothrow pure @safe unittest
+{
+    int x = 5;
+    move(x, x);
+    assert(x == 5);
+}
+
+/**
+ * Exchanges the values of $(D_PARAM a) and $(D_PARAM b).
+ *
+ * $(D_PSYMBOL swap) moves the contents of $(D_PARAM a) and $(D_PARAM b)
+ * without calling its postblits or destructors.
+ *
+ * Params:
+ *  a = The first object.
+ *  b = The second object.
+ */
+void swap(T)(ref T a, ref T b) @trusted
+{
+    T tmp = void;
+    moveEmplace(a, tmp);
+    moveEmplace(b, a);
+    moveEmplace(tmp, b);
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    int a = 3, b = 5;
+    swap(a, b);
+    assert(a == 5);
+    assert(b == 3);
+}

source/tanya/algorithm/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/. */
+
+/**
+ * Collection of generic algorithms.
+ *
+ * Copyright: Eugene Wissner 2017-2018.
+ * 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)
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/algorithm/package.d,
+ *                 tanya/algorithm/package.d)
+ */
+module tanya.algorithm;
+
+public import tanya.algorithm.mutation;

source/tanya/async/event/epoll.d

@@ -5,7 +5,7 @@
 /**
  * Event loop implementation for Linux.
  *
- * Copyright: Eugene Wissner 2016-2017.
+ * Copyright: Eugene Wissner 2016-2018.
  * 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)
@@ -19,20 +19,19 @@ version (D_Ddoc)
 }
 else version (linux):
 
+import core.stdc.errno;
 public import core.sys.linux.epoll;
-import tanya.async.protocol;
+import core.sys.posix.unistd;
+import core.time;
+import std.algorithm.comparison;
 import tanya.async.event.selector;
 import tanya.async.loop;
+import tanya.async.protocol;
 import tanya.async.transport;
 import tanya.async.watcher;
 import tanya.container.array;
 import tanya.memory;
-import tanya.memory.mmappool;
 import tanya.network.socket;
-import core.stdc.errno;
-import core.sys.posix.unistd;
-import core.time;
-import std.algorithm.comparison;
 
 extern (C) nothrow @nogc
 {
@@ -56,7 +55,7 @@ final class EpollLoop : SelectorLoop
             throw defaultAllocator.make!BadLoopException("epoll initialization failed");
         }
         super();
-        events = Array!epoll_event(maxEvents, MmapPool.instance);
+        events = Array!epoll_event(maxEvents);
     }
 
     /**
@@ -163,7 +162,7 @@ final class EpollLoop : SelectorLoop
                 }
                 else if (transport.output.length)
                 {
-                    pendings.enqueue(transport);
+                    pendings.insertBack(transport);
                 }
             }
             if (events[i].events & EPOLLOUT)

source/tanya/async/event/iocp.d

@@ -5,7 +5,7 @@
 /**
  * Event loop implementation for Windows.
  *
- * Copyright: Eugene Wissner 2016-2017.
+ * Copyright: Eugene Wissner 2016-2018.
  * 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)
@@ -19,17 +19,16 @@ version (D_Ddoc)
 }
 else version (Windows):
 
-import tanya.container.buffer;
+import core.sys.windows.mswsock;
+import core.sys.windows.winsock2;
 import tanya.async.loop;
 import tanya.async.protocol;
 import tanya.async.transport;
 import tanya.async.watcher;
+import tanya.container.buffer;
 import tanya.memory;
-import tanya.memory.mmappool;
 import tanya.network.socket;
 import tanya.sys.windows.winbase;
-import core.sys.windows.mswsock;
-import core.sys.windows.winsock2;
 
 /**
  * Transport for stream sockets.
@@ -57,8 +56,8 @@ final class StreamTransport : SocketWatcher, DuplexTransport, SocketTransport
     this(OverlappedConnectedSocket socket) @nogc
     {
         super(socket);
-        output = ReadBuffer!ubyte(8192, 1024, MmapPool.instance);
+        output = ReadBuffer!ubyte(8192, 1024);
-        input = WriteBuffer!ubyte(8192, MmapPool.instance);
+        input = WriteBuffer!ubyte(8192);
         active = true;
     }
 
@@ -72,7 +71,7 @@ final class StreamTransport : SocketWatcher, DuplexTransport, SocketTransport
     {
         assert(socket !is null);
     }
-    body
+    do
     {
         return cast(OverlappedConnectedSocket) socket_;
     }
@@ -117,8 +116,7 @@ final class StreamTransport : SocketWatcher, DuplexTransport, SocketTransport
     /**
      * Switches the protocol.
      *
-     * The protocol is deallocated by the event loop, it should currently be
+     * The protocol is deallocated by the event loop.
-     * allocated with $(D_PSYMBOL MmapPool).
      *
      * Params:
      *  protocol = Application protocol.
@@ -130,7 +128,7 @@ final class StreamTransport : SocketWatcher, DuplexTransport, SocketTransport
     {
         assert(protocol !is null);
     }
-    body
+    do
     {
         protocol_ = protocol;
     }
@@ -150,20 +148,20 @@ final class StreamTransport : SocketWatcher, DuplexTransport, SocketTransport
                 SocketState overlapped;
                 try
                 {
-                    overlapped = MmapPool.instance.make!SocketState;
+                    overlapped = defaultAllocator.make!SocketState;
                     socket.beginSend(input[], overlapped);
                 }
                 catch (SocketException e)
                 {
-                    MmapPool.instance.dispose(overlapped);
+                    defaultAllocator.dispose(overlapped);
-                    MmapPool.instance.dispose(e);
+                    defaultAllocator.dispose(e);
                 }
             }
         }
         else
         {
             protocol.disconnected(exception);
-            MmapPool.instance.dispose(protocol_);
+            defaultAllocator.dispose(protocol_);
             defaultAllocator.dispose(exception);
             active = false;
         }
@@ -221,12 +219,12 @@ final class IOCPLoop : Loop
 
             try
             {
-                overlapped = MmapPool.instance.make!SocketState;
+                overlapped = defaultAllocator.make!SocketState;
                 socket.beginAccept(overlapped);
             }
             catch (SocketException e)
             {
-                MmapPool.instance.dispose(overlapped);
+                defaultAllocator.dispose(overlapped);
                 defaultAllocator.dispose(e);
                 return false;
             }
@@ -250,12 +248,12 @@ final class IOCPLoop : Loop
             {
                 try
                 {
-                    overlapped = MmapPool.instance.make!SocketState;
+                    overlapped = defaultAllocator.make!SocketState;
                     transport.socket.beginReceive(transport.output[], overlapped);
                 }
                 catch (SocketException e)
                 {
-                    MmapPool.instance.dispose(overlapped);
+                    defaultAllocator.dispose(overlapped);
                     defaultAllocator.dispose(e);
                     return false;
                 }
@@ -270,12 +268,12 @@ final class IOCPLoop : Loop
     {
         assert(transport !is null);
     }
-    body
+    do
     {
         transport.socket.shutdown();
         defaultAllocator.dispose(transport.socket);
         transport.exception = exception;
-        pendings.enqueue(transport);
+        pendings.insertBack(transport);
     }
 
     /**
@@ -298,11 +296,12 @@ final class IOCPLoop : Loop
             return; // Timeout
         }
 
-        auto overlapped = (cast(SocketState) ((cast(void*) overlap) - 8));
+        enum size_t offset = size_t.sizeof * 2;
+        auto overlapped = cast(SocketState) ((cast(void*) overlap) - offset);
         assert(overlapped !is null);
         scope (failure)
         {
-            MmapPool.instance.dispose(overlapped);
+            defaultAllocator.dispose(overlapped);
         }
 
         switch (overlapped.event)
@@ -315,13 +314,13 @@ final class IOCPLoop : Loop
                 assert(listener !is null);
 
                 auto socket = listener.endAccept(overlapped);
-                auto transport = MmapPool.instance.make!StreamTransport(socket);
+                auto transport = defaultAllocator.make!StreamTransport(socket);
 
-                connection.incoming.enqueue(transport);
+                connection.incoming.insertBack(transport);
 
                 reify(transport, EventMask(Event.none), EventMask(Event.read, Event.write));
 
-                pendings.enqueue(connection);
+                pendings.insertBack(connection);
                 listener.beginAccept(overlapped);
                 break;
             case OverlappedSocketEvent.read:
@@ -330,8 +329,8 @@ final class IOCPLoop : Loop
 
                 if (!transport.active)
                 {
-                    MmapPool.instance.dispose(transport);
+                    defaultAllocator.dispose(transport);
-                    MmapPool.instance.dispose(overlapped);
+                    defaultAllocator.dispose(overlapped);
                     return;
                 }
 
@@ -361,7 +360,7 @@ final class IOCPLoop : Loop
                     {
                         transport.socket.beginReceive(transport.output[], overlapped);
                     }
-                    pendings.enqueue(transport);
+                    pendings.insertBack(transport);
                 }
                 break;
             case OverlappedSocketEvent.write:

source/tanya/async/event/kqueue.d

@@ -5,7 +5,7 @@
 /*
  * Event loop implementation for *BSD.
  *
- * Copyright: Eugene Wissner 2016-2017.
+ * Copyright: Eugene Wissner 2016-2018.
  * 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)
@@ -59,7 +59,6 @@ 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
@@ -146,8 +145,8 @@ final class KqueueLoop : SelectorLoop
             throw make!BadLoopException(defaultAllocator,
                                         "kqueue initialization failed");
         }
-        events = Array!kevent_t(64, MmapPool.instance);
+        events = Array!kevent_t(64);
-        changes = Array!kevent_t(64, MmapPool.instance);
+        changes = Array!kevent_t(64);
     }
 
     /**
@@ -280,7 +279,7 @@ final class KqueueLoop : SelectorLoop
                 }
                 else if (transport.output.length)
                 {
-                    pendings.enqueue(transport);
+                    pendings.insertBack(transport);
                 }
             }
             else if (events[i].filter == EVFILT_WRITE)

source/tanya/async/event/selector.d

@@ -5,7 +5,7 @@
 /*
  * This module contains base implementations for reactor event loops.
  *
- * Copyright: Eugene Wissner 2016-2017.
+ * Copyright: Eugene Wissner 2016-2018.
  * 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)
@@ -23,10 +23,9 @@ 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.container.buffer;
 import tanya.memory;
-import tanya.memory.mmappool;
 import tanya.network.socket;
 
 /**
@@ -61,12 +60,12 @@ package class StreamTransport : SocketWatcher, DuplexTransport, SocketTransport
     {
         assert(loop !is null);
     }
-    body
+    do
     {
         super(socket);
         this.loop = loop;
-        output = ReadBuffer!ubyte(8192, 1024, MmapPool.instance);
+        output = ReadBuffer!ubyte(8192, 1024);
-        input = WriteBuffer!ubyte(8192, MmapPool.instance);
+        input = WriteBuffer!ubyte(8192);
         active = true;
     }
 
@@ -80,7 +79,7 @@ package class StreamTransport : SocketWatcher, DuplexTransport, SocketTransport
     {
         assert(socket !is null);
     }
-    body
+    do
     {
         return cast(ConnectedSocket) socket_;
     }
@@ -91,7 +90,7 @@ package class StreamTransport : SocketWatcher, DuplexTransport, SocketTransport
     {
         assert(socket !is null);
     }
-    body
+    do
     {
         socket_ = socket;
     }
@@ -107,8 +106,7 @@ package class StreamTransport : SocketWatcher, DuplexTransport, SocketTransport
     /**
      * Switches the protocol.
      *
-     * The protocol is deallocated by the event loop, it should currently be
+     * The protocol is deallocated by the event loop.
-     * allocated with $(D_PSYMBOL MmapPool).
      *
      * Params:
      *  protocol = Application protocol.
@@ -120,7 +118,7 @@ package class StreamTransport : SocketWatcher, DuplexTransport, SocketTransport
     {
         assert(protocol !is null);
     }
-    body
+    do
     {
         protocol_ = protocol;
     }
@@ -163,7 +161,7 @@ package class StreamTransport : SocketWatcher, DuplexTransport, SocketTransport
         else
         {
             protocol.disconnected(exception);
-            MmapPool.instance.dispose(protocol_);
+            defaultAllocator.dispose(protocol_);
             defaultAllocator.dispose(exception);
             active = false;
         }
@@ -220,18 +218,18 @@ abstract class SelectorLoop : Loop
     this() @nogc
     {
         super();
-        connections = Array!SocketWatcher(maxEvents, MmapPool.instance);
+        this.connections = Array!SocketWatcher(maxEvents);
     }
 
     ~this() @nogc
     {
-        foreach (ref connection; connections)
+        foreach (ref connection; this.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);
+                defaultAllocator.dispose(connection);
             }
         }
     }
@@ -263,12 +261,12 @@ abstract class SelectorLoop : Loop
     {
         assert(transport !is null);
     }
-    body
+    do
     {
         transport.socket.shutdown();
         defaultAllocator.dispose(transport.socket);
         transport.exception = exception;
-        pendings.enqueue(transport);
+        pendings.insertBack(transport);
     }
 
     /**
@@ -289,7 +287,7 @@ abstract class SelectorLoop : Loop
     {
         assert(transport !is null);
     }
-    body
+    do
     {
         while (transport.input.length && transport.writeReady)
         {
@@ -356,7 +354,7 @@ abstract class SelectorLoop : Loop
     {
         assert(connection !is null);
     }
-    body
+    do
     {
         while (true)
         {
@@ -387,7 +385,7 @@ abstract class SelectorLoop : Loop
             }
             if (transport is null)
             {
-                transport = MmapPool.instance.make!StreamTransport(this, client);
+                transport = defaultAllocator.make!StreamTransport(this, client);
                 connections[client.handle] = transport;
             }
             else
@@ -396,12 +394,12 @@ abstract class SelectorLoop : Loop
             }
 
             reify(transport, EventMask(Event.none), EventMask(Event.read, Event.write));
-            connection.incoming.enqueue(transport);
+            connection.incoming.insertBack(transport);
         }
 
         if (!connection.incoming.empty)
         {
-            pendings.enqueue(connection);
+            pendings.insertBack(connection);
         }
     }
 }

source/tanya/async/iocp.d

@@ -7,7 +7,7 @@
  *
  * Note: Available only on Windows.
  *
- * Copyright: Eugene Wissner 2016-2017.
+ * Copyright: Eugene Wissner 2016-2018.
  * 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)

source/tanya/async/loop.d

@@ -60,7 +60,7 @@
  * }
  * ---
  *
- * Copyright: Eugene Wissner 2016-2017.
+ * Copyright: Eugene Wissner 2016-2018.
  * 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)
@@ -70,15 +70,12 @@
 module tanya.async.loop;
 
 import core.time;
-import std.algorithm.iteration;
-import std.algorithm.mutation;
 import std.typecons;
 import tanya.async.transport;
 import tanya.async.watcher;
 import tanya.container.buffer;
-import tanya.container.queue;
+import tanya.container.list;
 import tanya.memory;
-import tanya.memory.mmappool;
 import tanya.network.socket;
 
 version (DisableBackends)
@@ -164,7 +161,7 @@ abstract class Loop
     private bool done = true;
 
     /// Pending watchers.
-    protected Queue!Watcher pendings;
+    protected DList!Watcher pendings;
 
     /**
      * Returns: Maximal event count can be got at a time
@@ -189,7 +186,6 @@ abstract class Loop
      */
     this() @nogc
     {
-        pendings = Queue!Watcher(MmapPool.instance);
     }
 
     /**
@@ -197,9 +193,9 @@ abstract class Loop
      */
     ~this() @nogc
     {
-        foreach (w; pendings)
+        for (; !this.pendings.empty; this.pendings.removeFront())
         {
-            MmapPool.instance.dispose(w);
+            defaultAllocator.dispose(this.pendings.front);
         }
     }
 
@@ -214,9 +210,9 @@ abstract class Loop
             poll();
 
             // Invoke pendings
-            foreach (ref w; this.pendings)
+            for (; !this.pendings.empty; this.pendings.removeFront())
             {
-                w.invoke();
+                this.pendings.front.invoke();
             }
         }
         while (!this.done);
@@ -245,7 +241,7 @@ abstract class Loop
     {
         auto loop = defaultAllocator.make!TestLoop;
         auto watcher = defaultAllocator.make!DummyWatcher;
-        loop.pendings.enqueue(watcher);
+        loop.pendings.insertBack(watcher);
 
         assert(!watcher.invoked);
         loop.run();
@@ -326,7 +322,7 @@ abstract class Loop
         assert(blockTime <= 1.dur!"hours", "Too long to wait.");
         assert(!blockTime.isNegative);
     }
-    body
+    do
     {
         blockTime_ = blockTime;
     }
@@ -384,16 +380,16 @@ class BadLoopException : Exception
     }
     version (Epoll)
     {
-        defaultLoop_ = MmapPool.instance.make!EpollLoop;
+        defaultLoop_ = defaultAllocator.make!EpollLoop;
     }
     else version (IOCP)
     {
-        defaultLoop_ = MmapPool.instance.make!IOCPLoop;
+        defaultLoop_ = defaultAllocator.make!IOCPLoop;
     }
     else version (Kqueue)
     {
         import tanya.async.event.kqueue;
-        defaultLoop_ = MmapPool.instance.make!KqueueLoop;
+        defaultLoop_ = defaultAllocator.make!KqueueLoop;
     }
     return defaultLoop_;
 }
@@ -414,7 +410,7 @@ in
 {
     assert(loop !is null);
 }
-body
+do
 {
     defaultLoop_ = loop;
 }

source/tanya/async/package.d

@@ -5,7 +5,7 @@
 /**
  * This package provides asynchronous capabilities.
  *
- * Copyright: Eugene Wissner 2016-2017.
+ * Copyright: Eugene Wissner 2016-2018.
  * 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)

source/tanya/async/protocol.d

@@ -9,7 +9,7 @@
  * When an event from the network arrives, a protocol method gets
  * called and can respond to the event.
  *
- * Copyright: Eugene Wissner 2016-2017.
+ * Copyright: Eugene Wissner 2016-2018.
  * 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)
@@ -18,8 +18,8 @@
  */
 module tanya.async.protocol;
 
-import tanya.network.socket;
 import tanya.async.transport;
+import tanya.network.socket;
 
 /**
  * Common protocol interface.

source/tanya/async/transport.d

@@ -6,7 +6,7 @@
  * This module contains transports which are responsible for data dilvery
  * between two parties of an asynchronous communication.
  *
- * Copyright: Eugene Wissner 2016-2017.
+ * Copyright: Eugene Wissner 2016-2018.
  * 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)
@@ -65,8 +65,7 @@ interface DuplexTransport : ReadTransport, WriteTransport
     /**
      * Switches the protocol.
      *
-     * The protocol is deallocated by the event loop, it should currently be
+     * The protocol is deallocated by the event loop.
-     * allocated with $(D_PSYMBOL MmapPool).
      *
      * Params:
      *  protocol = Application protocol.

source/tanya/async/watcher.d

@@ -5,7 +5,7 @@
 /**
  * Watchers register user's interest in some event.
  *
- * Copyright: Eugene Wissner 2016-2017.
+ * Copyright: Eugene Wissner 2016-2018.
  * 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)
@@ -14,15 +14,12 @@
  */
 module tanya.async.watcher;
 
-import std.functional;
-import std.exception;
 import tanya.async.loop;
 import tanya.async.protocol;
 import tanya.async.transport;
 import tanya.container.buffer;
-import tanya.container.queue;
+import tanya.container.list;
 import tanya.memory;
-import tanya.memory.mmappool;
 import tanya.network.socket;
 
 /**
@@ -72,7 +69,7 @@ abstract class SocketWatcher : Watcher
     {
         assert(socket !is null);
     }
-    body
+    do
     {
         socket_ = socket;
     }
@@ -92,7 +89,7 @@ abstract class SocketWatcher : Watcher
 class ConnectionWatcher : SocketWatcher
 {
     /// Incoming connection queue.
-    Queue!DuplexTransport incoming;
+    DList!DuplexTransport incoming;
 
     private Protocol delegate() @nogc protocolFactory;
 
@@ -103,7 +100,6 @@ class ConnectionWatcher : SocketWatcher
     this(Socket socket) @nogc
     {
         super(socket);
-        incoming = Queue!DuplexTransport(MmapPool.instance);
     }
 
     /**
@@ -112,7 +108,7 @@ class ConnectionWatcher : SocketWatcher
      */
     void setProtocol(P : Protocol)() @nogc
     {
-        this.protocolFactory = () @nogc => cast(Protocol) MmapPool.instance.make!P;
+        this.protocolFactory = () @nogc => cast(Protocol) defaultAllocator.make!P;
     }
 
     /**
@@ -123,12 +119,12 @@ class ConnectionWatcher : SocketWatcher
     {
         assert(protocolFactory !is null, "Protocol isn't set.");
     }
-    body
+    do
     {
-        foreach (transport; incoming)
+        for (; !this.incoming.empty; this.incoming.removeFront())
         {
-            transport.protocol = protocolFactory();
+            this.incoming.front.protocol = protocolFactory();
-            transport.protocol.connected(transport);
+            this.incoming.front.protocol.connected(this.incoming.front);
         }
     }
 }

source/tanya/container/array.d

@@ -5,7 +5,7 @@
 /**
  * Single-dimensioned array.
  *
- * Copyright: Eugene Wissner 2016-2017.
+ * Copyright: Eugene Wissner 2016-2018.
  * 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,11 +15,15 @@
 module tanya.container.array;
 
 import core.checkedint;
-import core.exception;
 import std.algorithm.comparison;
-import std.algorithm.mutation;
+import std.algorithm.mutation : bringToFront,
-import std.conv;
+                                copy,
+                                fill,
+                                initializeAll,
+                                uninitializedFill;
 import std.meta;
+import tanya.algorithm.mutation;
+import tanya.exception;
 import tanya.memory;
 import tanya.meta.trait;
 import tanya.meta.transform;
@@ -52,7 +56,7 @@ struct Range(A)
         assert(begin >= container.data);
         assert(end <= container.data + container.length);
     }
-    body
+    do
     {
         this.container = &container;
         this.begin = begin;
@@ -83,7 +87,7 @@ struct Range(A)
     {
         assert(!empty);
     }
-    body
+    do
     {
         return *this.begin;
     }
@@ -93,7 +97,7 @@ struct Range(A)
     {
         assert(!empty);
     }
-    body
+    do
     {
         return *(this.end - 1);
     }
@@ -103,7 +107,7 @@ struct Range(A)
     {
         assert(!empty);
     }
-    body
+    do
     {
         ++this.begin;
     }
@@ -113,7 +117,7 @@ struct Range(A)
     {
         assert(!empty);
     }
-    body
+    do
     {
         --this.end;
     }
@@ -123,7 +127,7 @@ struct Range(A)
     {
         assert(i < length);
     }
-    body
+    do
     {
         return *(this.begin + i);
     }
@@ -144,7 +148,7 @@ struct Range(A)
         assert(i <= j);
         assert(j <= length);
     }
-    body
+    do
     {
         return typeof(return)(*this.container, this.begin + i, this.begin + j);
     }
@@ -155,7 +159,7 @@ struct Range(A)
         assert(i <= j);
         assert(j <= length);
     }
-    body
+    do
     {
         return typeof(return)(*this.container, this.begin + i, this.begin + j);
     }
@@ -265,7 +269,10 @@ struct Array(T)
         {
             // Move each element.
             reserve(init.length_);
-            moveEmplaceAll(init.data[0 .. init.length_], this.data[0 .. init.length_]);
+            foreach (ref target; this.data[0 .. init.length_])
+            {
+                moveEmplace(*init.data++, target);
+            }
             this.length_ = init.length_;
             // Destructor of init should destroy it here.
         }
@@ -326,7 +333,7 @@ struct Array(T)
     {
         assert(allocator !is null);
     }
-    body
+    do
     {
         allocator_ = allocator;
     }
@@ -501,13 +508,12 @@ struct Array(T)
             buf = allocator.allocate(byteSize);
             if (buf is null)
             {
-                onOutOfMemoryErrorNoGC();
+                onOutOfMemoryError();
             }
             scope (failure)
             {
                 allocator.deallocate(buf);
             }
-            const T* end = this.data + this.length_;
             for (T* src = this.data, dest = cast(T*) buf; src != end; ++src, ++dest)
             {
                 moveEmplace(*src, *dest);
@@ -591,7 +597,7 @@ struct Array(T)
     {
         assert(!empty);
     }
-    body
+    do
     {
         length = length - 1;
     }
@@ -613,7 +619,7 @@ struct Array(T)
     {
         assert(removed <= howMany);
     }
-    body
+    do
     {
         const toRemove = min(howMany, length);
 
@@ -633,6 +639,11 @@ struct Array(T)
         assert(v.removeBack(3) == 0);
     }
 
+    private @property inout(T)* end() inout
+    {
+        return this.data + this.length_;
+    }
+
     /**
      * Remove all elements beloning to $(D_PARAM r).
      *
@@ -651,10 +662,13 @@ struct Array(T)
         assert(r.begin >= this.data);
         assert(r.end <= this.data + length);
     }
-    body
+    do
     {
-        auto end = this.data + this.length;
+        auto target = r.begin;
-        moveAll(Range(this, r.end, end), Range(this, r.begin, end));
+        for (auto source = r.end; source != end; ++source, ++target)
+        {
+            move(*source, *target);
+        }
         length = length - r.length;
         return Range(this, r.begin, this.data + length);
     }
@@ -684,7 +698,7 @@ struct Array(T)
         if (isImplicitlyConvertible!(R, T))
     {
         reserve(this.length + 1);
-        moveEmplace(el, *(this.data + this.length_));
+        moveEmplace(el, *end);
         ++this.length_;
     }
 
@@ -708,9 +722,12 @@ struct Array(T)
     size_t insertBack(R)(ref R el) @trusted
         if (isImplicitlyConvertible!(R, T))
     {
-        reserve(this.length_ + 1);
+        this.length = this.length + 1;
-        emplace(this.data + this.length_, el);
+        scope (failure)
-        ++this.length_;
+        {
+            this.length = this.length - 1;
+        }
+        opIndex(this.length - 1) = el;
         return 1;
     }
 
@@ -804,7 +821,7 @@ struct Array(T)
         assert(r.begin >= this.data);
         assert(r.end <= this.data + length);
     }
-    body
+    do
     {
         const oldLen = length;
         const offset = r.end - this.data;
@@ -821,7 +838,7 @@ struct Array(T)
         assert(r.begin >= this.data);
         assert(r.end <= this.data + length);
     }
-    body
+    do
     {
         return insertAfter!(T[])(r, el[]);
     }
@@ -835,7 +852,7 @@ struct Array(T)
         assert(r.begin >= this.data);
         assert(r.end <= this.data + length);
     }
-    body
+    do
     {
         const oldLen = length;
         const offset = r.end - this.data;
@@ -864,7 +881,7 @@ struct Array(T)
         assert(r.begin >= this.data);
         assert(r.end <= this.data + length);
     }
-    body
+    do
     {
         return insertAfter(Range(this, this.data, r.begin), el);
     }
@@ -877,7 +894,7 @@ struct Array(T)
         assert(r.begin >= this.data);
         assert(r.end <= this.data + length);
     }
-    body
+    do
     {
         return insertBefore!(T[])(r, el[]);
     }
@@ -891,7 +908,7 @@ struct Array(T)
         assert(r.begin >= this.data);
         assert(r.end <= this.data + length);
     }
-    body
+    do
     {
         const oldLen = length;
         const offset = r.begin - this.data;
@@ -1063,7 +1080,7 @@ struct Array(T)
     {
         assert(length > pos);
     }
-    body
+    do
     {
         return *(this.data + pos);
     }
@@ -1168,7 +1185,7 @@ struct Array(T)
     {
         assert(!empty);
     }
-    body
+    do
     {
         return *this.data;
     }
@@ -1195,7 +1212,7 @@ struct Array(T)
     {
         assert(!empty);
     }
-    body
+    do
     {
         return *(this.data + length - 1);
     }
@@ -1228,7 +1245,7 @@ struct Array(T)
         assert(i <= j);
         assert(j <= length);
     }
-    body
+    do
     {
         return typeof(return)(this, this.data + i, this.data + j);
     }
@@ -1240,7 +1257,7 @@ struct Array(T)
         assert(i <= j);
         assert(j <= length);
     }
-    body
+    do
     {
         return typeof(return)(this, this.data + i, this.data + j);
     }
@@ -1311,7 +1328,7 @@ struct Array(T)
         assert(i <= j);
         assert(j <= length);
     }
-    body
+    do
     {
         copy(value[], this.data[i .. j]);
         return opSlice(i, j);
@@ -1325,7 +1342,7 @@ struct Array(T)
         assert(i <= j);
         assert(j <= length);
     }
-    body
+    do
     {
         fill(this.data[i .. j], value);
         return opSlice(i, j);
@@ -1339,7 +1356,7 @@ struct Array(T)
         assert(j <= length);
         assert(j - i == value.length);
     }
-    body
+    do
     {
         copy(value, this.data[i .. j]);
         return opSlice(i, j);

source/tanya/container/buffer.d

@@ -5,7 +5,7 @@
 /**
  * This module contains buffers designed for C-style input/output APIs.
  *
- * Copyright: Eugene Wissner 2016-2017.
+ * Copyright: Eugene Wissner 2016-2018.
  * 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)
@@ -27,7 +27,7 @@ version (unittest)
     {
         assert(start < end);
     }
-    body
+    do
     {
         auto numberRead = end - start;
         for (ubyte i; i < numberRead; ++i)
@@ -106,7 +106,7 @@ struct ReadBuffer(T = ubyte)
     {
         assert(allocator_ is null);
     }
-    body
+    do
     {
         allocator_ = allocator;
     }
@@ -349,7 +349,7 @@ struct WriteBuffer(T = ubyte)
         assert(size > 0);
         assert(allocator !is null);
     }
-    body
+    do
     {
         blockSize = size;
         ring = size - 1;
@@ -549,7 +549,7 @@ struct WriteBuffer(T = ubyte)
     {
         assert(length <= this.length);
     }
-    body
+    do
     {
         auto afterRing = ring + 1;
         auto oldStart = start;

source/tanya/container/entry.d

@@ -5,7 +5,7 @@
 /*
  * Internal package used by containers that rely on entries/nodes.
  *
- * Copyright: Eugene Wissner 2016-2017.
+ * Copyright: Eugene Wissner 2016-2018.
  * 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)

source/tanya/container/list.d

@@ -3,9 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Linked list.
+ * This module contains singly-linked ($(D_PSYMBOL SList)) and doubly-linked
+ * ($(D_PSYMBOL DList)) lists.
  *
- * Copyright: Eugene Wissner 2016-2017.
+ * Copyright: Eugene Wissner 2016-2018.
  * 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,11 +16,12 @@
 module tanya.container.list;
 
 import std.algorithm.comparison;
-import std.algorithm.mutation;
 import std.algorithm.searching;
+import tanya.algorithm.mutation;
 import tanya.container.entry;
 import tanya.memory;
 import tanya.meta.trait;
+import tanya.meta.transform;
 import tanya.range.array;
 import tanya.range.primitive;
 
@@ -63,7 +65,7 @@ struct SRange(L)
     {
         assert(!empty);
     }
-    body
+    do
     {
         return (*this.head).content;
     }
@@ -73,7 +75,7 @@ struct SRange(L)
     {
         assert(!empty);
     }
-    body
+    do
     {
         this.head = &(*this.head).next;
     }
@@ -123,7 +125,7 @@ struct SList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto l = SList!int([5, 8, 15]);
         assert(l.front == 5);
@@ -171,19 +173,13 @@ struct SList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto l = SList!int(2, 3);
         assert(l.length == 2);
         assert(l.front == 3);
     }
 
-    private @safe @nogc unittest
-    {
-        auto l = SList!int(0, 0);
-        assert(l.empty);
-    }
-
     /// ditto
     this(const size_t len, shared Allocator allocator = defaultAllocator)
     {
@@ -191,7 +187,7 @@ struct SList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto l = SList!int(2);
         assert(l.length == 2);
@@ -204,7 +200,7 @@ struct SList(T)
     {
         assert(allocator !is null);
     }
-    body
+    do
     {
         this.allocator_ = allocator;
     }
@@ -262,7 +258,7 @@ struct SList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto l1 = SList!int([5, 1, 234]);
         auto l2 = SList!int(l1);
@@ -288,7 +284,7 @@ struct SList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto l1 = SList!int([5, 1, 234]);
         auto l2 = l1;
@@ -307,7 +303,7 @@ struct SList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         SList!int l = SList!int([8, 5]);
 
@@ -318,13 +314,15 @@ struct SList(T)
 
     /**
      * Returns: First element.
+     *
+     * Precondition: $(D_INLINECODE !empty).
      */
     @property ref inout(T) front() inout
     in
     {
         assert(!empty);
     }
-    body
+    do
     {
         return this.head.content;
     }
@@ -365,7 +363,7 @@ struct SList(T)
     }
 
     ///
-    unittest
+    @nogc nothrow pure @safe unittest
     {
         SList!int l;
         int value = 5;
@@ -418,7 +416,7 @@ struct SList(T)
     alias insert = insertFront;
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         SList!int l1;
 
@@ -466,13 +464,13 @@ struct SList(T)
     {
         assert(checkRangeBelonging(r));
     }
-    body
+    do
     {
         return moveEntry(*r.head, el);
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto l1 = SList!int([234, 5, 1]);
         auto l2 = SList!int([5, 1]);
@@ -489,7 +487,7 @@ struct SList(T)
     {
         assert(checkRangeBelonging(r));
     }
-    body
+    do
     {
         size_t inserted;
         foreach (e; el)
@@ -501,7 +499,7 @@ struct SList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto l1 = SList!int([5, 234, 30, 1]);
         auto l2 = SList!int([5, 1]);
@@ -518,14 +516,14 @@ struct SList(T)
     {
         assert(checkRangeBelonging(r));
     }
-    body
+    do
     {
         *r.head = allocator.make!Entry(el, *r.head);
         return 1;
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto l1 = SList!int([234, 5, 1]);
         auto l2 = SList!int([5, 1]);
@@ -552,7 +550,7 @@ struct SList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto l1 = SList!int([5, 234, 30, 1]);
         auto l2 = SList!int([5, 1]);
@@ -571,7 +569,7 @@ struct SList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         SList!int l;
 
@@ -599,7 +597,7 @@ struct SList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         SList!int l1, l2;
 
@@ -640,16 +638,16 @@ struct SList(T)
     {
         assert(!empty);
     }
-    body
+    do
     {
         auto n = this.head.next;
 
-        this.allocator.dispose(this.head);
+        allocator.dispose(this.head);
         this.head = n;
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         SList!int l;
 
@@ -679,7 +677,7 @@ struct SList(T)
     {
         assert(removed <= howMany);
     }
-    body
+    do
     {
         size_t i;
         for (; i < howMany && !empty; ++i)
@@ -690,7 +688,7 @@ struct SList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         SList!int l = SList!int([8, 5, 4]);
 
@@ -715,7 +713,7 @@ struct SList(T)
     {
         assert(checkRangeBelonging(r));
     }
-    body
+    do
     {
         auto outOfScopeList = typeof(this)(allocator);
         outOfScopeList.head = *r.head;
@@ -725,7 +723,7 @@ struct SList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto l1 = SList!int([5, 234, 30, 1]);
         auto l2 = SList!int([5]);
@@ -783,7 +781,7 @@ struct SList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         {
             auto l1 = SList!int([5, 4, 9]);
@@ -833,7 +831,7 @@ struct SList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto l1 = SList!int([5, 4, 9]);
         auto l2 = SList!int([9, 4]);
@@ -841,14 +839,6 @@ struct SList(T)
         assert(l1 == l2);
     }
 
-    private @safe @nogc unittest
-    {
-        auto l1 = SList!int();
-        auto l2 = SList!int([9, 4]);
-        l1 = l2[];
-        assert(l1 == l2);
-    }
-
     /**
      * Assigns a static array.
      *
@@ -864,7 +854,7 @@ struct SList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto l1 = SList!int([5, 4, 9]);
         auto l2 = SList!int([9, 4]);
@@ -876,7 +866,7 @@ struct SList(T)
 }
 
 ///
-@nogc unittest
+@nogc nothrow pure @safe unittest
 {
     SList!int l;
     size_t i;
@@ -894,7 +884,7 @@ struct SList(T)
     assert(i == 3);
 }
 
-@safe @nogc private unittest
+@nogc nothrow pure @safe unittest
 {
     interface Stuff
     {
@@ -902,8 +892,14 @@ struct SList(T)
     static assert(is(SList!Stuff));
 }
 
+@nogc nothrow pure @safe unittest
+{
+    auto l = SList!int(0, 0);
+    assert(l.empty);
+}
+
 // foreach called using opIndex().
-private @nogc @safe unittest
+@nogc nothrow pure @safe unittest
 {
     SList!int l;
     size_t i;
@@ -920,8 +916,16 @@ private @nogc @safe unittest
     }
 }
 
+@nogc nothrow pure @safe unittest
+{
+    auto l1 = SList!int();
+    auto l2 = SList!int([9, 4]);
+    l1 = l2[];
+    assert(l1 == l2);
+}
+
 /**
- * Forward range for the $(D_PSYMBOL DList).
+ * Bidirectional range for the $(D_PSYMBOL DList).
  *
  * Params:
  *  L = List type.
@@ -962,7 +966,7 @@ struct DRange(L)
     {
         assert(!empty);
     }
-    body
+    do
     {
         return (*this.head).content;
     }
@@ -972,7 +976,7 @@ struct DRange(L)
     {
         assert(!empty);
     }
-    body
+    do
     {
         return (*this.tail).content;
     }
@@ -982,7 +986,7 @@ struct DRange(L)
     {
         assert(!empty);
     }
-    body
+    do
     {
         this.head = &(*this.head).next;
     }
@@ -992,7 +996,7 @@ struct DRange(L)
     {
         assert(!empty);
     }
-    body
+    do
     {
         this.tail = &(*this.tail).prev;
     }
@@ -1011,6 +1015,17 @@ struct DRange(L)
 /**
  * Doubly-linked list.
  *
+ * $(D_PSYMBOL DList) can be also used as a queue. Elements can be enqueued
+ * with $(D_PSYMBOL DList.insertBack). To process the queue a `for`-loop comes
+ * in handy:
+ *
+ * ---
+ * for (; !dlist.empty; dlist.removeFront())
+ * {
+ *  do_something_with(dlist.front);
+ * }
+ * ---
+ *
  * Params:
  *  T = Content type.
  */
@@ -1050,7 +1065,7 @@ struct DList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto l = DList!int([5, 8, 15]);
         assert(l.front == 5);
@@ -1100,7 +1115,7 @@ struct DList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto l = DList!int(2, 3);
         assert(l.length == 2);
@@ -1108,12 +1123,6 @@ struct DList(T)
         assert(l.back == 3);
     }
 
-    private @safe @nogc unittest
-    {
-        auto l = DList!int(0, 0);
-        assert(l.empty);
-    }
-
     /// ditto
     this(const size_t len, shared Allocator allocator = defaultAllocator)
     {
@@ -1121,7 +1130,7 @@ struct DList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto l = DList!int(2);
         assert(l.length == 2);
@@ -1134,7 +1143,7 @@ struct DList(T)
     {
         assert(allocator !is null);
     }
-    body
+    do
     {
         this.allocator_ = allocator;
     }
@@ -1195,7 +1204,7 @@ struct DList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto l1 = DList!int([5, 1, 234]);
         auto l2 = DList!int(l1);
@@ -1222,7 +1231,7 @@ struct DList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto l1 = DList!int([5, 1, 234]);
         auto l2 = l1;
@@ -1241,7 +1250,7 @@ struct DList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         DList!int l = DList!int([8, 5]);
 
@@ -1252,32 +1261,36 @@ struct DList(T)
 
     /**
      * Returns: First element.
+     *
+     * Precondition: $(D_INLINECODE !empty).
      */
     @property ref inout(T) front() inout
     in
     {
         assert(!empty);
     }
-    body
+    do
     {
         return this.head.content;
     }
 
     /**
      * Returns: Last element.
+     *
+     * Precondition: $(D_INLINECODE !empty).
      */
     @property ref inout(T) back() inout
     in
     {
         assert(!empty);
     }
-    body
+    do
     {
         return this.tail.content;
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto l = DList!int([25]);
         assert(l.front == 25);
@@ -1318,7 +1331,7 @@ struct DList(T)
         assert((retLength == 0 && head is null && tail is null)
             || (retLength > 0 && head !is null && tail !is null));
     }
-	body
+    do
     {
         size_t retLength;
 
@@ -1370,7 +1383,7 @@ struct DList(T)
     }
 
     ///
-    unittest
+    @nogc nothrow pure @safe unittest
     {
         DList!int l;
         int value = 5;
@@ -1407,12 +1420,6 @@ struct DList(T)
         return inserted;
     }
 
-    private @safe @nogc unittest
-    {
-        auto l1 = DList!int([5, 234]);
-        assert(l1.head is l1.head.next.prev);
-    }
-
     /// ditto
     size_t insertFront(size_t R)(T[R] el)
     {
@@ -1420,7 +1427,7 @@ struct DList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         DList!int l1;
 
@@ -1496,7 +1503,7 @@ struct DList(T)
     }
 
     ///
-    unittest
+    @nogc nothrow pure @safe unittest
     {
         DList!int l;
         int value = 5;
@@ -1543,7 +1550,7 @@ struct DList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         DList!int l1;
 
@@ -1594,13 +1601,13 @@ struct DList(T)
     {
         assert(checkRangeBelonging(r));
     }
-    body
+    do
     {
         return moveFront(*r.head, el);
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto l1 = DList!int([234, 5, 1]);
         auto l2 = DList!int([5, 1]);
@@ -1614,7 +1621,7 @@ struct DList(T)
     {
         assert(checkRangeBelonging(r));
     }
-    body
+    do
     {
         auto temp = allocator.make!Entry(el, *r.head);
 
@@ -1633,7 +1640,7 @@ struct DList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto l1 = DList!int([234, 5, 1]);
         auto l2 = DList!int([5, 1]);
@@ -1652,7 +1659,7 @@ struct DList(T)
     {
         assert(checkRangeBelonging(r));
     }
-    body
+    do
     {
         size_t inserted;
         foreach (e; el)
@@ -1664,7 +1671,7 @@ struct DList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto l1 = DList!int([5, 234, 30, 1]);
         auto l2 = DList!int([5, 1]);
@@ -1709,13 +1716,13 @@ struct DList(T)
     {
         assert(checkRangeBelonging(r));
     }
-    body
+    do
     {
         return moveBack(*r.tail, el);
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto l1 = DList!int([5, 234, 1]);
         auto l2 = DList!int([5, 1]);
@@ -1725,22 +1732,13 @@ struct DList(T)
         assert(l1 == l2);
     }
 
-    private @safe @nogc unittest
-    {
-        DList!int l;
-        l.insertAfter(l[], 234);
-        assert(l.front == 234);
-        assert(l.back == 234);
-        assert(l.length == 1);
-    }
-
     /// ditto
     size_t insertAfter(Range r, ref T el) @trusted
     in
     {
         assert(checkRangeBelonging(r));
     }
-    body
+    do
     {
         auto temp = allocator.make!Entry(el, null, *r.tail);
 
@@ -1759,7 +1757,7 @@ struct DList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto l1 = DList!int([5, 1, 234]);
         auto l2 = DList!int([5, 1]);
@@ -1778,7 +1776,7 @@ struct DList(T)
     {
         assert(checkRangeBelonging(r));
     }
-    body
+    do
     {
         size_t inserted;
         foreach (e; el)
@@ -1789,7 +1787,7 @@ struct DList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto l1 = DList!int([5, 234, 30, 1]);
         auto l2 = DList!int([5, 1]);
@@ -1826,7 +1824,7 @@ struct DList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         DList!int l;
 
@@ -1854,7 +1852,7 @@ struct DList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         DList!int l1, l2;
 
@@ -1895,11 +1893,11 @@ struct DList(T)
     {
         assert(!empty);
     }
-    body
+    do
     {
         auto n = this.head.next;
 
-        allocator.dispose(this.head);
+        this.allocator_.dispose(this.head);
         this.head = n;
         if (this.head is null)
         {
@@ -1912,7 +1910,7 @@ struct DList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         DList!int l;
 
@@ -1931,7 +1929,7 @@ struct DList(T)
     {
         assert(!empty);
     }
-    body
+    do
     {
         auto n = this.tail.prev;
 
@@ -1948,7 +1946,7 @@ struct DList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto l = DList!int([9, 8]);
 
@@ -1977,7 +1975,7 @@ struct DList(T)
     {
         assert(removed <= howMany);
     }
-    body
+    do
     {
         size_t i;
         for (; i < howMany && !empty; ++i)
@@ -1988,7 +1986,7 @@ struct DList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         DList!int l = DList!int([8, 5, 4]);
 
@@ -2004,7 +2002,7 @@ struct DList(T)
     {
         assert(removed <= howMany);
     }
-    body
+    do
     {
         size_t i;
         for (; i < howMany && !empty; ++i)
@@ -2015,7 +2013,7 @@ struct DList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         DList!int l = DList!int([8, 5, 4]);
 
@@ -2040,13 +2038,14 @@ struct DList(T)
     {
         assert(checkRangeBelonging(r));
     }
-    body
+    do
     {
         // Save references to the elements before and after the range.
-        Entry* tailNext, headPrev;
+        Entry* headPrev;
-        if (*r.tail !is null && (*r.tail).next !is null)
+        Entry** tailNext;
+        if (*r.tail !is null)
         {
-            tailNext = (*r.tail).next;
+            tailNext = &(*r.tail).next;
         }
         if (*r.head !is null)
         {
@@ -2055,26 +2054,42 @@ struct DList(T)
 
         // Remove the elements.
         Entry* e = *r.head;
-        while (e !is tailNext)
+        while (e !is *tailNext)
         {
             auto next = e.next;
-            allocator.dispose(e);
+            /* Workaround for dmd 2.076.1 bug on OSX. Invariants fail when
+               the allocator is called. Here it should be safe to use
+               allocator_ directory, since the list isn't empty.
+               See also removeFront. */
+            this.allocator_.dispose(e);
             e = next;
         }
 
         // Connect the elements before and after the removed range.
-        if (tailNext !is null)
+        if (*tailNext !is null)
         {
-            tailNext.prev = headPrev;
+            (*tailNext).prev = headPrev;
         }
-        *r.head = tailNext;
+        else
-        *r.tail = tail;
+        {
+            this.tail = headPrev;
+        }
+        if (headPrev !is null)
+        {
+            headPrev.next = *tailNext;
+        }
+        else
+        {
+            this.head = *tailNext;
+        }
+        r.head = tailNext;
+        r.tail = &this.tail;
 
         return r;
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto l1 = DList!int([5, 234, 30, 1]);
         auto l2 = DList!int([5]);
@@ -2086,22 +2101,6 @@ struct DList(T)
         assert(l1 == l2);
     }
 
-    // Issue 260: https://issues.caraus.io/issues/260.
-    private @safe @nogc unittest
-    {
-        auto l1 = DList!int([5, 234, 30, 1]);
-        auto l2 = DList!int([5, 1]);
-        auto r = l1[];
-
-        r.popFront();
-        r.popBack();
-        assert(r.front == 234);
-        assert(r.back == 30);
-
-        assert(!l1.remove(r).empty);
-        assert(l1 == l2);
-    }
-
     /**
      * Returns: Range that iterates over all elements of the container, in
      *          forward order.
@@ -2182,7 +2181,7 @@ struct DList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto l1 = DList!int([5, 4, 9]);
         auto l2 = DList!int([9, 4]);
@@ -2190,14 +2189,6 @@ struct DList(T)
         assert(l1 == l2);
     }
 
-    private @safe @nogc unittest
-    {
-        auto l1 = DList!int();
-        auto l2 = DList!int([9, 4]);
-        l1 = l2[];
-        assert(l1 == l2);
-    }
-
     /**
      * Assigns a static array.
      *
@@ -2213,7 +2204,7 @@ struct DList(T)
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto l1 = DList!int([5, 4, 9]);
         auto l2 = DList!int([9, 4]);
@@ -2225,7 +2216,7 @@ struct DList(T)
 }
 
 ///
-@nogc unittest
+@nogc nothrow pure @safe unittest
 {
     DList!int l;
     size_t i;
@@ -2243,8 +2234,7 @@ struct DList(T)
     assert(i == 3);
 }
 
-// Issue 232: https://issues.caraus.io/issues/232.
+@nogc nothrow pure @safe unittest
-private @nogc unittest
 {
     class A
     {
@@ -2252,3 +2242,67 @@ private @nogc unittest
     static assert(is(SList!(A*)));
     static assert(is(DList!(A*)));
 }
+
+// Removes all elements
+@nogc nothrow pure @safe unittest
+{
+    auto l = DList!int([5]);
+    assert(l.remove(l[]).empty);
+}
+
+@nogc nothrow pure @safe unittest
+{
+    auto l1 = DList!int([5, 234, 30, 1]);
+    auto l2 = DList!int([5, 1]);
+    auto r = l1[];
+
+    r.popFront();
+    r.popBack();
+    assert(r.front == 234);
+    assert(r.back == 30);
+
+    assert(!l1.remove(r).empty);
+    assert(l1 == l2);
+}
+
+@nogc nothrow pure @safe unittest
+{
+    auto l = DList!int(0, 0);
+    assert(l.empty);
+}
+
+@nogc nothrow pure @safe unittest
+{
+    auto l1 = DList!int([5, 234]);
+    assert(l1.head is l1.head.next.prev);
+}
+
+@nogc nothrow pure @safe unittest
+{
+    DList!int l;
+    l.insertAfter(l[], 234);
+    assert(l.front == 234);
+    assert(l.back == 234);
+    assert(l.length == 1);
+}
+
+@nogc nothrow pure @safe unittest
+{
+    auto l1 = DList!int();
+    auto l2 = DList!int([9, 4]);
+    l1 = l2[];
+    assert(l1 == l2);
+}
+
+// Sets the new head
+@nogc nothrow pure @safe unittest
+{
+    auto l1 = DList!int([5, 234, 30, 1]);
+    auto l2 = DList!int([1]);
+    auto r = l1[];
+
+    r.popBack();
+
+    assert(!l1.remove(r).empty);
+    assert(l1 == l2);
+}

source/tanya/container/package.d

@@ -5,7 +5,7 @@
 /**
  * Abstract data types whose instances are collections of other objects.
  *
- * Copyright: Eugene Wissner 2016-2017.
+ * Copyright: Eugene Wissner 2016-2018.
  * 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)
@@ -16,10 +16,10 @@ 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.string;
 public import tanya.container.queue;
+public import tanya.container.set;
+public import tanya.container.string;
 
 /**
  * Thrown if $(D_PSYMBOL Set) cannot insert a new element because the container

source/tanya/container/queue.d

@@ -5,18 +5,19 @@
 /**
  * FIFO queue.
  *
- * Copyright: Eugene Wissner 2016-2017.
+ * Copyright: Eugene Wissner 2016-2018.
  * 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)
  * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/container/queue.d,
  *                 tanya/container/queue.d)
  */
+deprecated("Use tanya.container.list.DList instead")
 module tanya.container.queue;
 
-import core.exception;
+import tanya.algorithm.mutation;
-import std.algorithm.mutation;
 import tanya.container.entry;
+import tanya.exception;
 import tanya.memory;
 import tanya.meta.trait;
 
@@ -167,7 +168,7 @@ struct Queue(T)
     {
         assert(!empty);
     }
-    body
+    do
     {
         auto n = first.next;
         T ret = move(first.content);
@@ -201,7 +202,7 @@ struct Queue(T)
     {
         int result;
 
-        for (size_t i = 0; !empty; ++i)
+        for (size_t i; !empty; ++i)
         {
             auto e = dequeue();
             if ((result = dg(i, e)) != 0)

source/tanya/container/set.d

@@ -6,7 +6,7 @@
  * This module implements a $(D_PSYMBOL Set) container that stores unique
  * values without any particular order.
  *
- * Copyright: Eugene Wissner 2017.
+ * Copyright: Eugene Wissner 2017-2018.
  * 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,7 +15,7 @@
  */
 module tanya.container.set;
 
-import std.algorithm.mutation;
+import tanya.algorithm.mutation;
 import tanya.container;
 import tanya.container.entry;
 import tanya.memory;
@@ -76,7 +76,7 @@ struct Range(E)
         assert(this.dataRange.empty
             || this.dataRange.back.status == BucketStatus.used);
     }
-    body
+    do
     {
         do
         {
@@ -96,7 +96,7 @@ struct Range(E)
         assert(this.dataRange.empty
             || this.dataRange.back.status == BucketStatus.used);
     }
-    body
+    do
     {
         do
         {
@@ -111,7 +111,7 @@ struct Range(E)
         assert(!this.dataRange.empty);
         assert(this.dataRange.front.status == BucketStatus.used);
     }
-    body
+    do
     {
         return dataRange.front.content;
     }
@@ -122,7 +122,7 @@ struct Range(E)
         assert(!this.dataRange.empty);
         assert(this.dataRange.back.status == BucketStatus.used);
     }
-    body
+    do
     {
         return dataRange.back.content;
     }
@@ -180,7 +180,7 @@ struct Set(T)
     {
         assert(allocator !is null);
     }
-    body
+    do
     {
         this(allocator);
         rehash(n);
@@ -192,7 +192,7 @@ struct Set(T)
     {
         assert(allocator !is null);
     }
-    body
+    do
     {
         this.data = typeof(this.data)(allocator);
     }
@@ -227,7 +227,7 @@ struct Set(T)
     {
         assert(allocator !is null);
     }
-    body
+    do
     {
         this.data = typeof(this.data)(init.data, allocator);
     }
@@ -239,7 +239,7 @@ struct Set(T)
     {
         assert(allocator !is null);
     }
-    body
+    do
     {
         this.data = typeof(this.data)(move(init.data), allocator);
         this.lengthIndex = init.lengthIndex;
@@ -285,7 +285,7 @@ struct Set(T)
     {
         assert(allocator !is null);
     }
-    body
+    do
     {
         return cast(shared Allocator) this.data.allocator;
     }
@@ -371,7 +371,7 @@ struct Set(T)
     {
         assert(buckets.length > 0);
     }
-    body
+    do
     {
         return hash % buckets.length;
     }
@@ -437,7 +437,7 @@ struct Set(T)
         InsertStatus status = insertInUnusedBucket(value);
         for (; !status; status = insertInUnusedBucket(value))
         {
-            if ((this.primes.length - 1) == this.lengthIndex)
+            if (this.primes.length == (this.lengthIndex + 1))
             {
                 throw make!HashContainerFullException(defaultAllocator,
                                                       "Set is full");

source/tanya/container/string.d

@@ -17,7 +17,7 @@
  * Internally $(D_PSYMBOL String) is represented by a sequence of
  * $(D_KEYWORD char)s.
  *
- * Copyright: Eugene Wissner 2017.
+ * Copyright: Eugene Wissner 2017-2018.
  * 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)
@@ -26,16 +26,20 @@
  */
 module tanya.container.string;
 
-import core.exception;
 import std.algorithm.comparison;
-import std.algorithm.mutation;
+import std.algorithm.mutation : bringToFront, copy;
 import std.algorithm.searching;
-import std.range : isInfinite, isInputRange, ElementEncodingType, hasLength,
+import tanya.algorithm.mutation;
-                   popFrontN, empty;
 import tanya.memory;
 import tanya.meta.trait;
 import tanya.meta.transform;
 import tanya.range.array;
+import tanya.range.primitive;
+
+version (unittest)
+{
+    import tanya.test.assertion;
+}
 
 /**
  * Thrown on encoding errors.
@@ -86,7 +90,7 @@ if (is(Unqual!E == char))
         assert(begin >= container.data);
         assert(end <= container.data + container.length);
     }
-    body
+    do
     {
         this.container = &container;
         this.begin = begin;
@@ -117,7 +121,7 @@ if (is(Unqual!E == char))
     {
         assert(!empty);
     }
-    body
+    do
     {
         return *this.begin;
     }
@@ -127,7 +131,7 @@ if (is(Unqual!E == char))
     {
         assert(!empty);
     }
-    body
+    do
     {
         return *(this.end - 1);
     }
@@ -137,7 +141,7 @@ if (is(Unqual!E == char))
     {
         assert(!empty);
     }
-    body
+    do
     {
         ++this.begin;
     }
@@ -147,7 +151,7 @@ if (is(Unqual!E == char))
     {
         assert(!empty);
     }
-    body
+    do
     {
         --this.end;
     }
@@ -157,7 +161,7 @@ if (is(Unqual!E == char))
     {
         assert(i < length);
     }
-    body
+    do
     {
         return *(this.begin + i);
     }
@@ -178,7 +182,7 @@ if (is(Unqual!E == char))
         assert(i <= j);
         assert(j <= length);
     }
-    body
+    do
     {
         return typeof(return)(*this.container, this.begin + i, this.begin + j);
     }
@@ -189,7 +193,7 @@ if (is(Unqual!E == char))
         assert(i <= j);
         assert(j <= length);
     }
-    body
+    do
     {
         return typeof(return)(*this.container, this.begin + i, this.begin + j);
     }
@@ -228,7 +232,7 @@ if (is(Unqual!E == char))
         assert(begin >= container.data);
         assert(end <= container.data + container.length);
     }
-    body
+    do
     {
         this.container = &container;
         this.begin = begin;
@@ -256,10 +260,11 @@ if (is(Unqual!E == char))
     {
         assert(chr < 0xd800 || chr > 0xdfff);
     }
-    body
+    do
     {
         dchar chr;
-        ubyte units, mask;
+        ubyte units;
+        int mask;
         const(char)* it = this.begin;
 
         if (*it & 0x80)
@@ -289,24 +294,24 @@ if (is(Unqual!E == char))
     {
         assert(!empty);
     }
-    body
+    do
     {
         ubyte units;
-        if ((*begin & 0x80) == 0)
+        if ((*begin & 0xf0) == 0xf0)
         {
-            units = 1;
+            units = 4;
-        }
-        else if ((*begin & 0xc0) == 0xc0)
-        {
-            units = 2;
         }
         else if ((*begin & 0xe0) == 0xe0)
         {
             units = 3;
         }
-        else if ((*begin & 0xf0) == 0xf0)
+        else if ((*begin & 0xc0) == 0xc0)
         {
-            units = 4;
+            units = 2;
+        }
+        else if ((*begin & 0x80) == 0)
+        {
+            units = 1;
         }
         if (units == 0 || this.begin + units > this.end)
         {
@@ -355,21 +360,21 @@ struct String
     this(S)(const S str, shared Allocator allocator = defaultAllocator)
     if (!isInfinite!S
      && isInputRange!S
-     && isSomeChar!(ElementEncodingType!S))
+     && isSomeChar!(ElementType!S))
     {
         this(allocator);
         insertBack(str);
     }
 
     ///
-    @safe @nogc unittest
+    @nogc pure @safe unittest
     {
         auto s = String("\u10437"w);
         assert(s == "\u10437");
     }
 
     ///
-    @safe @nogc unittest
+    @nogc pure @safe unittest
     {
         auto s = String("Отказаться от вина - в этом страшная вина."d);
         assert(s == "Отказаться от вина - в этом страшная вина.");
@@ -393,8 +398,7 @@ struct String
      *
      * Precondition: $(D_INLINECODE allocator is null).
      */
-    this(S)(S init, shared Allocator allocator = defaultAllocator)
+    this(S)(S init, shared Allocator allocator = defaultAllocator) @trusted
-    nothrow @trusted @nogc
     if (is(S == String))
     {
         this(allocator);
@@ -418,8 +422,7 @@ struct String
     }
 
     /// ditto
-    this(S)(ref S init, shared Allocator allocator = defaultAllocator)
+    this(S)(ref S init, shared Allocator allocator = defaultAllocator) @trusted
-    nothrow @trusted @nogc
     if (is(Unqual!S == String))
     {
         this(allocator);
@@ -429,12 +432,12 @@ struct String
     }
 
     /// ditto
-    this(shared Allocator allocator) pure nothrow @safe @nogc
+    this(shared Allocator allocator) @nogc nothrow pure @safe
     in
     {
         assert(allocator !is null);
     }
-    body
+    do
     {
         this.allocator_ = allocator;
     }
@@ -479,7 +482,7 @@ struct String
     }
 
     ///
-    @safe @nogc unittest
+    @nogc pure @safe unittest
     {
         {
             auto s = String(1, 'О');
@@ -495,28 +498,36 @@ struct String
         }
     }
 
-    @safe @nogc unittest
+    @nogc pure @safe unittest
     {
         auto s = String(0, 'K');
         assert(s.length == 0);
     }
 
+    this(this) @nogc nothrow pure @trusted
+    {
+        auto buf = this.data[0 .. this.length_];
+        this.length_ = capacity_ = 0;
+        this.data = null;
+        insertBack(buf);
+    }
+
     /**
      * Destroys the string.
      */
-    ~this() nothrow @trusted @nogc
+    ~this() @nogc nothrow pure @trusted
     {
         allocator.resize(this.data[0 .. this.capacity_], 0);
     }
 
     private void write4Bytes(ref const dchar src)
-    pure nothrow @trusted @nogc
+    @nogc nothrow pure @trusted
     in
     {
         assert(capacity - length >= 4);
         assert(src - 0x10000 < 0x100000);
     }
-    body
+    do
     {
         auto dst = this.data + length;
 
@@ -534,7 +545,7 @@ struct String
     {
         assert(capacity - length >= 3);
     }
-    body
+    do
     {
         auto dst = this.data + length;
         if (chr < 0x80)
@@ -571,7 +582,7 @@ struct String
      *
      * Throws: $(D_PSYMBOL UTFException).
      */
-    size_t insertBack(const char chr) @trusted @nogc
+    size_t insertBack(const char chr) @nogc pure @trusted
     {
         if ((chr & 0x80) != 0)
         {
@@ -586,7 +597,7 @@ struct String
     }
 
     /// ditto
-    size_t insertBack(const wchar chr) @trusted @nogc
+    size_t insertBack(const wchar chr) @nogc pure @trusted
     {
         reserve(length + 3);
 
@@ -599,29 +610,14 @@ struct String
     }
 
     // Allocates enough space for 3-byte character.
-    private @safe @nogc unittest
+    @nogc pure @safe unittest
     {
         String s;
         s.insertBack('\u8100');
     }
 
-    private @safe @nogc unittest
-    {
-        UTFException exception;
-        try
-        {
-            auto s = String(1, cast(wchar) 0xd900);
-        }
-        catch (UTFException e)
-        {
-            exception = e;
-        }
-        assert(exception !is null);
-        defaultAllocator.dispose(exception);
-    }
-
     /// ditto
-    size_t insertBack(const dchar chr) @trusted @nogc
+    size_t insertBack(const dchar chr) @nogc pure @trusted
     {
         reserve(length + dchar.sizeof);
 
@@ -641,19 +637,10 @@ struct String
         }
     }
 
-    private @safe @nogc unittest
+    @nogc pure @safe unittest
     {
-        UTFException exception;
+        assertThrown!UTFException(() => String(1, cast(dchar) 0xd900));
-        try
+        assertThrown!UTFException(() => String(1, cast(wchar) 0xd900));
-        {
-            auto s = String(1, cast(dchar) 0xd900);
-        }
-        catch (UTFException e)
-        {
-            exception = e;
-        }
-        assert(exception !is null);
-        defaultAllocator.dispose(exception);
     }
 
     /**
@@ -670,7 +657,7 @@ struct String
     size_t insertBack(R)(R str) @trusted
     if (!isInfinite!R
      && isInputRange!R
-     && is(Unqual!(ElementEncodingType!R) == char))
+     && is(Unqual!(ElementType!R) == char))
     {
         size_t size;
         static if (hasLength!R || isNarrowString!R)
@@ -734,7 +721,7 @@ struct String
     size_t insertBack(R)(R str) @trusted
     if (!isInfinite!R
      && isInputRange!R
-     && is(Unqual!(ElementEncodingType!R) == wchar))
+     && is(Unqual!(ElementType!R) == wchar))
     {
         static if (hasLength!R || isNarrowString!R)
         {
@@ -771,7 +758,7 @@ struct String
                     }
                     dchar d = (range[0] - 0xd800) | ((range[1] - 0xdc00) >> 10);
 
-                    range.popFrontN(2);
+                    popFrontN(range, 2);
                 }
                 else
                 {
@@ -800,7 +787,7 @@ struct String
     size_t insertBack(R)(R str) @trusted
     if (!isInfinite!R
      && isInputRange!R
-     && is(Unqual!(ElementEncodingType!R) == dchar))
+     && is(Unqual!(ElementType!R) == dchar))
     {
         static if (hasLength!R || isSomeString!R)
         {
@@ -828,7 +815,7 @@ struct String
      * Params:
      *  size = Desired size in bytes.
      */
-    void reserve(const size_t size) nothrow @trusted @nogc
+    void reserve(const size_t size) @nogc nothrow pure @trusted
     {
         if (this.capacity_ >= size)
         {
@@ -840,7 +827,7 @@ struct String
     }
 
     ///
-    @nogc @safe unittest
+    @nogc pure @safe unittest
     {
         String s;
         assert(s.capacity == 0);
@@ -864,7 +851,7 @@ struct String
      * Params:
      *  size = Desired size.
      */
-    void shrink(const size_t size) nothrow @trusted @nogc
+    void shrink(const size_t size) @nogc nothrow pure @trusted
     {
         if (this.capacity_ <= size)
         {
@@ -881,7 +868,7 @@ struct String
     }
 
     ///
-    @nogc @safe unittest
+    @nogc pure @safe unittest
     {
         auto s = String("Die Alten lasen laut.");
         assert(s.capacity == 21);
@@ -900,13 +887,13 @@ struct String
     /**
      * Returns: String capacity in bytes.
      */
-    @property size_t capacity() const pure nothrow @safe @nogc
+    @property size_t capacity() const @nogc nothrow pure @safe
     {
         return this.capacity_;
     }
 
     ///
-    @safe @nogc unittest
+    @nogc pure @safe unittest
     {
         auto s = String("In allem Schreiben ist Schamlosigkeit.");
         assert(s.capacity == 38);
@@ -928,7 +915,7 @@ struct String
      */
     ByCodeUnit!char opSliceAssign(R)(ByCodeUnit!R value,
                                      const size_t i,
-                                     const size_t j) @trusted
+                                     const size_t j)
     if (is(Unqual!R == char))
     in
     {
@@ -936,7 +923,7 @@ struct String
         assert(j <= length);
         assert(j - i == value.length);
     }
-    body
+    do
     {
         auto target = opSlice(i, j);
         copy(value, target);
@@ -947,13 +934,13 @@ struct String
     ByCodeUnit!char opSliceAssign(const char[] value,
                                   const size_t i,
                                   const size_t j)
-    pure nothrow @trusted @nogc
+    @nogc nothrow pure @trusted
     in
     {
         assert(i <= j);
         assert(j <= length);
     }
-    body
+    do
     {
         copy(value[], this.data[i .. j]);
         return opSlice(i, j);
@@ -963,13 +950,13 @@ struct String
     ByCodeUnit!char opSliceAssign(const char value,
                                   const size_t i,
                                   const size_t j)
-    pure nothrow @trusted @nogc
+    @nogc nothrow pure @trusted
     in
     {
         assert(i <= j);
         assert(j <= length);
     }
-    body
+    do
     {
         for (auto p = this.data + i; p < this.data + j; ++p)
         {
@@ -985,13 +972,13 @@ struct String
      *
      * Returns: The array representing the string.
      */
-    inout(char)[] get() inout pure nothrow @trusted @nogc
+    inout(char)[] get() inout @nogc nothrow pure @trusted
     {
         return this.data[0 .. this.length_];
     }
 
     ///
-    nothrow @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto s = String("Char array.");
         assert(s.get().length == 11);
@@ -1003,7 +990,7 @@ struct String
      *
      * Returns: Null-terminated string.
      */
-    const(char)* toStringz() nothrow @nogc
+    const(char)* toStringz() @nogc nothrow pure
     {
         reserve(length + 1);
         this.data[length] = '\0';
@@ -1011,7 +998,7 @@ struct String
     }
 
     ///
-    @nogc unittest
+    @nogc pure unittest
     {
         auto s = String("C string.");
         assert(s.toStringz()[0] == 'C');
@@ -1021,7 +1008,7 @@ struct String
     /**
      * Returns: The number of code units that are required to encode the string.
      */
-    @property size_t length() const pure nothrow @safe @nogc
+    @property size_t length() const @nogc nothrow pure @safe
     {
         return this.length_;
     }
@@ -1030,7 +1017,7 @@ struct String
     alias opDollar = length;
 
     ///
-    @safe @nogc unittest
+    @nogc pure @safe unittest
     {
         auto s = String("Piscis primuin a capite foetat.");
         assert(s.length == 31);
@@ -1045,18 +1032,18 @@ struct String
      *
      * Precondition: $(D_INLINECODE length > pos).
      */
-    ref inout(char) opIndex(const size_t pos) inout pure nothrow @trusted @nogc
+    ref inout(char) opIndex(const size_t pos) inout @nogc nothrow pure @trusted
     in
     {
         assert(length > pos);
     }
-    body
+    do
     {
         return *(this.data + pos);
     }
 
     ///
-    @safe @nogc unittest
+    @nogc pure @safe unittest
     {
         auto s = String("Alea iacta est.");
         assert(s[0] == 'A');
@@ -1067,7 +1054,7 @@ struct String
      * Returns: Random access range that iterates over the string by bytes, in
      *          forward order.
      */
-    ByCodeUnit!char opIndex() pure nothrow @trusted @nogc
+    ByCodeUnit!char opIndex() @nogc nothrow pure @trusted
     {
         return typeof(return)(this, this.data, this.data + length);
     }
@@ -1079,7 +1066,7 @@ struct String
     }
 
     ///
-    @safe @nogc unittest
+    @nogc pure @safe unittest
     {
         auto s = String("Plutarchus");
         auto r = s[];
@@ -1097,30 +1084,41 @@ struct String
         assert(r.length == 8);
     }
 
+    ///
+    @nogc pure @safe unittest
+    {
+        auto s = const String("Was ich vermag, soll gern geschehen. Goethe");
+        auto r1 = s[];
+        assert(r1.front == 'W');
+
+        auto r2 = r1[];
+        r1.popFront();
+        assert(r1.front == 'a');
+        assert(r2.front == 'W');
+    }
+
     /**
      * Returns: Forward range that iterates over the string by code points.
      */
-    ByCodePoint!char byCodePoint() pure nothrow @trusted @nogc
+    ByCodePoint!char byCodePoint() @nogc nothrow pure @trusted
     {
         return typeof(return)(this, this.data, this.data + length);
     }
 
     /// ditto
-    ByCodePoint!(const char) byCodePoint() const pure nothrow @trusted @nogc
+    ByCodePoint!(const char) byCodePoint() const @nogc nothrow pure @trusted
     {
         return typeof(return)(this, this.data, this.data + length);
     }
 
     ///
-    @safe @nogc unittest
+    @nogc pure @safe unittest
     {
-        auto s = String("Высоцкий");
+        auto s = String("Мне есть, что спеть, представ перед Всевышним.");
         auto cp = s.byCodePoint();
-        assert(cp.front == 'В');
+        assert(cp.front == 'М');
         cp.popFront();
-        assert(cp.front == 'ы');
+        assert(cp.front == 'н');
-        cp.popFront();
-        assert(cp.front == 'с');
 
         s = String("€");
         cp = s.byCodePoint();
@@ -1133,16 +1131,37 @@ struct String
         assert(s.length == 4);
     }
 
+    ///
+    @nogc pure @safe unittest
+    {
+        auto s = const String("Высоцкий");
+        auto cp1 = s.byCodePoint();
+        assert(cp1.front == 'В');
+
+        auto cp2 = cp1[];
+        cp1.popFront();
+        assert(cp1.front == 'ы');
+        assert(cp2.front == 'В');
+
+        cp2 = cp1.save();
+        cp1.popFront();
+        assert(cp1.front == 'с');
+        assert(cp2.front == 'ы');
+    }
+
     /**
-     * Returns: $(D_KEYWORD true) if the string is empty.
+     * Returns whether the string is empty.
+     *
+     * Returns: $(D_KEYWORD true) if the string is empty, $(D_KEYWORD false)
+     *          otherwise.
      */
-    @property bool empty() const pure nothrow @safe @nogc
+    @property bool empty() const @nogc nothrow pure @safe
     {
         return length == 0;
     }
 
     ///
-    @safe @nogc unittest
+    @nogc pure @safe unittest
     {
         String s;
         assert(s.empty);
@@ -1162,32 +1181,32 @@ struct String
      * Precondition: $(D_INLINECODE i <= j && j <= length).
      */
     ByCodeUnit!char opSlice(const size_t i, const size_t j)
-    pure nothrow @trusted @nogc
+    @nogc nothrow pure @trusted
     in
     {
         assert(i <= j);
         assert(j <= length);
     }
-    body
+    do
     {
         return typeof(return)(this, this.data + i, this.data + j);
     }
 
     /// ditto
     ByCodeUnit!(const char) opSlice(const size_t i, const size_t j)
-    const pure nothrow @trusted @nogc
+    const @nogc nothrow pure @trusted
     in
     {
         assert(i <= j);
         assert(j <= length);
     }
-    body
+    do
     {
         return typeof(return)(this, this.data + i, this.data + j);
     }
 
     ///
-    @safe @nogc unittest
+    @nogc pure @safe unittest
     {
         auto s = String("Vladimir Soloviev");
         auto r = s[9 .. $];
@@ -1251,7 +1270,7 @@ struct String
     }
 
     ///
-    @safe @nogc unittest
+    @nogc pure @safe unittest
     {
         auto s = String("Черная, потом пропахшая выть!");
         s = String("Как мне тебя не ласкать, не любить?");
@@ -1268,10 +1287,10 @@ struct String
      *
      * Throws: $(D_PSYMBOL UTFException).
      */
-    ref String opAssign(S)(S that) nothrow
+    ref String opAssign(S)(S that)
     if (!isInfinite!S
      && isInputRange!S
-     && isSomeChar!(ElementEncodingType!S))
+     && isSomeChar!(ElementType!S))
     {
         this.length_ = 0;
         insertBack(that);
@@ -1279,7 +1298,7 @@ struct String
     }
 
     ///
-    @safe @nogc unittest
+    @nogc pure @safe unittest
     {
         auto s = String("Оловом светится лужная голь...");
         s = "Грустная песня, ты - русская боль.";
@@ -1324,7 +1343,7 @@ struct String
     }
 
     ///
-    @safe @nogc unittest
+    @nogc pure @safe unittest
     {
         assert(String("Голубая кофта.") < String("Синие глаза."));
         assert(String("Никакой я правды") < String("милой не сказал")[]);
@@ -1377,7 +1396,7 @@ struct String
     }
 
     ///
-    @safe @nogc unittest
+    @nogc pure @safe unittest
     {
         assert(String("Милая спросила:") != String("Крутит ли метель?"));
         assert(String("Затопить бы печку,") != String("постелить постель.")[]);
@@ -1404,13 +1423,13 @@ struct String
      * Precondition: $(D_INLINECODE length > pos).
      */
     ref char opIndexAssign(const char value, const size_t pos)
-    pure nothrow @safe @nogc
+    @nogc nothrow pure @safe
     {
         return opIndex(pos) = value;
     }
 
     ///
-    @safe @nogc unittest
+    @nogc pure @safe unittest
     {
         auto s = String("alea iacta est.");
 
@@ -1435,7 +1454,7 @@ struct String
         return opSliceAssign(value, 0, length);
     }
 
-    private unittest
+    @nogc pure @safe unittest
     {
         auto s1 = String("Buttercup");
         auto s2 = String("Cap");
@@ -1444,12 +1463,12 @@ struct String
     }
 
     /// ditto
-    ByCodeUnit!char opIndexAssign(const char value) pure nothrow @safe @nogc
+    ByCodeUnit!char opIndexAssign(const char value) @nogc nothrow pure @safe
     {
         return opSliceAssign(value, 0, length);
     }
 
-    private unittest
+    @nogc pure @safe unittest
     {
         auto s1 = String("Wow");
         s1[] = 'a';
@@ -1457,12 +1476,12 @@ struct String
     }
 
     /// ditto
-    ByCodeUnit!char opIndexAssign(const char[] value) pure nothrow @safe @nogc
+    ByCodeUnit!char opIndexAssign(const char[] value) @nogc nothrow pure @safe
     {
         return opSliceAssign(value, 0, length);
     }
 
-    private unittest
+    @nogc pure @safe unittest
     {
         auto s1 = String("ö");
         s1[] = "oe";
@@ -1489,7 +1508,7 @@ struct String
         assert(r.begin >= this.data);
         assert(r.end <= this.data + length);
     }
-    body
+    do
     {
         auto end = this.data + this.length;
         copy(ByCodeUnit!char(this, r.end, end), ByCodeUnit!char(this, r.begin, end));
@@ -1498,7 +1517,7 @@ struct String
     }
 
     ///
-    @nogc @safe unittest
+    @nogc pure @safe unittest
     {
         auto s = String("Из пословицы слова не выкинешь.");
 
@@ -1507,7 +1526,7 @@ struct String
         assert(s.length == 38);
 
         auto byCodePoint = s.byCodePoint();
-        byCodePoint.popFrontN(8);
+        popFrontN(byCodePoint, 8);
 
         assert(s.remove(byCodePoint).count == 0);
         assert(s == "Из слова");
@@ -1534,7 +1553,7 @@ struct String
     size_t insertAfter(T, R)(R r, T el) @trusted
     if ((isSomeChar!T || (!isInfinite!T
      && isInputRange!T
-     && isSomeChar!(ElementEncodingType!T)))
+     && isSomeChar!(ElementType!T)))
      && (is(R == ByCodeUnit!char) || is(R == ByCodePoint!char)))
     in
     {
@@ -1542,17 +1561,19 @@ struct String
         assert(r.begin >= this.data);
         assert(r.end <= this.data + length);
     }
-    body
+    do
     {
-        auto oldLen = this.data + length;
+        const oldLength = length;
+        const rangeEnd = r.end - this.data;
         const inserted = insertBack(el);
-        bringToFront(ByCodeUnit!char(this, r.end, oldLen),
+        auto containerEnd = this.data + oldLength;
-                     ByCodeUnit!char(this, oldLen, this.data + length));
+        bringToFront(ByCodeUnit!char(this, this.data + rangeEnd, containerEnd),
+                     ByCodeUnit!char(this, containerEnd, this.data + length));
         return inserted;
     }
 
     ///
-    @safe @nogc unittest
+    @nogc pure @safe unittest
     {
         auto s = String("Казнить нельзя помиловать.");
         s.insertAfter(s[0 .. 27], ",");
@@ -1567,7 +1588,7 @@ struct String
     size_t insertBefore(T, R)(R r, T el) @trusted
     if ((isSomeChar!T || (!isInfinite!T
      && isInputRange!T
-     && isSomeChar!(ElementEncodingType!T)))
+     && isSomeChar!(ElementType!T)))
      && (is(R == ByCodeUnit!char) || is(R == ByCodePoint!char)))
     in
     {
@@ -1575,13 +1596,13 @@ struct String
         assert(r.begin >= this.data);
         assert(r.end <= this.data + length);
     }
-    body
+    do
     {
         return insertAfter(R(this, this.data, r.begin), el);
     }
 
     ///
-    @safe @nogc unittest
+    @nogc pure @safe unittest
     {
         auto s = String("Казнить нельзя помиловать.");
         s.insertBefore(s[27 .. $], ",");
@@ -1594,3 +1615,67 @@ struct String
 
     mixin DefaultAllocator;
 }
+
+// Postblit works.
+@nogc pure @safe unittest
+{
+    void internFunc(String arg)
+    {
+    }
+    void middleFunc(S...)(S args)
+    {
+        foreach (arg; args)
+        {
+            internFunc(arg);
+        }
+    }
+    void topFunc(String args)
+    {
+        middleFunc(args);
+    }
+    topFunc(String("asdf"));
+}
+
+// Const range produces mutable ranges.
+@nogc pure @safe unittest
+{
+    auto s = const String("И снизу лед, и сверху - маюсь между.");
+    {
+        const constRange = s[];
+
+        auto fromConstRange = constRange[];
+        fromConstRange.popFront();
+        assert(fromConstRange.front == s[1]);
+
+        fromConstRange = constRange[0 .. $];
+        fromConstRange.popFront();
+        assert(fromConstRange.front == s[1]);
+
+        assert(constRange.get() is s.get());
+    }
+    {
+        const constRange = s.byCodePoint();
+
+        auto fromConstRange = constRange[];
+        fromConstRange.popFront();
+        assert(fromConstRange.front == ' ');
+    }
+}
+
+// Can pop multibyte characters.
+@nogc pure @safe unittest
+{
+    auto s = String("\U00024B62\U00002260");
+    auto range = s.byCodePoint();
+
+    range.popFront();
+    assert(!range.empty);
+
+    range.popFront();
+    assert(range.empty);
+
+    range = s.byCodePoint();
+    range.popFront();
+    s[$ - 3] = 0xf0;
+    assertThrown!UTFException(&(range.popFront));
+}

source/tanya/conv.d

@@ -8,18 +8,241 @@
  * Copyright: Eugene Wissner 2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
- * Authors: Jeff Roberts, $(LINK2 mailto:info@caraus.de, Eugene Wissner)
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/format/conv.d,
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/conv.d,
- *                 tanya/format/conv.d)
+ *                 tanya/conv.d)
  */
-module tanya.format.conv;
+module tanya.conv;
 
 import tanya.container.string;
+import tanya.format;
 import tanya.memory;
 import tanya.memory.op;
 import tanya.meta.trait;
 import tanya.meta.transform;
 
+version (unittest)
+{
+    import tanya.test.assertion;
+}
+
+/**
+ * Constructs a new object of type $(D_PARAM T) in $(D_PARAM memory) with the
+ * given arguments.
+ *
+ * If $(D_PARAM T) is a $(D_KEYWORD class), emplace returns a class reference
+ * of type $(D_PARAM T), otherwise a pointer to the constructed object is
+ * returned.
+ *
+ * If $(D_PARAM T) is a nested class inside another class, $(D_PARAM outer)
+ * should be an instance of the outer class.
+ *
+ * $(D_PARAM args) are arguments for the constructor of $(D_PARAM T). If
+ * $(D_PARAM T) isn't an aggregate type and doesn't have a constructor,
+ * $(D_PARAM memory) can be initialized to `args[0]` if `Args.length == 1`,
+ * `Args[0]` should be implicitly convertible to $(D_PARAM T) then.
+ *
+ * Params:
+ *  T     = Constructed type.
+ *  U     = Type of the outer class if $(D_PARAM T) is a nested class.
+ *  Args  = Types of the constructor arguments if $(D_PARAM T) has a constructor
+ *          or the type of the initial value.
+ *  outer = Outer class instance if $(D_PARAM T) is a nested class.
+ *  args  = Constructor arguments if $(D_PARAM T) has a constructor or the
+ *          initial value.
+ *
+ * Returns: New instance of type $(D_PARAM T) constructed in $(D_PARAM memory).
+ *
+ * Precondition: `memory.length == stateSize!T`.
+ * Postcondition: $(D_PARAM memory) and the result point to the same memory.
+ */
+T emplace(T, U, Args...)(void[] memory, U outer, auto ref Args args)
+if (!isAbstractClass!T && isInnerClass!T && is(typeof(T.outer) == U))
+in
+{
+    assert(memory.length >= stateSize!T);
+}
+out (result)
+{
+    assert(memory.ptr is (() @trusted => cast(void*) result)());
+}
+do
+{
+    copy(typeid(T).initializer, memory);
+
+    auto result = (() @trusted => cast(T) memory.ptr)();
+    result.outer = outer;
+
+    static if (is(typeof(result.__ctor(args))))
+    {
+        result.__ctor(args);
+    }
+
+    return result;
+}
+
+/// ditto
+T emplace(T, Args...)(void[] memory, auto ref Args args)
+if (is(T == class) && !isAbstractClass!T && !isInnerClass!T)
+in
+{
+    assert(memory.length == stateSize!T);
+}
+out (result)
+{
+    assert(memory.ptr is (() @trusted => cast(void*) result)());
+}
+do
+{
+    copy(typeid(T).initializer, memory);
+
+    auto result = (() @trusted => cast(T) memory.ptr)();
+    static if (is(typeof(result.__ctor(args))))
+    {
+        result.__ctor(args);
+    }
+    return result;
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    import tanya.memory : stateSize;
+
+    class C
+    {
+        int i = 5;
+        class Inner
+        {
+            int i;
+
+            this(int param) pure nothrow @safe @nogc
+            {
+                this.i = param;
+            }
+        }
+    }
+    ubyte[stateSize!C] memory1;
+    ubyte[stateSize!(C.Inner)] memory2;
+
+    auto c = emplace!C(memory1);
+    assert(c.i == 5);
+
+    auto inner = emplace!(C.Inner)(memory2, c, 8);
+    assert(c.i == 5);
+    assert(inner.i == 8);
+    assert(inner.outer is c);
+}
+
+/// ditto
+T* emplace(T, Args...)(void[] memory, auto ref Args args)
+if (!isAggregateType!T && (Args.length <= 1))
+in
+{
+    assert(memory.length >= T.sizeof);
+}
+out (result)
+{
+    assert(memory.ptr is result);
+}
+do
+{
+    auto result = (() @trusted => cast(T*) memory.ptr)();
+    static if (Args.length == 1)
+    {
+        *result = T(args[0]);
+    }
+    else
+    {
+        *result = T.init;
+    }
+    return result;
+}
+
+/// ditto
+T* emplace(T, Args...)(void[] memory, auto ref Args args)
+if (!isPolymorphicType!T && isAggregateType!T)
+in
+{
+    assert(memory.length >= T.sizeof);
+}
+out (result)
+{
+    assert(memory.ptr is result);
+}
+do
+{
+    auto result = (() @trusted => cast(T*) memory.ptr)();
+    static if (!hasElaborateAssign!T && isAssignable!T)
+    {
+        *result = T.init;
+    }
+    else
+    {
+        static const T init = T.init;
+        copy((cast(void*) &init)[0 .. T.sizeof], memory);
+    }
+
+    static if (Args.length == 0)
+    {
+        static assert(is(typeof({ static T t; })),
+                      "Default constructor is disabled");
+    }
+    else static if (is(typeof(T(args))))
+    {
+        *result = T(args);
+    }
+    else static if (is(typeof(result.__ctor(args))))
+    {
+        result.__ctor(args);
+    }
+    else
+    {
+        static assert(false,
+                      "Unable to construct value with the given arguments");
+    }
+    return result;
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    ubyte[4] memory;
+
+    auto i = emplace!int(memory);
+    static assert(is(typeof(i) == int*));
+    assert(*i == 0);
+
+    i = emplace!int(memory, 5);
+    assert(*i == 5);
+
+    static struct S
+    {
+        int i;
+        @disable this();
+        @disable this(this);
+        this(int i) @nogc nothrow pure @safe
+        {
+            this.i = i;
+        }
+    }
+    auto s = emplace!S(memory, 8);
+    static assert(is(typeof(s) == S*));
+    assert(s.i == 8);
+}
+
+// Handles "Cannot access frame pointer" error.
+@nogc nothrow pure @safe unittest
+{
+    struct F
+    {
+        ~this() @nogc nothrow pure @safe
+        {
+        }
+    }
+    static assert(is(typeof(emplace!F((void[]).init))));
+}
+
 /**
  * Thrown if a type conversion fails.
  */
@@ -73,14 +296,14 @@ template to(To)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     auto val = 5.to!int();
     assert(val == 5);
     static assert(is(typeof(val) == int));
 }
 
-private pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     int val = 5;
     assert(val.to!int() == 5);
@@ -148,7 +371,7 @@ if (isIntegral!From
     }
 }
 
-private pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     // ubyte -> ushort
     assert((cast(ubyte) 0).to!ushort == 0);
@@ -163,7 +386,7 @@ private pure nothrow @safe @nogc unittest
     assert((cast(ubyte) ubyte.max).to!short == ubyte.max);
 }
 
-private unittest
+@nogc pure @safe unittest
 {
     // ubyte <- ushort
     assert((cast(ushort) 0).to!ubyte == 0);
@@ -206,67 +429,15 @@ private unittest
     assert((cast(int) int.max).to!uint == int.max);
 }
 
-private unittest
+@nogc pure @safe unittest
 {
-    ConvException exception;
+    assertThrown!ConvException(&to!(short, int), int.min);
-    try
+    assertThrown!ConvException(&to!(short, int), int.max);
-    {
+    assertThrown!ConvException(&to!(ushort, uint), uint.max);
-        assert(int.min.to!short == int.min);
+    assertThrown!ConvException(&to!(uint, int), -1);
-    }
-    catch (ConvException e)
-    {
-        exception = e;
-    }
-    assert(exception !is null);
-    defaultAllocator.dispose(exception);
 }
 
-private unittest
+@nogc nothrow pure @safe 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
     {
@@ -277,6 +448,106 @@ private @nogc unittest
     assert(Test.two.to!int == 1);
 }
 
+/**
+ * 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 pure @safe 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);
+}
+
+@nogc pure @safe unittest
+{
+    assertThrown!ConvException(&to!(int, double), 2147483647.5);
+    assertThrown!ConvException(&to!(int, double), -2147483648.5);
+    assertThrown!ConvException(&to!(uint, double), -21474.5);
+}
+
+/**
+ * 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 pure @safe 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);
+}
+
+@nogc pure @safe unittest
+{
+    enum Test : uint
+    {
+        one,
+        two,
+    }
+    assertThrown!ConvException(&to!(Test, int), 5);
+}
+
 /**
  * Converts $(D_PARAM from) to a boolean.
  *
@@ -317,7 +588,7 @@ if (isNumeric!From && is(Unqual!To == bool) && !is(Unqual!To == Unqual!From))
 }
 
 ///
-@nogc unittest
+@nogc pure @safe unittest
 {
     assert(!0.0.to!bool);
     assert(0.2.to!bool);
@@ -328,34 +599,10 @@ if (isNumeric!From && is(Unqual!To == bool) && !is(Unqual!To == Unqual!From))
     assert(1.to!bool);
 }
 
-private @nogc unittest
+@nogc pure @safe unittest
 {
-    ConvException exception;
+    assertThrown!ConvException(&to!(bool, int), -1);
-    try
+    assertThrown!ConvException(&to!(bool, int), 2);
-    {
-        assert((-1).to!bool);
-    }
-    catch (ConvException e)
-    {
-        exception = e;
-    }
-    assert(exception !is null);
-    defaultAllocator.dispose(exception);
-}
-
-private @nogc unittest
-{
-    ConvException exception;
-    try
-    {
-        assert(2.to!bool);
-    }
-    catch (ConvException e)
-    {
-        exception = e;
-    }
-    assert(exception !is null);
-    defaultAllocator.dispose(exception);
 }
 
 /// ditto
@@ -375,7 +622,7 @@ if ((is(From == String) || isSomeString!From) && is(Unqual!To == bool))
 }
 
 ///
-@nogc unittest
+@nogc pure @safe unittest
 {
     assert("true".to!bool);
     assert(!"false".to!bool);
@@ -384,19 +631,9 @@ if ((is(From == String) || isSomeString!From) && is(Unqual!To == bool))
 
 }
 
-private @nogc unittest
+@nogc pure @safe unittest
 {
-    ConvException exception;
+    assertThrown!ConvException(() => "1".to!bool);
-    try
-    {
-        assert("1".to!bool);
-    }
-    catch (ConvException e)
-    {
-        exception = e;
-    }
-    assert(exception !is null);
-    defaultAllocator.dispose(exception);
 }
 
 /**
@@ -415,14 +652,14 @@ private @nogc unittest
  *
  * Returns: $(D_PARAM from) converted to $(D_PARAM To).
  */
-To to(To, From)(const From from)
+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
+@nogc nothrow pure @safe unittest
 {
     assert(true.to!float == 1.0);
     assert(true.to!double == 1.0);
@@ -443,249 +680,31 @@ pure nothrow @safe @nogc unittest
     assert(false.to!int == 0);
 }
 
-/// ditto
+/**
-To to(To, From)(const From from)
+ * Converts $(D_PARAM From) to a $(D_PSYMBOL String).
-if (is(Unqual!From == bool) && is(Unqual!To == String))
+ *
+ * Params:
+ *  From = Source type.
+ *  To   = Target type.
+ *  from = Source value.
+ *
+ * Returns: $(D_PARAM from) converted to $(D_PSYMBOL String).
+ */
+To to(To, From)(auto ref From from)
+if (is(Unqual!To == String))
 {
-    return String(from ? "true" : "false");
+    return format!"{}"(from);
 }
 
 ///
-@nogc unittest
+@nogc nothrow pure @safe unittest
 {
     assert(true.to!String == "true");
     assert(false.to!String == "false");
 }
 
-private @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(typeof((const String("true")).to!bool)));
     static assert(is(typeof(false.to!(const String) == "false")));
 }
-
-/**
- * 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);
-}
-
-// Returns the last part of buffer with converted number.
-package(tanya) char[] number2String(T)(const T number,
-                                       return ref char[21] buffer)
-if (isIntegral!T)
-{
-    // abs the integer.
-    ulong n64 = number < 0 ? -cast(long) number : number;
-
-    char* start = buffer[].ptr + buffer.sizeof - 1;
-
-    while (true)
-    {
-        // Do in 32-bit chunks (avoid lots of 64-bit divides even with constant
-        // denominators).
-        char* o = start - 8;
-        uint n;
-        if (n64 >= 100000000)
-        {
-            n = n64 % 100000000;
-            n64 /= 100000000;
-        }
-        else
-        {
-            n = cast(uint) n64;
-            n64 = 0;
-        }
-
-        while (n)
-        {
-            *--start = cast(char) (n % 10) + '0';
-            n /= 10;
-        }
-        // Ignore the leading zero if it was the last part of the integer.
-        if (n64 == 0)
-        {
-            if ((start[0] == '0')
-             && (start != (buffer[].ptr + buffer.sizeof -1)))
-            {
-                ++start;
-            }
-            break;
-        }
-        // Copy leading zeros if it wasn't the most significant part of the
-        // integer.
-        while (start != o)
-        {
-            *--start = '0';
-        }
-    }
-
-    // Get the length that we have copied.
-    uint l = cast(uint) ((buffer[].ptr + buffer.sizeof - 1) - start);
-    if (l == 0)
-    {
-        *--start = '0';
-        l = 1;
-    }
-    else if (number < 0) // Set the sign.
-    {
-        *--start = '-';
-        ++l;
-    }
-
-    return buffer[$ - l - 1 .. $ - 1];
-}
-
-// Converting an integer to string.
-private pure nothrow @system @nogc unittest
-{
-    char[21] buf;
-
-    assert(number2String(80, buf) == "80");
-    assert(number2String(-80, buf) == "-80");
-    assert(number2String(0, buf) == "0");
-    assert(number2String(uint.max, buf) == "4294967295");
-    assert(number2String(int.min, buf) == "-2147483648");
-}

source/tanya/encoding/ascii.d

@@ -21,7 +21,7 @@ import tanya.meta.trait;
 
 const string fullHexDigits = "0123456789ABCDEFabcdef"; /// 0..9A..Fa..f.
 const string hexDigits = "0123456789ABCDEF"; /// 0..9A..F.
-const string lowerHexDigits = "0123456789ABCDEF"; /// 0..9a..f.
+const string lowerHexDigits = "0123456789abcdef"; /// 0..9a..f.
 const string digits = "0123456789"; /// 0..9.
 const string octalDigits = "01234567"; /// 0..7.
 

source/tanya/exception.d

@@ -0,0 +1,66 @@
+/* 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/. */
+
+/**
+ * Common exceptions and errors.
+ *
+ * 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)
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/exception.d,
+ *                 tanya/exception.d)
+ */
+module tanya.exception;
+
+import tanya.conv;
+import tanya.memory;
+
+/**
+ * Error thrown if memory allocation fails.
+ */
+final class OutOfMemoryError : Error
+{
+    /**
+     * Constructs new error.
+     *
+     * 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 = "Out of memory",
+         string file = __FILE__,
+         size_t line = __LINE__,
+         Throwable next = null) @nogc nothrow pure @safe
+    {
+        super(msg, file, line, next);
+    }
+
+    /// ditto
+    this(string msg,
+         Throwable next,
+         string file = __FILE__,
+         size_t line = __LINE__) @nogc nothrow pure @safe
+    {
+        super(msg, file, line, next);
+    }
+}
+
+/**
+ * Allocates $(D_PSYMBOL OutOfMemoryError) in a static storage and throws it.
+ *
+ * Params:
+ *  msg = Custom error message.
+ *
+ * Throws: $(D_PSYMBOL OutOfMemoryError).
+ */
+void onOutOfMemoryError(string msg = "Out of memory")
+@nogc nothrow pure @trusted
+{
+    static ubyte[stateSize!OutOfMemoryError] memory;
+    alias PureType = OutOfMemoryError function(string) @nogc nothrow pure;
+    throw (cast(PureType) () => emplace!OutOfMemoryError(memory))(msg);
+}

source/tanya/hash/lookup.d

@@ -0,0 +1,622 @@
+/* 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/. */
+
+/**
+ * Non-cryptographic, lookup hash functions.
+ *
+ * Copyright: Eugene Wissner 2018.
+ * 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)
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/hash/lookup.d,
+ *                 tanya/hash/lookup.d)
+ */
+module tanya.hash.lookup;
+
+import tanya.meta.trait;
+import tanya.range.primitive;
+
+private struct FNV
+{
+    static if (size_t.sizeof == 4)
+    {
+        enum uint offsetBasis = 2166136261;
+        enum uint prime = 16777619;
+    }
+    else static if (size_t.sizeof == 8)
+    {
+        enum ulong offsetBasis = 14695981039346656037UL;
+        enum ulong prime = 1099511628211UL;
+    }
+    else
+    {
+        static assert(false, "FNV requires at least 32-bit hash length");
+    }
+
+    size_t hash = offsetBasis;
+
+    void opCall(T)(auto ref T key)
+    {
+        static if (is(typeof(key.toHash()) == size_t))
+        {
+            opCall(key.toHash()); // Combine user-defined hashes
+        }
+        else static if (isScalarType!T || isPointer!T)
+        {
+            (() @trusted => add((cast(const ubyte*) &key)[0 .. T.sizeof]))();
+        }
+        else static if (isArray!T && isScalarType!(ElementType!T))
+        {
+            add(cast(const ubyte[]) key);
+        }
+        else static if (is(T == typeof(null)))
+        {
+            add(key);
+        }
+        else static if (isInputRange!T && !isInfinite!T)
+        {
+            foreach (e; key)
+            {
+                opCall(e);
+            }
+        }
+        else
+        {
+            static assert(false, "Hash function is not available");
+        }
+    }
+
+    void add(const ubyte[] key) @nogc nothrow pure @safe
+    {
+        foreach (c; key)
+        {
+            this.hash = (this.hash ^ c) * prime;
+        }
+    }
+}
+
+/**
+ * Takes an a argument of an arbitrary type $(D_PARAM T) and calculates the hash value.
+ *
+ * Hash calculation is supported for all scalar types. Aggregate types, like
+ *$(D_KEYWORD struct)s should implement `toHash`-function:
+ * ---
+ * size_t toHash() const
+ * {
+ *  return hash;
+ * }
+ * ---
+ *
+ * For scalar types FNV-1a (Fowler-Noll-Vo) hash function is used internally.
+ * If the type provides a `toHash`-function, only `toHash()` is called and its
+ * result is returned.
+ *
+ * This function also accepts input ranges that contain hashable elements.
+ * Individual values are combined then and the resulting hash is returned.
+ *
+ * Params:
+ *  T = Hashable type.
+ *  key = Hashable value.
+ *
+ * Returns: Calculated hash value.
+ *
+ * See_Also: $(LINK http://www.isthe.com/chongo/tech/comp/fnv/).
+ */
+size_t hash(T)(auto ref T key)
+{
+    static if (is(typeof(key.toHash()) == size_t))
+    {
+        return key.toHash();
+    }
+    else
+    {
+        FNV fnv;
+        fnv(key);
+        return fnv.hash;
+    }
+}
+
+version (unittest)
+{
+    enum string r10(string x) = x ~ x ~ x ~ x ~ x ~ x ~ x ~ x ~ x ~ x;
+    enum string r100(string x) = r10!x ~ r10!x ~ r10!x ~ r10!x ~ r10!x
+                               ~ r10!x ~ r10!x ~ r10!x ~ r10!x ~ r10!x;
+    enum string r500(string x) = r100!x ~ r100!x ~ r100!x ~ r100!x ~ r100!x;
+
+    private struct ToHash
+    {
+        size_t toHash() const @nogc nothrow pure @safe
+        {
+            return 0;
+        }
+    }
+
+    private struct HashRange
+    {
+        string fo = "fo";
+
+        @property ubyte front() const @nogc nothrow pure @safe
+        {
+            return this.fo[0];
+        }
+
+        void popFront() @nogc nothrow pure @safe
+        {
+            this.fo = this.fo[1 .. $];
+        }
+
+        @property bool empty() const @nogc nothrow pure @safe
+        {
+            return this.fo.length == 0;
+        }
+    }
+
+    private struct ToHashRange
+    {
+        bool empty_;
+
+        @property ToHash front() const @nogc nothrow pure @safe
+        {
+            return ToHash();
+        }
+
+        void popFront() @nogc nothrow pure @safe
+        {
+            this.empty_ = true;
+        }
+
+         @property bool empty() const @nogc nothrow pure @safe
+         {
+             return this.empty_;
+         }
+    }
+}
+
+// Tests that work for any hash size
+@nogc nothrow pure @safe unittest
+{
+    assert(hash(null) == FNV.offsetBasis);
+    assert(hash(ToHash()) == 0U);
+}
+
+static if (size_t.sizeof == 4) @nogc nothrow pure @safe unittest
+{
+    assert(hash('a') == 0xe40c292cU);
+    assert(hash(HashRange()) == 0x6222e842U);
+    assert(hash(ToHashRange()) == 1268118805U);
+}
+static if (size_t.sizeof == 8) @nogc nothrow pure @safe unittest
+{
+    assert(hash('a') == 0xaf63dc4c8601ec8cUL);
+    assert(hash(HashRange()) == 0x08985907b541d342UL);
+    assert(hash(ToHashRange()) == 12161962213042174405UL);
+}
+
+static if (size_t.sizeof == 4) @nogc nothrow pure @system unittest
+{
+    assert(hash(cast(void*) 0x6e6f6863) == 0xac297727U);
+}
+static if (size_t.sizeof == 8) @nogc nothrow pure @system unittest
+{
+    assert(hash(cast(void*) 0x77206f676e6f6863) == 0xd1edd10b507344d0UL);
+}
+
+/*
+ * These are official FNV-1a test vectors and they are in the public domain.
+ */
+// FNV-1a 32 bit test vectors
+static if (size_t.sizeof == 4) @nogc nothrow pure @safe unittest
+{
+    assert(hash("") == 0x811c9dc5U);
+    assert(hash("a") == 0xe40c292cU);
+    assert(hash("b") == 0xe70c2de5U);
+    assert(hash("c") == 0xe60c2c52U);
+    assert(hash("d") == 0xe10c2473U);
+    assert(hash("e") == 0xe00c22e0U);
+    assert(hash("f") == 0xe30c2799U);
+    assert(hash("fo") == 0x6222e842U);
+    assert(hash("foo") == 0xa9f37ed7U);
+    assert(hash("foob") == 0x3f5076efU);
+    assert(hash("fooba") == 0x39aaa18aU);
+    assert(hash("foobar") == 0xbf9cf968U);
+    assert(hash("\0") == 0x050c5d1fU);
+    assert(hash("a\0") == 0x2b24d044U);
+    assert(hash("b\0") == 0x9d2c3f7fU);
+    assert(hash("c\0") == 0x7729c516U);
+    assert(hash("d\0") == 0xb91d6109U);
+    assert(hash("e\0") == 0x931ae6a0U);
+    assert(hash("f\0") == 0x052255dbU);
+    assert(hash("fo\0") == 0xbef39fe6U);
+    assert(hash("foo\0") == 0x6150ac75U);
+    assert(hash("foob\0") == 0x9aab3a3dU);
+    assert(hash("fooba\0") == 0x519c4c3eU);
+    assert(hash("foobar\0") == 0x0c1c9eb8U);
+    assert(hash("ch") == 0x5f299f4eU);
+    assert(hash("cho") == 0xef8580f3U);
+    assert(hash("chon") == 0xac297727U);
+    assert(hash("chong") == 0x4546b9c0U);
+    assert(hash("chongo") == 0xbd564e7dU);
+    assert(hash("chongo ") == 0x6bdd5c67U);
+    assert(hash("chongo w") == 0xdd77ed30U);
+    assert(hash("chongo wa") == 0xf4ca9683U);
+    assert(hash("chongo was") == 0x4aeb9bd0U);
+    assert(hash("chongo was ") == 0xe0e67ad0U);
+    assert(hash("chongo was h") == 0xc2d32fa8U);
+    assert(hash("chongo was he") == 0x7f743fb7U);
+    assert(hash("chongo was her") == 0x6900631fU);
+    assert(hash("chongo was here") == 0xc59c990eU);
+    assert(hash("chongo was here!") == 0x448524fdU);
+    assert(hash("chongo was here!\n") == 0xd49930d5U);
+    assert(hash("ch\0") == 0x1c85c7caU);
+    assert(hash("cho\0") == 0x0229fe89U);
+    assert(hash("chon\0") == 0x2c469265U);
+    assert(hash("chong\0") == 0xce566940U);
+    assert(hash("chongo\0") == 0x8bdd8ec7U);
+    assert(hash("chongo \0") == 0x34787625U);
+    assert(hash("chongo w\0") == 0xd3ca6290U);
+    assert(hash("chongo wa\0") == 0xddeaf039U);
+    assert(hash("chongo was\0") == 0xc0e64870U);
+    assert(hash("chongo was \0") == 0xdad35570U);
+    assert(hash("chongo was h\0") == 0x5a740578U);
+    assert(hash("chongo was he\0") == 0x5b004d15U);
+    assert(hash("chongo was her\0") == 0x6a9c09cdU);
+    assert(hash("chongo was here\0") == 0x2384f10aU);
+    assert(hash("chongo was here!\0") == 0xda993a47U);
+    assert(hash("chongo was here!\n\0") == 0x8227df4fU);
+    assert(hash("cu") == 0x4c298165U);
+    assert(hash("cur") == 0xfc563735U);
+    assert(hash("curd") == 0x8cb91483U);
+    assert(hash("curds") == 0x775bf5d0U);
+    assert(hash("curds ") == 0xd5c428d0U);
+    assert(hash("curds a") == 0x34cc0ea3U);
+    assert(hash("curds an") == 0xea3b4cb7U);
+    assert(hash("curds and") == 0x8e59f029U);
+    assert(hash("curds and ") == 0x2094de2bU);
+    assert(hash("curds and w") == 0xa65a0ad4U);
+    assert(hash("curds and wh") == 0x9bbee5f4U);
+    assert(hash("curds and whe") == 0xbe836343U);
+    assert(hash("curds and whey") == 0x22d5344eU);
+    assert(hash("curds and whey\n") == 0x19a1470cU);
+    assert(hash("cu\0") == 0x4a56b1ffU);
+    assert(hash("cur\0") == 0x70b8e86fU);
+    assert(hash("curd\0") == 0x0a5b4a39U);
+    assert(hash("curds\0") == 0xb5c3f670U);
+    assert(hash("curds \0") == 0x53cc3f70U);
+    assert(hash("curds a\0") == 0xc03b0a99U);
+    assert(hash("curds an\0") == 0x7259c415U);
+    assert(hash("curds and\0") == 0x4095108bU);
+    assert(hash("curds and \0") == 0x7559bdb1U);
+    assert(hash("curds and w\0") == 0xb3bf0bbcU);
+    assert(hash("curds and wh\0") == 0x2183ff1cU);
+    assert(hash("curds and whe\0") == 0x2bd54279U);
+    assert(hash("curds and whey\0") == 0x23a156caU);
+    assert(hash("curds and whey\n\0") == 0x64e2d7e4U);
+    assert(hash("hi") == 0x683af69aU);
+    assert(hash("hi\0") == 0xaed2346eU);
+    assert(hash("hello") == 0x4f9f2cabU);
+    assert(hash("hello\0") == 0x02935131U);
+    assert(hash("\xff\x00\x00\x01") == 0xc48fb86dU);
+    assert(hash("\x01\x00\x00\xff") == 0x2269f369U);
+    assert(hash("\xff\x00\x00\x02") == 0xc18fb3b4U);
+    assert(hash("\x02\x00\x00\xff") == 0x50ef1236U);
+    assert(hash("\xff\x00\x00\x03") == 0xc28fb547U);
+    assert(hash("\x03\x00\x00\xff") == 0x96c3bf47U);
+    assert(hash("\xff\x00\x00\x04") == 0xbf8fb08eU);
+    assert(hash("\x04\x00\x00\xff") == 0xf3e4d49cU);
+    assert(hash("\x40\x51\x4e\x44") == 0x32179058U);
+    assert(hash("\x44\x4e\x51\x40") == 0x280bfee6U);
+    assert(hash("\x40\x51\x4e\x4a") == 0x30178d32U);
+    assert(hash("\x4a\x4e\x51\x40") == 0x21addaf8U);
+    assert(hash("\x40\x51\x4e\x54") == 0x4217a988U);
+    assert(hash("\x54\x4e\x51\x40") == 0x772633d6U);
+    assert(hash("127.0.0.1") == 0x08a3d11eU);
+    assert(hash("127.0.0.1\0") == 0xb7e2323aU);
+    assert(hash("127.0.0.2") == 0x07a3cf8bU);
+    assert(hash("127.0.0.2\0") == 0x91dfb7d1U);
+    assert(hash("127.0.0.3") == 0x06a3cdf8U);
+    assert(hash("127.0.0.3\0") == 0x6bdd3d68U);
+    assert(hash("64.81.78.68") == 0x1d5636a7U);
+    assert(hash("64.81.78.68\0") == 0xd5b808e5U);
+    assert(hash("64.81.78.74") == 0x1353e852U);
+    assert(hash("64.81.78.74\0") == 0xbf16b916U);
+    assert(hash("64.81.78.84") == 0xa55b89edU);
+    assert(hash("64.81.78.84\0") == 0x3c1a2017U);
+    assert(hash("feedface") == 0x0588b13cU);
+    assert(hash("feedface\0") == 0xf22f0174U);
+    assert(hash("feedfacedaffdeed") == 0xe83641e1U);
+    assert(hash("feedfacedaffdeed\0") == 0x6e69b533U);
+    assert(hash("feedfacedeadbeef") == 0xf1760448U);
+    assert(hash("feedfacedeadbeef\0") == 0x64c8bd58U);
+    assert(hash("line 1\nline 2\nline 3") == 0x97b4ea23U);
+    assert(hash("chongo <Landon Curt Noll> /\\../\\") == 0x9a4e92e6U);
+    assert(hash("chongo <Landon Curt Noll> /\\../\\\0") == 0xcfb14012U);
+    assert(hash("chongo (Landon Curt Noll) /\\../\\") == 0xf01b2511U);
+    assert(hash("chongo (Landon Curt Noll) /\\../\\\0") == 0x0bbb59c3U);
+    assert(hash("http://antwrp.gsfc.nasa.gov/apod/astropix.html") == 0xce524afaU);
+    assert(hash("http://en.wikipedia.org/wiki/Fowler_Noll_Vo_hash") == 0xdd16ef45U);
+    assert(hash("http://epod.usra.edu/") == 0x60648bb3U);
+    assert(hash("http://exoplanet.eu/") == 0x7fa4bcfcU);
+    assert(hash("http://hvo.wr.usgs.gov/cam3/") == 0x5053ae17U);
+    assert(hash("http://hvo.wr.usgs.gov/cams/HMcam/") == 0xc9302890U);
+    assert(hash("http://hvo.wr.usgs.gov/kilauea/update/deformation.html") == 0x956ded32U);
+    assert(hash("http://hvo.wr.usgs.gov/kilauea/update/images.html") == 0x9136db84U);
+    assert(hash("http://hvo.wr.usgs.gov/kilauea/update/maps.html") == 0xdf9d3323U);
+    assert(hash("http://hvo.wr.usgs.gov/volcanowatch/current_issue.html") == 0x32bb6cd0U);
+    assert(hash("http://neo.jpl.nasa.gov/risk/") == 0xc8f8385bU);
+    assert(hash("http://norvig.com/21-days.html") == 0xeb08bfbaU);
+    assert(hash("http://primes.utm.edu/curios/home.php") == 0x62cc8e3dU);
+    assert(hash("http://slashdot.org/") == 0xc3e20f5cU);
+    assert(hash("http://tux.wr.usgs.gov/Maps/155.25-19.5.html") == 0x39e97f17U);
+    assert(hash("http://volcano.wr.usgs.gov/kilaueastatus.php") == 0x7837b203U);
+    assert(hash("http://www.avo.alaska.edu/activity/Redoubt.php") == 0x319e877bU);
+    assert(hash("http://www.dilbert.com/fast/") == 0xd3e63f89U);
+    assert(hash("http://www.fourmilab.ch/gravitation/orbits/") == 0x29b50b38U);
+    assert(hash("http://www.fpoa.net/") == 0x5ed678b8U);
+    assert(hash("http://www.ioccc.org/index.html") == 0xb0d5b793U);
+    assert(hash("http://www.isthe.com/cgi-bin/number.cgi") == 0x52450be5U);
+    assert(hash("http://www.isthe.com/chongo/bio.html") == 0xfa72d767U);
+    assert(hash("http://www.isthe.com/chongo/index.html") == 0x95066709U);
+    assert(hash("http://www.isthe.com/chongo/src/calc/lucas-calc") == 0x7f52e123U);
+    assert(hash("http://www.isthe.com/chongo/tech/astro/venus2004.html") == 0x76966481U);
+    assert(hash("http://www.isthe.com/chongo/tech/astro/vita.html") == 0x063258b0U);
+    assert(hash("http://www.isthe.com/chongo/tech/comp/c/expert.html") == 0x2ded6e8aU);
+    assert(hash("http://www.isthe.com/chongo/tech/comp/calc/index.html") == 0xb07d7c52U);
+    assert(hash("http://www.isthe.com/chongo/tech/comp/fnv/index.html") == 0xd0c71b71U);
+    assert(hash("http://www.isthe.com/chongo/tech/math/number/howhigh.html") == 0xf684f1bdU);
+    assert(hash("http://www.isthe.com/chongo/tech/math/number/number.html") == 0x868ecfa8U);
+    assert(hash("http://www.isthe.com/chongo/tech/math/prime/mersenne.html") == 0xf794f684U);
+    assert(hash("http://www.isthe.com/chongo/tech/math/prime/mersenne.html#largest") == 0xd19701c3U);
+    assert(hash("http://www.lavarnd.org/cgi-bin/corpspeak.cgi") == 0x346e171eU);
+    assert(hash("http://www.lavarnd.org/cgi-bin/haiku.cgi") == 0x91f8f676U);
+    assert(hash("http://www.lavarnd.org/cgi-bin/rand-none.cgi") == 0x0bf58848U);
+    assert(hash("http://www.lavarnd.org/cgi-bin/randdist.cgi") == 0x6317b6d1U);
+    assert(hash("http://www.lavarnd.org/index.html") == 0xafad4c54U);
+    assert(hash("http://www.lavarnd.org/what/nist-test.html") == 0x0f25681eU);
+    assert(hash("http://www.macosxhints.com/") == 0x91b18d49U);
+    assert(hash("http://www.mellis.com/") == 0x7d61c12eU);
+    assert(hash("http://www.nature.nps.gov/air/webcams/parks/havoso2alert/havoalert.cfm") == 0x5147d25cU);
+    assert(hash("http://www.nature.nps.gov/air/webcams/parks/havoso2alert/timelines_24.cfm") == 0x9a8b6805U);
+    assert(hash("http://www.paulnoll.com/") == 0x4cd2a447U);
+    assert(hash("http://www.pepysdiary.com/") == 0x1e549b14U);
+    assert(hash("http://www.sciencenews.org/index/home/activity/view") == 0x2fe1b574U);
+    assert(hash("http://www.skyandtelescope.com/") == 0xcf0cd31eU);
+    assert(hash("http://www.sput.nl/~rob/sirius.html") == 0x6c471669U);
+    assert(hash("http://www.systemexperts.com/") == 0x0e5eef1eU);
+    assert(hash("http://www.tq-international.com/phpBB3/index.php") == 0x2bed3602U);
+    assert(hash("http://www.travelquesttours.com/index.htm") == 0xb26249e0U);
+    assert(hash("http://www.wunderground.com/global/stations/89606.html") == 0x2c9b86a4U);
+    assert(hash(r10!"21701") == 0xe415e2bbU);
+    assert(hash(r10!"M21701") == 0x18a98d1dU);
+    assert(hash(r10!"2^21701-1") == 0xb7df8b7bU);
+    assert(hash(r10!"\x54\xc5") == 0x241e9075U);
+    assert(hash(r10!"\xc5\x54") == 0x063f70ddU);
+    assert(hash(r10!"23209") == 0x0295aed9U);
+    assert(hash(r10!"M23209") == 0x56a7f781U);
+    assert(hash(r10!"2^23209-1") == 0x253bc645U);
+    assert(hash(r10!"\x5a\xa9") == 0x46610921U);
+    assert(hash(r10!"\xa9\x5a") == 0x7c1577f9U);
+    assert(hash(r10!"391581216093") == 0x512b2851U);
+    assert(hash(r10!"391581*2^216093-1") == 0x76823999U);
+    assert(hash(r10!"\x05\xf9\x9d\x03\x4c\x81") == 0xc0586935U);
+    assert(hash(r10!"FEDCBA9876543210") == 0xf3415c85U);
+    assert(hash(r10!"\xfe\xdc\xba\x98\x76\x54\x32\x10") == 0x0ae4ff65U);
+    assert(hash(r10!"EFCDAB8967452301") == 0x58b79725U);
+    assert(hash(r10!"\xef\xcd\xab\x89\x67\x45\x23\x01") == 0xdea43aa5U);
+    assert(hash(r10!"0123456789ABCDEF") == 0x2bb3be35U);
+    assert(hash(r10!"\x01\x23\x45\x67\x89\xab\xcd\xef") == 0xea777a45U);
+    assert(hash(r10!"1032547698BADCFE") == 0x8f21c305U);
+    assert(hash(r10!"\x10\x32\x54\x76\x98\xba\xdc\xfe") == 0x5c9d0865U);
+    assert(hash(r500!"\x00") == 0xfa823dd5U);
+    assert(hash(r500!"\x07") == 0x21a27271U);
+    assert(hash(r500!"~") == 0x83c5c6d5U);
+    assert(hash(r500!"\x7f") == 0x813b0881U);
+}
+
+// FNV-1a 64 bit test vectors
+static if (size_t.sizeof == 8) @nogc nothrow pure @safe unittest
+{
+    assert(hash("") == 0xcbf29ce484222325UL);
+    assert(hash("a") == 0xaf63dc4c8601ec8cUL);
+    assert(hash("b") == 0xaf63df4c8601f1a5UL);
+    assert(hash("c") == 0xaf63de4c8601eff2UL);
+    assert(hash("d") == 0xaf63d94c8601e773UL);
+    assert(hash("e") == 0xaf63d84c8601e5c0UL);
+    assert(hash("f") == 0xaf63db4c8601ead9UL);
+    assert(hash("fo") == 0x08985907b541d342UL);
+    assert(hash("foo") == 0xdcb27518fed9d577UL);
+    assert(hash("foob") == 0xdd120e790c2512afUL);
+    assert(hash("fooba") == 0xcac165afa2fef40aUL);
+    assert(hash("foobar") == 0x85944171f73967e8UL);
+    assert(hash("\0") == 0xaf63bd4c8601b7dfUL);
+    assert(hash("a\0") == 0x089be207b544f1e4UL);
+    assert(hash("b\0") == 0x08a61407b54d9b5fUL);
+    assert(hash("c\0") == 0x08a2ae07b54ab836UL);
+    assert(hash("d\0") == 0x0891b007b53c4869UL);
+    assert(hash("e\0") == 0x088e4a07b5396540UL);
+    assert(hash("f\0") == 0x08987c07b5420ebbUL);
+    assert(hash("fo\0") == 0xdcb28a18fed9f926UL);
+    assert(hash("foo\0") == 0xdd1270790c25b935UL);
+    assert(hash("foob\0") == 0xcac146afa2febf5dUL);
+    assert(hash("fooba\0") == 0x8593d371f738acfeUL);
+    assert(hash("foobar\0") == 0x34531ca7168b8f38UL);
+    assert(hash("ch") == 0x08a25607b54a22aeUL);
+    assert(hash("cho") == 0xf5faf0190cf90df3UL);
+    assert(hash("chon") == 0xf27397910b3221c7UL);
+    assert(hash("chong") == 0x2c8c2b76062f22e0UL);
+    assert(hash("chongo") == 0xe150688c8217b8fdUL);
+    assert(hash("chongo ") == 0xf35a83c10e4f1f87UL);
+    assert(hash("chongo w") == 0xd1edd10b507344d0UL);
+    assert(hash("chongo wa") == 0x2a5ee739b3ddb8c3UL);
+    assert(hash("chongo was") == 0xdcfb970ca1c0d310UL);
+    assert(hash("chongo was ") == 0x4054da76daa6da90UL);
+    assert(hash("chongo was h") == 0xf70a2ff589861368UL);
+    assert(hash("chongo was he") == 0x4c628b38aed25f17UL);
+    assert(hash("chongo was her") == 0x9dd1f6510f78189fUL);
+    assert(hash("chongo was here") == 0xa3de85bd491270ceUL);
+    assert(hash("chongo was here!") == 0x858e2fa32a55e61dUL);
+    assert(hash("chongo was here!\n") == 0x46810940eff5f915UL);
+    assert(hash("ch\0") == 0xf5fadd190cf8edaaUL);
+    assert(hash("cho\0") == 0xf273ed910b32b3e9UL);
+    assert(hash("chon\0") == 0x2c8c5276062f6525UL);
+    assert(hash("chong\0") == 0xe150b98c821842a0UL);
+    assert(hash("chongo\0") == 0xf35aa3c10e4f55e7UL);
+    assert(hash("chongo \0") == 0xd1ed680b50729265UL);
+    assert(hash("chongo w\0") == 0x2a5f0639b3dded70UL);
+    assert(hash("chongo wa\0") == 0xdcfbaa0ca1c0f359UL);
+    assert(hash("chongo was\0") == 0x4054ba76daa6a430UL);
+    assert(hash("chongo was \0") == 0xf709c7f5898562b0UL);
+    assert(hash("chongo was h\0") == 0x4c62e638aed2f9b8UL);
+    assert(hash("chongo was he\0") == 0x9dd1a8510f779415UL);
+    assert(hash("chongo was her\0") == 0xa3de2abd4911d62dUL);
+    assert(hash("chongo was here\0") == 0x858e0ea32a55ae0aUL);
+    assert(hash("chongo was here!\0") == 0x46810f40eff60347UL);
+    assert(hash("chongo was here!\n\0") == 0xc33bce57bef63eafUL);
+    assert(hash("cu") == 0x08a24307b54a0265UL);
+    assert(hash("cur") == 0xf5b9fd190cc18d15UL);
+    assert(hash("curd") == 0x4c968290ace35703UL);
+    assert(hash("curds") == 0x07174bd5c64d9350UL);
+    assert(hash("curds ") == 0x5a294c3ff5d18750UL);
+    assert(hash("curds a") == 0x05b3c1aeb308b843UL);
+    assert(hash("curds an") == 0xb92a48da37d0f477UL);
+    assert(hash("curds and") == 0x73cdddccd80ebc49UL);
+    assert(hash("curds and ") == 0xd58c4c13210a266bUL);
+    assert(hash("curds and w") == 0xe78b6081243ec194UL);
+    assert(hash("curds and wh") == 0xb096f77096a39f34UL);
+    assert(hash("curds and whe") == 0xb425c54ff807b6a3UL);
+    assert(hash("curds and whey") == 0x23e520e2751bb46eUL);
+    assert(hash("curds and whey\n") == 0x1a0b44ccfe1385ecUL);
+    assert(hash("cu\0") == 0xf5ba4b190cc2119fUL);
+    assert(hash("cur\0") == 0x4c962690ace2baafUL);
+    assert(hash("curd\0") == 0x0716ded5c64cda19UL);
+    assert(hash("curds\0") == 0x5a292c3ff5d150f0UL);
+    assert(hash("curds \0") == 0x05b3e0aeb308ecf0UL);
+    assert(hash("curds a\0") == 0xb92a5eda37d119d9UL);
+    assert(hash("curds an\0") == 0x73ce41ccd80f6635UL);
+    assert(hash("curds and\0") == 0xd58c2c132109f00bUL);
+    assert(hash("curds and \0") == 0xe78baf81243f47d1UL);
+    assert(hash("curds and w\0") == 0xb0968f7096a2ee7cUL);
+    assert(hash("curds and wh\0") == 0xb425a84ff807855cUL);
+    assert(hash("curds and whe\0") == 0x23e4e9e2751b56f9UL);
+    assert(hash("curds and whey\0") == 0x1a0b4eccfe1396eaUL);
+    assert(hash("curds and whey\n\0") == 0x54abd453bb2c9004UL);
+    assert(hash("hi") == 0x08ba5f07b55ec3daUL);
+    assert(hash("hi\0") == 0x337354193006cb6eUL);
+    assert(hash("hello") == 0xa430d84680aabd0bUL);
+    assert(hash("hello\0") == 0xa9bc8acca21f39b1UL);
+    assert(hash("\xff\x00\x00\x01") == 0x6961196491cc682dUL);
+    assert(hash("\x01\x00\x00\xff") == 0xad2bb1774799dfe9UL);
+    assert(hash("\xff\x00\x00\x02") == 0x6961166491cc6314UL);
+    assert(hash("\x02\x00\x00\xff") == 0x8d1bb3904a3b1236UL);
+    assert(hash("\xff\x00\x00\x03") == 0x6961176491cc64c7UL);
+    assert(hash("\x03\x00\x00\xff") == 0xed205d87f40434c7UL);
+    assert(hash("\xff\x00\x00\x04") == 0x6961146491cc5faeUL);
+    assert(hash("\x04\x00\x00\xff") == 0xcd3baf5e44f8ad9cUL);
+    assert(hash("\x40\x51\x4e\x44") == 0xe3b36596127cd6d8UL);
+    assert(hash("\x44\x4e\x51\x40") == 0xf77f1072c8e8a646UL);
+    assert(hash("\x40\x51\x4e\x4a") == 0xe3b36396127cd372UL);
+    assert(hash("\x4a\x4e\x51\x40") == 0x6067dce9932ad458UL);
+    assert(hash("\x40\x51\x4e\x54") == 0xe3b37596127cf208UL);
+    assert(hash("\x54\x4e\x51\x40") == 0x4b7b10fa9fe83936UL);
+    assert(hash("127.0.0.1") == 0xaabafe7104d914beUL);
+    assert(hash("127.0.0.1\0") == 0xf4d3180b3cde3edaUL);
+    assert(hash("127.0.0.2") == 0xaabafd7104d9130bUL);
+    assert(hash("127.0.0.2\0") == 0xf4cfb20b3cdb5bb1UL);
+    assert(hash("127.0.0.3") == 0xaabafc7104d91158UL);
+    assert(hash("127.0.0.3\0") == 0xf4cc4c0b3cd87888UL);
+    assert(hash("64.81.78.68") == 0xe729bac5d2a8d3a7UL);
+    assert(hash("64.81.78.68\0") == 0x74bc0524f4dfa4c5UL);
+    assert(hash("64.81.78.74") == 0xe72630c5d2a5b352UL);
+    assert(hash("64.81.78.74\0") == 0x6b983224ef8fb456UL);
+    assert(hash("64.81.78.84") == 0xe73042c5d2ae266dUL);
+    assert(hash("64.81.78.84\0") == 0x8527e324fdeb4b37UL);
+    assert(hash("feedface") == 0x0a83c86fee952abcUL);
+    assert(hash("feedface\0") == 0x7318523267779d74UL);
+    assert(hash("feedfacedaffdeed") == 0x3e66d3d56b8caca1UL);
+    assert(hash("feedfacedaffdeed\0") == 0x956694a5c0095593UL);
+    assert(hash("feedfacedeadbeef") == 0xcac54572bb1a6fc8UL);
+    assert(hash("feedfacedeadbeef\0") == 0xa7a4c9f3edebf0d8UL);
+    assert(hash("line 1\nline 2\nline 3") == 0x7829851fac17b143UL);
+    assert(hash("chongo <Landon Curt Noll> /\\../\\") == 0x2c8f4c9af81bcf06UL);
+    assert(hash("chongo <Landon Curt Noll> /\\../\\\0") == 0xd34e31539740c732UL);
+    assert(hash("chongo (Landon Curt Noll) /\\../\\") == 0x3605a2ac253d2db1UL);
+    assert(hash("chongo (Landon Curt Noll) /\\../\\\0") == 0x08c11b8346f4a3c3UL);
+    assert(hash("http://antwrp.gsfc.nasa.gov/apod/astropix.html") == 0x6be396289ce8a6daUL);
+    assert(hash("http://en.wikipedia.org/wiki/Fowler_Noll_Vo_hash") == 0xd9b957fb7fe794c5UL);
+    assert(hash("http://epod.usra.edu/") == 0x05be33da04560a93UL);
+    assert(hash("http://exoplanet.eu/") == 0x0957f1577ba9747cUL);
+    assert(hash("http://hvo.wr.usgs.gov/cam3/") == 0xda2cc3acc24fba57UL);
+    assert(hash("http://hvo.wr.usgs.gov/cams/HMcam/") == 0x74136f185b29e7f0UL);
+    assert(hash("http://hvo.wr.usgs.gov/kilauea/update/deformation.html") == 0xb2f2b4590edb93b2UL);
+    assert(hash("http://hvo.wr.usgs.gov/kilauea/update/images.html") == 0xb3608fce8b86ae04UL);
+    assert(hash("http://hvo.wr.usgs.gov/kilauea/update/maps.html") == 0x4a3a865079359063UL);
+    assert(hash("http://hvo.wr.usgs.gov/volcanowatch/current_issue.html") == 0x5b3a7ef496880a50UL);
+    assert(hash("http://neo.jpl.nasa.gov/risk/") == 0x48fae3163854c23bUL);
+    assert(hash("http://norvig.com/21-days.html") == 0x07aaa640476e0b9aUL);
+    assert(hash("http://primes.utm.edu/curios/home.php") == 0x2f653656383a687dUL);
+    assert(hash("http://slashdot.org/") == 0xa1031f8e7599d79cUL);
+    assert(hash("http://tux.wr.usgs.gov/Maps/155.25-19.5.html") == 0xa31908178ff92477UL);
+    assert(hash("http://volcano.wr.usgs.gov/kilaueastatus.php") == 0x097edf3c14c3fb83UL);
+    assert(hash("http://www.avo.alaska.edu/activity/Redoubt.php") == 0xb51ca83feaa0971bUL);
+    assert(hash("http://www.dilbert.com/fast/") == 0xdd3c0d96d784f2e9UL);
+    assert(hash("http://www.fourmilab.ch/gravitation/orbits/") == 0x86cd26a9ea767d78UL);
+    assert(hash("http://www.fpoa.net/") == 0xe6b215ff54a30c18UL);
+    assert(hash("http://www.ioccc.org/index.html") == 0xec5b06a1c5531093UL);
+    assert(hash("http://www.isthe.com/cgi-bin/number.cgi") == 0x45665a929f9ec5e5UL);
+    assert(hash("http://www.isthe.com/chongo/bio.html") == 0x8c7609b4a9f10907UL);
+    assert(hash("http://www.isthe.com/chongo/index.html") == 0x89aac3a491f0d729UL);
+    assert(hash("http://www.isthe.com/chongo/src/calc/lucas-calc") == 0x32ce6b26e0f4a403UL);
+    assert(hash("http://www.isthe.com/chongo/tech/astro/venus2004.html") == 0x614ab44e02b53e01UL);
+    assert(hash("http://www.isthe.com/chongo/tech/astro/vita.html") == 0xfa6472eb6eef3290UL);
+    assert(hash("http://www.isthe.com/chongo/tech/comp/c/expert.html") == 0x9e5d75eb1948eb6aUL);
+    assert(hash("http://www.isthe.com/chongo/tech/comp/calc/index.html") == 0xb6d12ad4a8671852UL);
+    assert(hash("http://www.isthe.com/chongo/tech/comp/fnv/index.html") == 0x88826f56eba07af1UL);
+    assert(hash("http://www.isthe.com/chongo/tech/math/number/howhigh.html") == 0x44535bf2645bc0fdUL);
+    assert(hash("http://www.isthe.com/chongo/tech/math/number/number.html") == 0x169388ffc21e3728UL);
+    assert(hash("http://www.isthe.com/chongo/tech/math/prime/mersenne.html") == 0xf68aac9e396d8224UL);
+    assert(hash("http://www.isthe.com/chongo/tech/math/prime/mersenne.html#largest") == 0x8e87d7e7472b3883UL);
+    assert(hash("http://www.lavarnd.org/cgi-bin/corpspeak.cgi") == 0x295c26caa8b423deUL);
+    assert(hash("http://www.lavarnd.org/cgi-bin/haiku.cgi") == 0x322c814292e72176UL);
+    assert(hash("http://www.lavarnd.org/cgi-bin/rand-none.cgi") == 0x8a06550eb8af7268UL);
+    assert(hash("http://www.lavarnd.org/cgi-bin/randdist.cgi") == 0xef86d60e661bcf71UL);
+    assert(hash("http://www.lavarnd.org/index.html") == 0x9e5426c87f30ee54UL);
+    assert(hash("http://www.lavarnd.org/what/nist-test.html") == 0xf1ea8aa826fd047eUL);
+    assert(hash("http://www.macosxhints.com/") == 0x0babaf9a642cb769UL);
+    assert(hash("http://www.mellis.com/") == 0x4b3341d4068d012eUL);
+    assert(hash("http://www.nature.nps.gov/air/webcams/parks/havoso2alert/havoalert.cfm") == 0xd15605cbc30a335cUL);
+    assert(hash("http://www.nature.nps.gov/air/webcams/parks/havoso2alert/timelines_24.cfm") == 0x5b21060aed8412e5UL);
+    assert(hash("http://www.paulnoll.com/") == 0x45e2cda1ce6f4227UL);
+    assert(hash("http://www.pepysdiary.com/") == 0x50ae3745033ad7d4UL);
+    assert(hash("http://www.sciencenews.org/index/home/activity/view") == 0xaa4588ced46bf414UL);
+    assert(hash("http://www.skyandtelescope.com/") == 0xc1b0056c4a95467eUL);
+    assert(hash("http://www.sput.nl/~rob/sirius.html") == 0x56576a71de8b4089UL);
+    assert(hash("http://www.systemexperts.com/") == 0xbf20965fa6dc927eUL);
+    assert(hash("http://www.tq-international.com/phpBB3/index.php") == 0x569f8383c2040882UL);
+    assert(hash("http://www.travelquesttours.com/index.htm") == 0xe1e772fba08feca0UL);
+    assert(hash("http://www.wunderground.com/global/stations/89606.html") == 0x4ced94af97138ac4UL);
+    assert(hash(r10!"21701") == 0xc4112ffb337a82fbUL);
+    assert(hash(r10!"M21701") == 0xd64a4fd41de38b7dUL);
+    assert(hash(r10!"2^21701-1") == 0x4cfc32329edebcbbUL);
+    assert(hash(r10!"\x54\xc5") == 0x0803564445050395UL);
+    assert(hash(r10!"\xc5\x54") == 0xaa1574ecf4642ffdUL);
+    assert(hash(r10!"23209") == 0x694bc4e54cc315f9UL);
+    assert(hash(r10!"M23209") == 0xa3d7cb273b011721UL);
+    assert(hash(r10!"2^23209-1") == 0x577c2f8b6115bfa5UL);
+    assert(hash(r10!"\x5a\xa9") == 0xb7ec8c1a769fb4c1UL);
+    assert(hash(r10!"\xa9\x5a") == 0x5d5cfce63359ab19UL);
+    assert(hash(r10!"391581216093") == 0x33b96c3cd65b5f71UL);
+    assert(hash(r10!"391581*2^216093-1") == 0xd845097780602bb9UL);
+    assert(hash(r10!"\x05\xf9\x9d\x03\x4c\x81") == 0x84d47645d02da3d5UL);
+    assert(hash(r10!"FEDCBA9876543210") == 0x83544f33b58773a5UL);
+    assert(hash(r10!"\xfe\xdc\xba\x98\x76\x54\x32\x10") == 0x9175cbb2160836c5UL);
+    assert(hash(r10!"EFCDAB8967452301") == 0xc71b3bc175e72bc5UL);
+    assert(hash(r10!"\xef\xcd\xab\x89\x67\x45\x23\x01") == 0x636806ac222ec985UL);
+    assert(hash(r10!"0123456789ABCDEF") == 0xb6ef0e6950f52ed5UL);
+    assert(hash(r10!"\x01\x23\x45\x67\x89\xab\xcd\xef") == 0xead3d8a0f3dfdaa5UL);
+    assert(hash(r10!"1032547698BADCFE") == 0x922908fe9a861ba5UL);
+    assert(hash(r10!"\x10\x32\x54\x76\x98\xba\xdc\xfe") == 0x6d4821de275fd5c5UL);
+    assert(hash(r500!"\x00") == 0x1fe3fce62bd816b5UL);
+    assert(hash(r500!"\x07") == 0xc23e9fccd6f70591UL);
+    assert(hash(r500!"~") == 0xc1af12bdfe16b5b5UL);
+    assert(hash(r500!"\x7f") == 0x39e9f18f2f85e221UL);
+}

source/tanya/hash/package.d

@@ -0,0 +1,15 @@
+/* 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 2018.
+ * 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)
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/hash/package.d,
+ *                 tanya/hash/package.d)
+ */
+module tanya.hash;
+
+public import tanya.hash.lookup;

source/tanya/math/mp.d

@@ -14,11 +14,14 @@
  */
 module tanya.math.mp;
 
-import std.algorithm;
+import std.algorithm.comparison;
+import std.algorithm.mutation : copy, fill, reverse;
 import std.range;
+import tanya.algorithm.mutation;
 import tanya.container.array;
 import tanya.encoding.ascii;
 import tanya.memory;
+static import tanya.memory.op;
 import tanya.meta.trait;
 import tanya.meta.transform;
 
@@ -104,12 +107,12 @@ struct Integer
     }
 
     /// ditto
-    this(shared Allocator allocator) pure nothrow @safe @nogc
+    this(shared Allocator allocator) @nogc nothrow pure @safe
     in
     {
         assert(allocator !is null);
     }
-    body
+    do
     {
         this.allocator_ = allocator;
     }
@@ -156,7 +159,7 @@ struct Integer
     }
 
     ///
-    nothrow @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         ubyte[8] range = [ 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xdd, 0xee ];
         auto integer = Integer(Sign.positive, range[]);
@@ -187,7 +190,7 @@ struct Integer
     }
 
     ///
-    nothrow @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         {
             ubyte[8] range = [ 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xdd, 0xee ];
@@ -204,17 +207,17 @@ struct Integer
     /**
      * Copies the integer.
      */
-    this(this) nothrow @trusted @nogc
+    this(this) @nogc nothrow pure @safe
     {
         auto tmp = allocator.resize!digit(null, this.size);
-        this.rep[0 .. this.size].copy(tmp);
+        tanya.memory.op.copy(this.rep[0 .. this.size], tmp);
         this.rep = tmp;
     }
 
     /**
      * Destroys the integer.
      */
-    ~this() nothrow @trusted @nogc
+    ~this() @nogc nothrow pure @safe
     {
         allocator.resize(this.rep, 0);
     }
@@ -224,7 +227,7 @@ struct Integer
     ];
 
     // Counts the number of LSBs before the first non-zero bit.
-    private ptrdiff_t countLSBs() const pure nothrow @safe @nogc
+    private ptrdiff_t countLSBs() const @nogc nothrow pure @safe
     {
         if (this.size == 0)
         {
@@ -256,7 +259,7 @@ struct Integer
     /**
      * Returns: Number of bytes in the two's complement representation.
      */
-    @property size_t length() const pure nothrow @safe @nogc
+    @property size_t length() const @nogc nothrow pure @safe
     {
         if (this.sign)
         {
@@ -280,7 +283,7 @@ struct Integer
     }
 
     ///
-    private nothrow @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         {
             Integer i;
@@ -336,11 +339,12 @@ struct Integer
     }
 
     /// ditto
-    ref Integer opAssign(T)(ref T value) @trusted
+    ref Integer opAssign(T)(ref T value)
     if (is(Unqual!T == Integer))
     {
         this.rep = allocator.resize(this.rep, value.size);
-        value.rep[0 .. value.size].copy(this.rep[0 .. value.size]);
+        tanya.memory.op.copy(value.rep[0 .. value.size],
+                             this.rep[0 .. value.size]);
         this.size = value.size;
         this.sign = value.sign;
 
@@ -348,7 +352,7 @@ struct Integer
     }
 
     /// ditto
-    ref Integer opAssign(T)(T value) nothrow @safe @nogc
+    ref Integer opAssign(T)(T value)
     if (is(T == Integer))
     {
         swap(this.rep, value.rep);
@@ -389,11 +393,13 @@ struct Integer
     T opCast(T)() const
     if (isIntegral!T && isSigned!T)
     {
-        return this.sign ? -(cast(Unsigned!T) this) : cast(Unsigned!T) this;
+        return this.sign
+            ? cast(T) -(cast(Promoted!(Unsigned!T)) (cast(Unsigned!T) this))
+            : cast(Unsigned!T) this;
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto integer = Integer(79);
         assert(cast(ushort) integer == 79);
@@ -424,7 +430,7 @@ struct Integer
      * Typically very fast.  Also fixes the sign if there
      * are no more leading digits
      */
-    void contract() nothrow @safe @nogc
+    void contract() @nogc nothrow pure @safe
     {
         /* decrease size while the most significant digit is
          * zero.
@@ -441,7 +447,7 @@ struct Integer
         }
     }
 
-    private void grow(const size_t size) nothrow @trusted @nogc
+    private void grow(const size_t size) @nogc nothrow pure @safe
     {
         if (this.rep.length >= size)
         {
@@ -452,7 +458,7 @@ struct Integer
         this.rep[oldLength .. $].fill(digit.init);
     }
 
-    private size_t countBits() const pure nothrow @safe @nogc
+    private size_t countBits() const @nogc nothrow pure @safe
     {
         if (this.size == 0)
         {
@@ -470,7 +476,7 @@ struct Integer
     }
 
     private void add(ref const Integer summand, ref Integer sum)
-    const nothrow @safe @nogc
+    const @nogc nothrow pure @safe
     {
         const(digit)[] max, min;
 
@@ -521,7 +527,7 @@ struct Integer
     }
 
     private void add(const digit summand, ref Integer sum)
-    const nothrow @safe @nogc
+    const @nogc nothrow pure @safe
     {
         sum.grow(this.size + 2);
 
@@ -547,7 +553,7 @@ struct Integer
     }
 
     private void subtract(ref const Integer subtrahend, ref Integer difference)
-    const nothrow @safe @nogc
+    const @nogc nothrow pure @safe
     {
         difference.grow(this.size);
 
@@ -583,7 +589,7 @@ struct Integer
     }
 
     private void subtract(const digit subtrahend, ref Integer difference)
-    const nothrow @safe @nogc
+    const @nogc nothrow pure @safe
     {
         difference.grow(this.size);
 
@@ -612,7 +618,7 @@ struct Integer
     }
 
     // Compare the magnitude.
-    private int compare(ref const Integer that) const pure nothrow @safe @nogc
+    private int compare(ref const Integer that) const @nogc nothrow pure @safe
     {
         if (this.size > that.size)
         {
@@ -661,7 +667,7 @@ struct Integer
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto integer1 = Integer(1019);
         auto integer2 = Integer(1019);
@@ -707,7 +713,7 @@ struct Integer
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto integer = Integer(1019);
 
@@ -731,7 +737,7 @@ struct Integer
     }
 
     ///
-    @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto integer = Integer(1019);
 
@@ -767,7 +773,7 @@ struct Integer
     }
 
     ///
-    unittest
+    @nogc nothrow pure @safe unittest
     {
         {
             auto h1 = Integer(1019);
@@ -809,7 +815,7 @@ struct Integer
     }
 
     ///
-    unittest
+    @nogc nothrow pure @safe unittest
     {
         {
             auto h1 = Integer(3);
@@ -853,7 +859,7 @@ struct Integer
     }
 
     ///
-    nothrow @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto h1 = Integer(123);
         auto h2 = Integer(456);
@@ -867,7 +873,7 @@ struct Integer
     {
         assert(operand.length > 0, "Division by zero.");
     }
-    body
+    do
     {
         divide(operand, this);
         return this;
@@ -879,13 +885,13 @@ struct Integer
     {
         assert(operand.length > 0, "Division by zero.");
     }
-    body
+    do
     {
         divide(operand, null, this);
         return this;
     }
 
-    nothrow @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto h1 = Integer(18);
         auto h2 = Integer(4);
@@ -937,7 +943,7 @@ struct Integer
     }
 
     ///
-    nothrow @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto integer = Integer(4294967294);
         integer >>= 10;
@@ -1005,7 +1011,7 @@ struct Integer
     }
 
     ///
-    nothrow @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto integer = Integer(4294967295);
         integer <<= 1;
@@ -1023,7 +1029,10 @@ struct Integer
     Integer opUnary(string op : "~")() const
     {
         auto ret = Integer(this, allocator);
-        ret.rep[0 .. ret.size].each!((ref a) => a = ~a & mask);
+        foreach (ref a; ret.rep[0 .. ret.size])
+        {
+            a = ~a & mask;
+        }
         return ret;
     }
 
@@ -1049,7 +1058,7 @@ struct Integer
     }
 
     //
-    nothrow @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto h1 = Integer(79);
         Integer h2;
@@ -1065,7 +1074,7 @@ struct Integer
         assert(h1 == 79);
 
         h2 = ~h1;
-        assert(h2 == ~cast(ubyte) 79);
+        assert(h2 == cast(ubyte) ~79);
     }
 
     /// ditto
@@ -1102,7 +1111,7 @@ struct Integer
     }
 
     ///
-    nothrow @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         Integer integer;
 
@@ -1159,7 +1168,7 @@ struct Integer
     {
         assert(operand.length > 0, "Division by zero.");
     }
-    body
+    do
     {
         mixin("return Integer(this, allocator) " ~ op ~ "= operand;");
     }
@@ -1172,7 +1181,7 @@ struct Integer
     }
 
     // Shift right a certain amount of digits.
-    private void shiftRight(const size_t operand) nothrow @safe @nogc
+    private void shiftRight(const size_t operand) @nogc nothrow pure @safe
     {
         if (operand == 0)
         {
@@ -1191,7 +1200,7 @@ struct Integer
     }
 
     // Shift left a certain amount of digits.
-    private void shiftLeft(const size_t operand) nothrow @safe @nogc
+    private void shiftLeft(const size_t operand) @nogc nothrow pure @safe
     {
         if (operand == 0)
         {
@@ -1213,7 +1222,7 @@ struct Integer
     }
 
     private void multiply(const digit factor, ref Integer product)
-    const nothrow @safe @nogc
+    const @nogc nothrow pure @safe
     {
         product.grow(this.size + 1);
         product.sign = this.sign;
@@ -1239,7 +1248,7 @@ struct Integer
 
     private void multiply(ref const Integer factor,
                           ref Integer product,
-                          const size_t digits) const nothrow @safe @nogc
+                          const size_t digits) const @nogc nothrow pure @safe
     {
         Integer intermediate;
         intermediate.grow(digits);
@@ -1270,8 +1279,7 @@ struct Integer
 
     private void divide(Q, ARGS...)(ref const Integer divisor,
                                     auto ref Q quotient,
-                                    ref ARGS args)
+                                    ref ARGS args) const
-    const nothrow @safe @nogc
     if ((is(Q : typeof(null))
      || (is(Q : Integer) && __traits(isRef, quotient)))
      && (ARGS.length == 0 || (ARGS.length == 1 && is(ARGS[0] : Integer))))
@@ -1279,7 +1287,7 @@ struct Integer
     {
         assert(divisor != 0, "Division by zero.");
     }
-    body
+    do
     {
         if (compare(divisor) < 0)
         {
@@ -1404,7 +1412,7 @@ struct Integer
         }
     }
 
-    private Integer square() nothrow @safe @nogc
+    private Integer square() @nogc nothrow pure @safe
     {
         Integer result;
         const resultSize = 2 * this.size + 1;
@@ -1444,7 +1452,7 @@ struct Integer
     }
 
     // Returns 2^^n.
-    private Integer exp2(size_t n) const nothrow @safe @nogc
+    private Integer exp2(size_t n) const @nogc nothrow pure @safe
     {
         auto ret = Integer(allocator);
         const bytes = n / digitBitCount;
@@ -1459,12 +1467,12 @@ struct Integer
     /**
      * Returns: Two's complement representation of the integer.
      */
-    Array!ubyte toArray() const nothrow @safe @nogc
+    Array!ubyte toArray() const @nogc nothrow pure @safe
     out (array)
     {
         assert(array.length == length);
     }
-    body
+    do
     {
         Array!ubyte array;
 
@@ -1512,7 +1520,7 @@ struct Integer
     }
 
     ///
-    nothrow @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         {
             auto integer = Integer(0x66778899aabbddee);
@@ -1521,6 +1529,14 @@ struct Integer
             auto array = integer.toArray();
             assert(equal(array[], expected[]));
         }
+    }
+
+    @nogc nothrow pure @safe unittest
+    {
+        {
+            Integer integer;
+            assert(integer.toArray().length == 0);
+        }
         {
             auto integer = Integer(0x03);
             ubyte[1] expected = [ 0x03 ];

source/tanya/math/nbtheory.d

@@ -17,19 +17,28 @@ module tanya.math.nbtheory;
 import tanya.math.mp;
 import tanya.meta.trait;
 
+version (TanyaNative)
+{
+}
+else
+{
+    import core.math : fabs;
+    import std.math : log;
+}
+
 /**
  * Calculates the absolute value of a number.
  *
  * Params:
- *  I = Value type.
+ *  T = Argument type.
- *  x = Value.
+ *  x = Argument.
  *
  * Returns: Absolute value of $(D_PARAM x).
  */
-I abs(I)(I x)
+T abs(T)(T x)
-if (isIntegral!I)
+if (isIntegral!T)
 {
-    static if (isSigned!I)
+    static if (isSigned!T)
     {
         return x >= 0 ? x : -x;
     }
@@ -40,7 +49,7 @@ if (isIntegral!I)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     int i = -1;
     assert(i.abs == 1);
@@ -54,27 +63,25 @@ pure nothrow @safe @nogc unittest
 version (D_Ddoc)
 {
     /// ditto
-    I abs(I)(I x)
+    T abs(T)(T x)
-    if (isFloatingPoint!I);
+    if (isFloatingPoint!T);
 }
-else version (TanyaPhobos)
+else version (TanyaNative)
 {
-    import core.math;
+    extern T abs(T)(T number) @nogc nothrow pure @safe
-
+    if (isFloatingPoint!T);
-    I abs(I)(I x)
+}
-    if (isFloatingPoint!I)
+else
+{
+    T abs(T)(T x)
+    if (isFloatingPoint!T)
     {
         return fabs(cast(real) x);
     }
 }
-else
-{
-    extern I abs(I)(I number) pure nothrow @safe @nogc
-    if (isFloatingPoint!I);
-}
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     float f = -1.64;
     assert(f.abs == 1.64F);
@@ -90,7 +97,7 @@ pure nothrow @safe @nogc unittest
 }
 
 /// ditto
-I abs(I : Integer)(const auto ref I x)
+T abs(T : Integer)(const auto ref T x)
 {
     auto result = Integer(x, x.allocator);
     result.sign = Sign.positive;
@@ -98,8 +105,54 @@ I abs(I : Integer)(const auto ref I x)
 }
 
 /// ditto
-I abs(I : Integer)(I x)
+T abs(T : Integer)(T x)
 {
     x.sign = Sign.positive;
     return x;
 }
+
+version (D_Ddoc)
+{
+    /**
+     * Calculates natural logarithm of $(D_PARAM x).
+     *
+     * Params:
+     *  T = Argument type.
+     *  x = Argument.
+     *
+     * Returns: Natural logarithm of $(D_PARAM x).
+     */
+    T ln(T)(T x)
+    if (isFloatingPoint!T);
+}
+else version (TanyaNative)
+{
+    extern T ln(T)(T x) @nogc nothrow pure @safe
+    if (isFloatingPoint!T);
+}
+else
+{
+    T ln(T)(T x)
+    if (isFloatingPoint!T)
+    {
+        return log(x);
+    }
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    import tanya.math;
+
+    assert(isNaN(ln(-7.389f)));
+    assert(isNaN(ln(-7.389)));
+    assert(isNaN(ln(-7.389L)));
+
+    assert(isInfinity(ln(0.0f)));
+    assert(isInfinity(ln(0.0)));
+    assert(isInfinity(ln(0.0L)));
+
+    assert(ln(1.0f) == 0.0f);
+    assert(ln(1.0) == 0.0);
+    assert(ln(1.0L) == 0.0L);
+}

source/tanya/math/package.d

@@ -21,9 +21,11 @@
  */
 module tanya.math;
 
+import tanya.algorithm.mutation;
 import tanya.math.mp;
 import tanya.math.nbtheory;
 import tanya.meta.trait;
+import tanya.meta.transform;
 
 /// Floating-point number precisions according to IEEE-754.
 enum IEEEPrecision : ubyte
@@ -79,7 +81,7 @@ if (isFloatingPoint!F)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(ieeePrecision!float == IEEEPrecision.single);
     static assert(ieeePrecision!double == IEEEPrecision.double_);
@@ -231,7 +233,7 @@ if (isFloatingPoint!F)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     assert(classify(0.0) == FloatingPointClass.zero);
     assert(classify(double.nan) == FloatingPointClass.nan);
@@ -253,7 +255,7 @@ pure nothrow @safe @nogc unittest
     assert(classify(-real.infinity) == FloatingPointClass.infinite);
 }
 
-private pure nothrow @nogc @safe unittest
+@nogc nothrow pure @safe unittest
 {
     static if (ieeePrecision!float == IEEEPrecision.doubleExtended)
     {
@@ -300,7 +302,7 @@ if (isFloatingPoint!F)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     assert(!isFinite(float.infinity));
     assert(!isFinite(-double.infinity));
@@ -345,7 +347,7 @@ if (isFloatingPoint!F)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     assert(isNaN(float.init));
     assert(isNaN(double.init));
@@ -382,7 +384,7 @@ if (isFloatingPoint!F)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     assert(isInfinity(float.infinity));
     assert(isInfinity(-float.infinity));
@@ -436,7 +438,7 @@ if (isFloatingPoint!F)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     assert(!isSubnormal(0.0f));
     assert(!isSubnormal(float.nan));
@@ -496,7 +498,7 @@ if (isFloatingPoint!F)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     assert(!isNormal(0.0f));
     assert(!isNormal(float.nan));
@@ -547,7 +549,7 @@ if (isFloatingPoint!F)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     assert(signBit(-1.0f));
     assert(!signBit(1.0f));
@@ -584,7 +586,7 @@ in
 {
     assert(z > 0, "Division by zero.");
 }
-body
+do
 {
     G mask = G.max / 2 + 1;
     H result;
@@ -625,7 +627,7 @@ in
 {
     assert(z.length > 0, "Division by zero.");
 }
-body
+do
 {
     size_t i;
     auto tmp1 = Integer(x, x.allocator);
@@ -659,7 +661,7 @@ body
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     assert(pow(3, 5, 7) == 5);
     assert(pow(2, 2, 1) == 0);
@@ -673,7 +675,7 @@ pure nothrow @safe @nogc unittest
 }
 
 ///
-nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     assert(pow(Integer(3), Integer(5), Integer(7)) == 5);
     assert(pow(Integer(2), Integer(2), Integer(1)) == 0);
@@ -695,13 +697,13 @@ nothrow @safe @nogc unittest
  * Returns: $(D_KEYWORD true) if $(D_PARAM x) is a prime number,
  *          $(D_KEYWORD false) otherwise.
  */
-bool isPseudoprime(ulong x) nothrow pure @safe @nogc
+bool isPseudoprime(ulong x) @nogc nothrow pure @safe
 {
     return pow(2, x - 1, x) == 1;
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     assert(74623.isPseudoprime);
     assert(104729.isPseudoprime);
@@ -709,7 +711,7 @@ pure nothrow @safe @nogc unittest
     assert(!15485868.isPseudoprime);
 }
 
-private pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     assert(74653.isPseudoprime);
     assert(74687.isPseudoprime);
@@ -738,3 +740,158 @@ private pure nothrow @safe @nogc unittest
     assert(899809363.isPseudoprime);
     assert(982451653.isPseudoprime);
 }
+
+/**
+ * Determines minimum of two numbers.
+ *
+ * Params:
+ *  x = First number.
+ *  y = Second number.
+ *
+ * Returns: $(D_PARAM x) if $(D_PARAM x) is smaller than $(D_PSYMBOL y),
+ *          $(D_PARAM y) otherwise.
+ *
+ * See_Also: $(D_PSYMBOL max).
+ */
+T min(T)(T x, T y)
+if (isIntegral!T)
+{
+    return x < y ? x : y;
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    assert(min(5, 3) == 3);
+    assert(min(4, 4) == 4);
+}
+
+/// ditto
+T min(T)(T x, T y)
+if (isFloatingPoint!T)
+{
+    if (isNaN(x))
+    {
+        return y;
+    }
+    if (isNaN(y))
+    {
+        return x;
+    }
+    return x < y ? x : y;
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    assert(min(5.2, 3.0) == 3.0);
+
+    assert(min(5.2, double.nan) == 5.2);
+    assert(min(double.nan, 3.0) == 3.0);
+    assert(isNaN(min(double.nan, double.nan)));
+}
+
+/// ditto
+ref T min(T)(ref T x, ref T y)
+if (is(Unqual!T == Integer))
+{
+    return x < y ? x : y;
+}
+
+/// ditto
+T min(T)(T x, T y)
+if (is(T == Integer))
+{
+    return x < y ? move(x) : move(y);
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    assert(min(Integer(5), Integer(3)) == 3);
+}
+
+/**
+ * Determines maximum of two numbers.
+ *
+ * Params:
+ *  x = First number.
+ *  y = Second number.
+ *
+ * Returns: $(D_PARAM x) if $(D_PARAM x) is larger than $(D_PSYMBOL y),
+ *          $(D_PARAM y) otherwise.
+ *
+ * See_Also: $(D_PSYMBOL min).
+ */
+T max(T)(T x, T y)
+if (isIntegral!T)
+{
+    return x > y ? x : y;
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    assert(max(5, 3) == 5);
+    assert(max(4, 4) == 4);
+}
+
+/// ditto
+T max(T)(T x, T y)
+if (isFloatingPoint!T)
+{
+    if (isNaN(x))
+    {
+        return y;
+    }
+    if (isNaN(y))
+    {
+        return x;
+    }
+    return x > y ? x : y;
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    assert(max(5.2, 3.0) == 5.2);
+
+    assert(max(5.2, double.nan) == 5.2);
+    assert(max(double.nan, 3.0) == 3.0);
+    assert(isNaN(max(double.nan, double.nan)));
+}
+
+/// ditto
+ref T max(T)(ref T x, ref T y)
+if (is(Unqual!T == Integer))
+{
+    return x > y ? x : y;
+}
+
+/// ditto
+T max(T)(T x, T y)
+if (is(T == Integer))
+{
+    return x > y ? move(x) : move(y);
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    assert(max(Integer(5), Integer(3)) == 5);
+}
+
+// min/max accept const and mutable references.
+@nogc nothrow pure @safe unittest
+{
+    {
+        Integer i1 = 5, i2 = 3;
+        assert(min(i1, i2) == 3);
+        assert(max(i1, i2) == 5);
+    }
+    {
+        const Integer i1 = 5, i2 = 3;
+        assert(min(i1, i2) == 3);
+        assert(max(i1, i2) == 5);
+    }
+}

source/tanya/math/random.d

@@ -94,9 +94,31 @@ abstract class EntropySource
     Nullable!ubyte poll(out ubyte[maxGather] output) @nogc;
 }
 
+version (CRuntime_Bionic)
+{
+    version = SecureARC4Random;
+}
+else version (OSX)
+{
+    version = SecureARC4Random;
+}
+else version (OpenBSD)
+{
+    version = SecureARC4Random;
+}
+else version (NetBSD)
+{
+    version = SecureARC4Random;
+}
+else version (Solaris)
+{
+    version = SecureARC4Random;
+}
+
 version (linux)
 {
-    extern (C) long syscall(long number, ...) nothrow @system @nogc;
+    import core.stdc.config : c_long;
+    extern (C) c_long syscall(c_long number, ...) nothrow @system @nogc;
 
     /**
      * Uses getrandom system call.
@@ -134,10 +156,11 @@ version (linux)
         {
             assert(length <= maxGather);
         }
-        body
+        do
         {
             // int getrandom(void *buf, size_t buflen, unsigned int flags);
-            auto length = syscall(318, output.ptr, output.length, 0);
+            import mir.linux._asm.unistd : NR_getrandom;
+            auto length = syscall(NR_getrandom, output.ptr, output.length, 0);
             Nullable!ubyte ret;
 
             if (length >= 0)
@@ -148,9 +171,7 @@ version (linux)
         }
     }
 
-    version (X86_64)
+    @nogc @system unittest
-    {
-        private unittest
     {
         auto entropy = defaultAllocator.make!Entropy();
         ubyte[blockSize] output;
@@ -158,6 +179,172 @@ version (linux)
 
         defaultAllocator.dispose(entropy);
     }
+}
+else version (SecureARC4Random)
+{
+    private extern (C) void arc4random_buf(scope void* buf, size_t nbytes) nothrow @nogc @system;
+
+    /**
+     * Uses arc4random_buf.
+     */
+    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 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 @nogc @safe
+        {
+            (() @trusted => arc4random_buf(output.ptr, output.length))();
+            return Nullable!ubyte(cast(ubyte) (output.length));
+        }
+    }
+
+    @nogc @system unittest
+    {
+        auto entropy = defaultAllocator.make!Entropy();
+        ubyte[blockSize] output;
+        output = entropy.random;
+
+        defaultAllocator.dispose(entropy);
+    }
+}
+else version (Windows)
+{
+    import core.sys.windows.basetsd : ULONG_PTR;
+    import core.sys.windows.windef : BOOL, DWORD, PBYTE;
+    import core.sys.windows.winnt : LPCSTR, LPCWSTR;
+    import core.sys.windows.wincrypt;
+    private extern(Windows) @nogc nothrow
+    {
+        BOOL CryptGenRandom(HCRYPTPROV, DWORD, PBYTE);
+        BOOL CryptAcquireContextA(HCRYPTPROV*, LPCSTR, LPCSTR, DWORD, DWORD);
+        BOOL CryptAcquireContextW(HCRYPTPROV*, LPCWSTR, LPCWSTR, DWORD, DWORD);
+        BOOL CryptReleaseContext(HCRYPTPROV, ULONG_PTR);
+    }
+
+    private bool initCryptGenRandom(scope ref HCRYPTPROV hProvider) @nogc nothrow @trusted
+    {
+        import core.sys.windows.winbase : GetLastError;
+        import core.sys.windows.winerror : NTE_BAD_KEYSET;
+
+        // https://msdn.microsoft.com/en-us/library/windows/desktop/aa379886(v=vs.85).aspx
+        // For performance reasons, we recommend that you set the pszContainer
+        // parameter to NULL and the dwFlags parameter to CRYPT_VERIFYCONTEXT
+        // in all situations where you do not require a persisted key.
+        // CRYPT_SILENT is intended for use with applications for which the UI cannot be displayed by the CSP.
+        if (!CryptAcquireContextW(&hProvider, null, null, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT | CRYPT_SILENT))
+        {
+            if (GetLastError() == NTE_BAD_KEYSET)
+            {
+                // Attempt to create default container
+                if (!CryptAcquireContextA(&hProvider, null, null, PROV_RSA_FULL, CRYPT_NEWKEYSET | CRYPT_SILENT))
+                    return false;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    class PlatformEntropySource : EntropySource
+    {
+        private HCRYPTPROV hProvider;
+
+        /**
+         * Uses CryptGenRandom.
+         */
+        this() @nogc
+        {
+            if (!initCryptGenRandom(hProvider))
+            {
+                throw defaultAllocator.make!EntropyException("CryptAcquireContextW failed.");
+            }
+            assert(hProvider > 0, "hProvider not properly initialized.");
+        }
+
+        ~this() @nogc nothrow @safe
+        {
+            if (hProvider > 0)
+            {
+                (() @trusted => CryptReleaseContext(hProvider, 0))();
+            }
+        }
+
+        /**
+         * 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 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) @nogc nothrow @safe
+        in
+        {
+            assert(hProvider > 0, "hProvider not properly initialized.");
+        }
+        do
+        {
+            Nullable!ubyte ret;
+            if ((() @trusted => CryptGenRandom(hProvider, output.length, cast(PBYTE) output.ptr))())
+            {
+                ret = cast(ubyte) (output.length);
+            }
+            return ret;
+        }
+    }
+
+    @nogc @system unittest
+    {
+        auto entropy = defaultAllocator.make!Entropy();
+        ubyte[blockSize] output;
+        output = entropy.random;
+
+        defaultAllocator.dispose(entropy);
     }
 }
 
@@ -180,8 +367,6 @@ class Entropy
 
     private ubyte sourceCount_;
 
-    private shared Allocator allocator;
-
     /// Entropy accumulator.
     protected SHA!(maxGather * 8, 512) accumulator;
 
@@ -198,11 +383,11 @@ class Entropy
         assert(maxSources > 0 && maxSources <= ubyte.max);
         assert(allocator !is null);
     }
-    body
+    do
     {
         allocator.resize(sources, maxSources);
 
-        version (linux)
+        static if (is(PlatformEntropySource))
         {
             this ~= allocator.make!PlatformEntropySource;
         }
@@ -234,7 +419,7 @@ class Entropy
     {
         assert(sourceCount_ <= sources.length);
     }
-    body
+    do
     {
         sources[sourceCount_++] = source;
         return this;
@@ -251,7 +436,7 @@ class Entropy
     {
         assert(sourceCount_ > 0, "No entropy sources defined.");
     }
-    body
+    do
     {
         bool haveStrong;
         ushort done;
@@ -289,7 +474,7 @@ class Entropy
 
         if (!haveStrong)
         {
-            throw allocator.make!EntropyException("No strong entropy source defined.");
+            throw defaultAllocator.make!EntropyException("No strong entropy source defined.");
         }
 
         output = accumulator.finish();
@@ -300,7 +485,7 @@ class Entropy
         // Perform second SHA-512 on entropy
         output = sha512Of(output);
 
-        for (ubyte i = 0; i < sourceCount; ++i)
+        for (ubyte i; i < sourceCount; ++i)
         {
             sources[i].size = 0;
         }

source/tanya/memory/mallocator.d

@@ -14,7 +14,10 @@
  */
 module tanya.memory.mallocator;
 
-version (TanyaPhobos):
+version (TanyaNative)
+{
+}
+else:
 
 import core.stdc.stdlib;
 import tanya.memory.allocator;

source/tanya/memory/mmappool.d

@@ -2,7 +2,7 @@
  * 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/. */
 
-/**
+/*
  * Native allocator for Posix and Windows.
  *
  * Copyright: Eugene Wissner 2016-2017.
@@ -20,8 +20,11 @@ import tanya.memory.op;
 
 version (Posix)
 {
-    import core.sys.posix.sys.mman : PROT_READ, PROT_WRITE, MAP_PRIVATE,
+    import core.sys.posix.sys.mman : MAP_ANON,
-                                     MAP_ANON, MAP_FAILED;
+                                     MAP_FAILED,
+                                     MAP_PRIVATE,
+                                     PROT_READ,
+                                     PROT_WRITE;
     import core.sys.posix.unistd;
 
     extern(C)
@@ -79,7 +82,7 @@ else version (Windows)
     }
 }
 
-/**
+/*
  * This allocator allocates memory in regions (multiple of 64 KB for example).
  * Each region is then splitted in blocks. So it doesn't request the memory
  * from the operating system on each call, but only if there are no large
@@ -103,6 +106,7 @@ else version (Windows)
  * ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  * </pre>
  */
+deprecated("Use tanya.memory.mallocator instead")
 final class MmapPool : Allocator
 {
     version (none)
@@ -123,7 +127,7 @@ final class MmapPool : Allocator
         }
     }
 
-    /**
+    /*
      * Allocates $(D_PARAM size) bytes of memory.
      *
      * Params:
@@ -152,8 +156,7 @@ final class MmapPool : Allocator
         return data is null ? null : data[0 .. size];
     }
 
-    ///
+    version (TanyaNative) @nogc nothrow pure unittest
-    nothrow unittest
     {
         auto p = MmapPool.instance.allocate(20);
         assert(p);
@@ -164,7 +167,7 @@ final class MmapPool : Allocator
     }
 
     // Issue 245: https://issues.caraus.io/issues/245.
-    private @nogc unittest
+    version (TanyaNative) @nogc nothrow pure unittest
     {
         // allocate() check.
         size_t tooMuchMemory = size_t.max
@@ -242,7 +245,7 @@ final class MmapPool : Allocator
         block.next = block.next.next;
     }
 
-    /**
+    /*
      * Deallocates a memory block.
      *
      * Params:
@@ -296,15 +299,14 @@ final class MmapPool : Allocator
         return true;
     }
 
-    ///
+    version (TanyaNative) @nogc nothrow pure unittest
-    nothrow unittest
     {
         auto p = MmapPool.instance.allocate(20);
 
         assert(MmapPool.instance.deallocate(p));
     }
 
-    /**
+    /*
      * 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
@@ -380,8 +382,7 @@ final class MmapPool : Allocator
         return true;
     }
 
-    ///
+    version (TanyaNative) @nogc nothrow pure unittest
-    nothrow unittest
     {
         void[] p;
         assert(!MmapPool.instance.reallocateInPlace(p, 5));
@@ -405,7 +406,7 @@ final class MmapPool : Allocator
         MmapPool.instance.deallocate(p);
     }
 
-    /**
+    /*
      * Increases or decreases the size of a memory block.
      *
      * Params:
@@ -446,8 +447,7 @@ final class MmapPool : Allocator
         return true;
     }
 
-    ///
+    version (TanyaNative) @nogc nothrow pure unittest
-    nothrow unittest
     {
         void[] p;
         MmapPool.instance.reallocate(p, 10 * int.sizeof);
@@ -511,7 +511,7 @@ final class MmapPool : Allocator
         return instance_;
     }
 
-    /**
+    /*
      * Static allocator instance and initializer.
      *
      * Returns: Global $(D_PSYMBOL MmapPool) instance.
@@ -521,8 +521,7 @@ final class MmapPool : Allocator
         return (cast(GetPureInstance!MmapPool) &instantiate)();
     }
 
-    ///
+    version (TanyaNative) @nogc nothrow pure unittest
-    nothrow unittest
     {
         assert(instance is instance);
     }
@@ -619,7 +618,7 @@ final class MmapPool : Allocator
              / pageSize * pageSize + pageSize;
     }
 
-    /**
+    /*
      * Returns: Alignment offered.
      */
     @property uint alignment() shared const pure nothrow @safe @nogc
@@ -627,7 +626,7 @@ final class MmapPool : Allocator
         return alignment_;
     }
 
-    private nothrow @nogc unittest
+    version (TanyaNative) @nogc nothrow pure unittest
     {
         assert(MmapPool.instance.alignment == MmapPool.alignment_);
     }
@@ -658,9 +657,11 @@ final class MmapPool : Allocator
     private alias Block = shared BlockEntry*;
 }
 
+version (TanyaNative):
+
 // A lot of allocations/deallocations, but it is the minimum caused a
 // segmentation fault because MmapPool reallocateInPlace moves a block wrong.
-private @nogc unittest
+@nogc nothrow pure unittest
 {
     auto a = MmapPool.instance.allocate(16);
     auto d = MmapPool.instance.allocate(16);

source/tanya/memory/op.d

@@ -32,6 +32,16 @@ else
     import core.stdc.string;
 }
 
+version (TanyaNative)
+{
+    @nogc nothrow pure @system unittest
+    {
+        ubyte[2] buffer = 1;
+        fillMemory(buffer[1 .. $], 0);
+        assert(buffer[0] == 1 && buffer[1] == 0);
+    }
+}
+
 private enum alignMask = size_t.sizeof - 1;
 
 /**
@@ -51,12 +61,14 @@ private enum alignMask = size_t.sizeof - 1;
  *
  * Precondition: $(D_INLINECODE source.length <= target.length).
  */
-void copy(const void[] source, void[] target) pure nothrow @trusted @nogc
+void copy(const void[] source, void[] target) @nogc nothrow pure @trusted
 in
 {
     assert(source.length <= target.length);
+    assert(source.length == 0 || source.ptr !is null);
+    assert(target.length == 0 || target.ptr !is null);
 }
-body
+do
 {
     version (TanyaNative)
     {
@@ -69,7 +81,7 @@ body
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     ubyte[9] source = [1, 2, 3, 4, 5, 6, 7, 8, 9];
     ubyte[9] target;
@@ -77,7 +89,7 @@ pure nothrow @safe @nogc unittest
     assert(cmp(source, target) == 0);
 }
 
-private pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     {
         ubyte[0] source, target;
@@ -120,6 +132,11 @@ private template filledBytes(ubyte Byte, ubyte I = 0)
  *  memory = Memory block.
  */
 void fill(ubyte c = 0)(void[] memory) @trusted
+in
+{
+    assert(memory.length == 0 || memory.ptr !is null);
+}
+do
 {
     version (TanyaNative)
     {
@@ -132,7 +149,7 @@ void fill(ubyte c = 0)(void[] memory) @trusted
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     ubyte[9] memory = [1, 2, 3, 4, 5, 6, 7, 8, 9];
     memory.fill!0();
@@ -142,31 +159,6 @@ pure nothrow @safe @nogc unittest
     }
 }
 
-// Stress test. Checks that `fill` can handle unaligned pointers and different
-// lengths.
-pure nothrow @safe @nogc private unittest
-{
-    ubyte[192] memory;
-
-    foreach (j; 0 .. 192)
-    {
-        foreach (ubyte i, ref ubyte v; memory[j .. $])
-        {
-            v = i;
-        }
-        fill(memory[j .. $]);
-        foreach (ubyte v; memory[j .. $])
-        {
-            assert(v == 0);
-        }
-        fill!1(memory[j .. $]);
-        foreach (ubyte v; memory[j .. $])
-        {
-            assert(v == 1);
-        }
-    }
-}
-
 /**
  * Copies starting from the end of $(D_PARAM source) into the end of
  * $(D_PARAM target).
@@ -189,12 +181,14 @@ pure nothrow @safe @nogc private unittest
  *
  * Precondition: $(D_INLINECODE source.length <= target.length).
  */
-void copyBackward(const void[] source, void[] target) pure nothrow @trusted @nogc
+void copyBackward(const void[] source, void[] target) @nogc nothrow pure @trusted
 in
 {
     assert(source.length <= target.length);
+    assert(source.length == 0 || source.ptr !is null);
+    assert(target.length == 0 || target.ptr !is null);
 }
-body
+do
 {
     version (TanyaNative)
     {
@@ -207,7 +201,7 @@ body
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     ubyte[6] mem = [ 'a', 'a', 'b', 'b', 'c', 'c' ];
     ubyte[6] expected = [ 'a', 'a', 'a', 'a', 'b', 'b' ];
@@ -216,7 +210,7 @@ pure nothrow @safe @nogc unittest
     assert(cmp(expected, mem) == 0);
 }
 
-private nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     ubyte[9] r1 = [ 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i' ];
     ubyte[9] r2;
@@ -242,7 +236,13 @@ private nothrow @safe @nogc unittest
  *          negative integer if $(D_INLINECODE r2 > r1),
  *          `0` if $(D_INLINECODE r1 == r2).
  */
-int cmp(const void[] r1, const void[] r2) pure nothrow @trusted @nogc
+int cmp(const void[] r1, const void[] r2) @nogc nothrow pure @trusted
+in
+{
+    assert(r1.length == 0 || r1.ptr !is null);
+    assert(r2.length == 0 || r2.ptr !is null);
+}
+do
 {
     version (TanyaNative)
     {
@@ -259,7 +259,7 @@ int cmp(const void[] r1, const void[] r2) pure nothrow @trusted @nogc
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     ubyte[4] r1 = [ 'a', 'b', 'c', 'd' ];
     ubyte[3] r2 = [ 'c', 'a', 'b' ];
@@ -271,7 +271,7 @@ pure nothrow @safe @nogc unittest
     assert(cmp(r2, r1) < 0);
 }
 
-private pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     ubyte[16] r1 = [
         'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h',
@@ -301,7 +301,12 @@ private pure nothrow @safe @nogc unittest
  *          couldn't be found, an empty `inout void[]` is returned.
  */
 inout(void[]) find(return inout void[] haystack, const ubyte needle)
-pure nothrow @trusted @nogc
+@nogc nothrow pure @trusted
+in
+{
+    assert(haystack.length == 0 || haystack.ptr !is null);
+}
+do
 {
     auto length = haystack.length;
     const size_t needleWord = size_t.max * needle;
@@ -348,7 +353,7 @@ pure nothrow @trusted @nogc
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     const ubyte[9] haystack = ['a', 'b', 'c', 'd', 'e', 'f', 'b', 'g', 'h'];
 

source/tanya/memory/package.d

@@ -14,14 +14,12 @@
  */
 module tanya.memory;
 
-import core.exception;
-import std.algorithm.iteration;
 import std.algorithm.mutation;
-import std.conv;
+import tanya.conv;
+import tanya.exception;
 public import tanya.memory.allocator;
-import tanya.memory.mmappool;
-import tanya.range.primitive;
 import tanya.meta.trait;
+import tanya.range.primitive;
 
 /**
  * The mixin generates common methods for classes and structs using
@@ -45,7 +43,7 @@ mixin template DefaultAllocator()
     {
         assert(allocator !is null);
     }
-    body
+    do
     {
         this.allocator_ = allocator;
     }
@@ -63,7 +61,7 @@ mixin template DefaultAllocator()
     {
         assert(allocator !is null);
     }
-    body
+    do
     {
         if (allocator_ is null)
         {
@@ -78,7 +76,7 @@ mixin template DefaultAllocator()
     {
         assert(allocator !is null);
     }
-    body
+    do
     {
         if (allocator_ is null)
         {
@@ -94,13 +92,21 @@ private void _d_monitordelete(Object h, bool det) pure nothrow @nogc;
 
 shared Allocator allocator;
 
-shared static this() nothrow @nogc
-{
-    allocator = MmapPool.instance;
-}
-
 private shared(Allocator) getAllocatorInstance() nothrow @nogc
 {
+    if (allocator is null)
+    {
+        version (TanyaNative)
+        {
+            import tanya.memory.mmappool;
+            defaultAllocator = MmapPool.instance;
+        }
+        else
+        {
+            import tanya.memory.mallocator;
+            defaultAllocator = Mallocator.instance;
+        }
+    }
     return allocator;
 }
 
@@ -114,7 +120,7 @@ out (allocator)
 {
     assert(allocator !is null);
 }
-body
+do
 {
     return (cast(GetPureInstance!Allocator) &getAllocatorInstance)();
 }
@@ -132,7 +138,7 @@ in
 {
     assert(allocator !is null);
 }
-body
+do
 {
     .allocator = allocator;
 }
@@ -141,21 +147,54 @@ body
  * Returns the size in bytes of the state that needs to be allocated to hold an
  * object of type $(D_PARAM T).
  *
+ * There is a difference between the `.sizeof`-property and
+ * $(D_PSYMBOL stateSize) if $(D_PARAM T) is a class or an interface.
+ * `T.sizeof` is constant on the given architecture then and is the same as
+ * `size_t.sizeof` and `ptrdiff_t.sizeof`. This is because classes and
+ * interfaces are reference types and `.sizeof` returns the size of the
+ * reference which is the same as the size of a pointer. $(D_PSYMBOL stateSize)
+ * returns the size of the instance itself.
+ *
+ * The size of a dynamic array is `size_t.sizeof * 2` since a dynamic array
+ * stores its length and a data pointer. The size of the static arrays is
+ * calculated differently since they are value types. It is the array length
+ * multiplied by the element size.
+ *
+ * `stateSize!void` is `1` since $(D_KEYWORD void) is mostly used as a synonym
+ * for $(D_KEYWORD byte)/$(D_KEYWORD ubyte) in `void*`.
+ *
  * Params:
  *  T = Object type.
+ *
+ * Returns: Size of an instance of type $(D_PARAM T).
  */
 template stateSize(T)
 {
-    static if (is(T == class) || is(T == interface))
+    static if (isPolymorphicType!T)
     {
-        enum stateSize = __traits(classInstanceSize, T);
+        enum size_t stateSize = __traits(classInstanceSize, T);
     }
     else
     {
-        enum stateSize = T.sizeof;
+        enum size_t stateSize = T.sizeof;
     }
 }
 
+///
+@nogc nothrow pure @safe unittest
+{
+    static assert(stateSize!int == 4);
+    static assert(stateSize!bool == 1);
+    static assert(stateSize!(int[]) == (size_t.sizeof * 2)); 
+    static assert(stateSize!(short[3]) == 6); 
+
+    static struct Empty
+    {
+    }
+    static assert(stateSize!Empty == 1);
+    static assert(stateSize!void == 1);
+}
+
 /**
  * Params:
  *  size      = Raw size.
@@ -196,14 +235,14 @@ package(tanya) T[] resize(T)(shared Allocator allocator,
         }
         else
         {
-            onOutOfMemoryErrorNoGC();
+            onOutOfMemoryError();
         }
     }
 
     void[] buf = array;
     if (!allocator.reallocate(buf, length * T.sizeof))
     {
-        onOutOfMemoryErrorNoGC();
+        onOutOfMemoryError();
     }
     // Casting from void[] is unsafe, but we know we cast to the original type.
     array = cast(T[]) buf;
@@ -211,7 +250,7 @@ package(tanya) T[] resize(T)(shared Allocator allocator,
     return array;
 }
 
-private unittest
+@nogc nothrow pure @safe unittest
 {
     int[] p;
 
@@ -234,6 +273,10 @@ private unittest
  */
 package(tanya) void[] finalize(T)(ref T* p)
 {
+    if (p is null)
+    {
+        return null;
+    }
     static if (hasElaborateDestructor!T)
     {
         destroy(*p);
@@ -300,7 +343,10 @@ package(tanya) void[] finalize(T)(ref T[] p)
 {
     static if (hasElaborateDestructor!(typeof(p[0])))
     {
-        p.each!((ref e) => destroy(e));
+        foreach (ref e; p)
+        {
+            destroy(e);
+        }
     }
     return p;
 }
@@ -321,11 +367,11 @@ void dispose(T)(shared Allocator allocator, auto ref T p)
     p = null;
 }
 
-private unittest
+@nogc nothrow pure @system unittest
 {
-    struct S
+    static struct S
     {
-        ~this()
+        ~this() @nogc nothrow pure @safe
         {
         }
     }
@@ -335,7 +381,7 @@ private unittest
 }
 
 // Works with interfaces.
-private pure unittest
+@nogc nothrow pure @safe unittest
 {
     interface I
     {
@@ -370,7 +416,7 @@ in
 {
     assert(allocator !is null);
 }
-body
+do
 {
     auto mem = (() @trusted => allocator.allocate(stateSize!T))();
     if (mem is null)
@@ -409,7 +455,7 @@ in
 {
     assert(allocator !is null);
 }
-body
+do
 {
     auto mem = (() @trusted => allocator.allocate(stateSize!T))();
     if (mem is null)
@@ -420,13 +466,11 @@ body
     {
         () @trusted { allocator.deallocate(mem); }();
     }
-
+    return emplace!T(mem[0 .. stateSize!T], args);
-    auto ptr = (() @trusted => (cast(T*) mem[0 .. stateSize!T].ptr))();
-    return emplace!T(ptr, args);
 }
 
 ///
-unittest
+@nogc nothrow pure @safe unittest
 {
     int* i = defaultAllocator.make!int(5);
     assert(*i == 5);
@@ -453,7 +497,7 @@ in
     assert(allocator !is null);
     assert(n <= size_t.max / ElementType!T.sizeof);
 }
-body
+do
 {
     auto ret = allocator.resize!(ElementType!T)(null, n);
     ret.uninitializedFill(ElementType!T.init);
@@ -461,7 +505,7 @@ body
 }
 
 ///
-unittest
+@nogc nothrow pure @safe unittest
 {
     int[] i = defaultAllocator.make!(int[])(2);
     assert(i.length == 2);

source/tanya/memory/smartref.d

@@ -6,7 +6,13 @@
  * Smart pointers.
  *
  * A smart pointer is an object that wraps a raw pointer or a reference
- * (class, array) to manage its lifetime.
+ * (class, dynamic array) to manage its lifetime.
+ *
+ * This module provides two kinds of lifetime management strategies:
+ * $(UL
+ *  $(LI Reference counting)
+ *  $(LI Unique ownership)
+ * )
  *
  * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
@@ -17,17 +23,17 @@
  */
 module tanya.memory.smartref;
 
-import core.exception;
 import std.algorithm.comparison;
-import std.algorithm.mutation;
+import tanya.algorithm.mutation;
-import std.conv;
+import tanya.conv;
+import tanya.exception;
 import tanya.memory;
 import tanya.meta.trait;
 import tanya.range.primitive;
 
 private template Payload(T)
 {
-    static if (is(T == class) || is(T == interface) || isArray!T)
+    static if (isPolymorphicType!T || isArray!T)
     {
         alias Payload = T;
     }
@@ -48,7 +54,7 @@ private final class RefCountedStore(T)
     {
         assert(this.counter > 0);
     }
-    body
+    do
     {
         mixin("return " ~ op ~ "counter;");
     }
@@ -133,7 +139,7 @@ struct RefCounted(T)
     {
         assert(allocator !is null);
     }
-    body
+    do
     {
         this.allocator_ = allocator;
     }
@@ -202,13 +208,6 @@ struct RefCounted(T)
         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))
     {
@@ -229,14 +228,6 @@ struct RefCounted(T)
         return this;
     }
 
-    private @nogc unittest
-    {
-        RefCounted!int rc;
-        assert(!rc.isInitialized);
-        rc = null;
-        assert(!rc.isInitialized);
-    }
-
     /// ditto
     ref typeof(this) opAssign(typeof(this) rhs)
     {
@@ -256,7 +247,7 @@ struct RefCounted(T)
     {
         assert(count > 0, "Attempted to access an uninitialized reference");
     }
-    body
+    do
     {
         return this.storage.payload;
     }
@@ -308,7 +299,7 @@ struct RefCounted(T)
 }
 
 ///
-unittest
+@nogc @system unittest
 {
     auto rc = RefCounted!int(defaultAllocator.make!int(5), defaultAllocator);
     auto val = rc.get();
@@ -324,7 +315,22 @@ unittest
     assert(*rc.storage.payload == 9);
 }
 
-private @nogc unittest
+@nogc @system unittest
+{
+    auto rc = defaultAllocator.refCounted!int(5);
+    rc = defaultAllocator.make!int(7);
+    assert(*rc == 7);
+}
+
+@nogc @system unittest
+{
+    RefCounted!int rc;
+    assert(!rc.isInitialized);
+    rc = null;
+    assert(!rc.isInitialized);
+}
+
+@nogc @system unittest
 {
     auto rc = defaultAllocator.refCounted!int(5);
 
@@ -340,7 +346,7 @@ private @nogc unittest
     assert(*rc == 5);
 }
 
-private @nogc unittest
+@nogc @system unittest
 {
     RefCounted!int rc;
 
@@ -355,7 +361,7 @@ private @nogc unittest
     assert(rc.count == 0);
 }
 
-private unittest
+@nogc @system unittest
 {
     RefCounted!int rc1, rc2;
     static assert(is(typeof(rc1 = rc2)));
@@ -389,7 +395,7 @@ version (unittest)
     }
 }
 
-private @nogc unittest
+@nogc @system unittest
 {
     uint destroyed;
     auto a = defaultAllocator.make!A(destroyed);
@@ -399,7 +405,7 @@ private @nogc unittest
         auto rc = RefCounted!A(a, defaultAllocator);
         assert(rc.count == 1);
 
-        void func(RefCounted!A rc) @nogc
+        void func(RefCounted!A rc) @nogc @system
         {
             assert(rc.count == 2);
         }
@@ -415,14 +421,14 @@ private @nogc unittest
     assert(rc.count == 1);
 }
 
-private @nogc unittest
+@nogc @system unittest
 {
     auto rc = RefCounted!int(defaultAllocator);
     assert(!rc.isInitialized);
     assert(rc.allocator is defaultAllocator);
 }
 
-private @nogc unittest
+@nogc @system unittest
 {
     auto rc = defaultAllocator.refCounted!int(5);
     assert(rc.count == 1);
@@ -444,7 +450,7 @@ private @nogc unittest
     assert(rc.count == 0);
 }
 
-private unittest
+@nogc @system unittest
 {
     auto rc = defaultAllocator.refCounted!int(5);
     assert(*rc == 5);
@@ -460,7 +466,7 @@ private unittest
     assert(*rc == 5);
 }
 
-private unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(typeof(RefCounted!int.storage.payload) == int*));
     static assert(is(typeof(RefCounted!A.storage.payload) == A));
@@ -495,7 +501,7 @@ in
 {
     assert(allocator !is null);
 }
-body
+do
 {
     auto rc = typeof(return)(allocator);
 
@@ -511,17 +517,9 @@ body
     {
         () @trusted { allocator.deallocate(mem); }();
     }
-    rc.storage = emplace!((RefCounted!T.Storage))(mem[0 .. storageSize]);
+    rc.storage = emplace!(RefCounted!T.Storage)(mem[0 .. storageSize]);
-
-    static if (is(T == class))
-    {
     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;
 }
@@ -548,13 +546,13 @@ in
     assert(allocator !is null);
     assert(size <= size_t.max / ElementType!T.sizeof);
 }
-body
+do
 {
     return RefCounted!T(allocator.make!T(size), allocator);
 }
 
 ///
-unittest
+@nogc @system unittest
 {
     auto rc = defaultAllocator.refCounted!int(5);
     assert(rc.count == 1);
@@ -575,7 +573,7 @@ unittest
     assert(rc.count == 1);
 }
 
-private @nogc unittest
+@nogc @system unittest
 {
     struct E
     {
@@ -597,13 +595,13 @@ private @nogc unittest
     }
 }
 
-private @nogc unittest
+@nogc @system unittest
 {
     auto rc = defaultAllocator.refCounted!(int[])(5);
     assert(rc.length == 5);
 }
 
-private @nogc unittest
+@nogc @system unittest
 {
     auto p1 = defaultAllocator.make!int(5);
     auto p2 = p1;
@@ -611,13 +609,13 @@ private @nogc unittest
     assert(rc.get() is p2);
 }
 
-private @nogc unittest
+@nogc @system unittest
 {
-    static bool destroyed = false;
+    static bool destroyed;
 
-    struct F
+    static struct F
     {
-        ~this() @nogc
+        ~this() @nogc nothrow @safe
         {
             destroyed = true;
         }
@@ -666,7 +664,7 @@ struct Unique(T)
     {
         assert(allocator !is null);
     }
-    body
+    do
     {
         this.allocator_ = allocator;
     }
@@ -723,7 +721,7 @@ struct Unique(T)
     }
 
     ///
-    @nogc unittest
+    @nogc nothrow pure @system unittest
     {
         auto rc = defaultAllocator.unique!int(5);
         rc = defaultAllocator.make!int(7);
@@ -770,7 +768,7 @@ struct Unique(T)
     }
 
     ///
-    @nogc unittest
+    @nogc nothrow pure @system unittest
     {
         Unique!int u;
         assert(!u.isInitialized);
@@ -789,7 +787,7 @@ struct Unique(T)
     }
 
     ///
-    @nogc unittest
+    @nogc nothrow pure @system unittest
     {
         auto u = defaultAllocator.unique!int(5);
         assert(u.isInitialized);
@@ -804,7 +802,7 @@ struct Unique(T)
 }
 
 ///
-@nogc unittest
+@nogc nothrow pure @system unittest
 {
     auto p = defaultAllocator.make!int(5);
     auto s = Unique!int(p, defaultAllocator);
@@ -812,13 +810,13 @@ struct Unique(T)
 }
 
 ///
-@nogc unittest
+@nogc nothrow @system unittest
 {
-    static bool destroyed = false;
+    static bool destroyed;
 
-    struct F
+    static struct F
     {
-        ~this() @nogc
+        ~this() @nogc nothrow @safe
         {
             destroyed = true;
         }
@@ -851,7 +849,7 @@ in
 {
     assert(allocator !is null);
 }
-body
+do
 {
     auto payload = allocator.make!(T, A)(args);
     return Unique!T(payload, allocator);
@@ -879,19 +877,19 @@ in
     assert(allocator !is null);
     assert(size <= size_t.max / ElementType!T.sizeof);
 }
-body
+do
 {
     auto payload = allocator.resize!(ElementType!T)(null, size);
     return Unique!T(payload, allocator);
 }
 
-private unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(typeof(defaultAllocator.unique!B(5))));
     static assert(is(typeof(defaultAllocator.unique!(int[])(5))));
 }
 
-private unittest
+@nogc nothrow pure @system unittest
 {
     auto s = defaultAllocator.unique!int(5);
     assert(*s == 5);
@@ -900,7 +898,7 @@ private unittest
     assert(s is null);
 }
 
-private unittest
+@nogc nothrow pure @system unittest
 {
     auto s = defaultAllocator.unique!int(5);
     assert(*s == 5);
@@ -909,7 +907,7 @@ private unittest
     assert(*s == 4);
 }
 
-private @nogc unittest
+@nogc nothrow pure @system unittest
 {
     auto p1 = defaultAllocator.make!int(5);
     auto p2 = p1;
@@ -918,7 +916,7 @@ private @nogc unittest
     assert(rc.get() is p2);
 }
 
-private @nogc unittest
+@nogc nothrow pure @system unittest
 {
     auto rc = Unique!int(defaultAllocator);
     assert(rc.allocator is defaultAllocator);

source/tanya/meta/metafunction.d

@@ -9,7 +9,7 @@
  * It contains different algorithms for iterating, searching and modifying
  * template arguments.
  *
- * Copyright: Eugene Wissner 2017.
+ * Copyright: Eugene Wissner 2017-2018.
  * 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)
@@ -19,6 +19,7 @@
 module tanya.meta.metafunction;
 
 import tanya.meta.trait;
+import tanya.meta.transform;
 
 /**
  * Finds the minimum value in $(D_PARAM Args) according to $(D_PARAM pred).
@@ -60,7 +61,7 @@ if (Args.length > 0 && isTemplate!pred)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     enum bool cmp(alias T, alias U) = T < U;
     static assert(Min!(cmp, 8, 4, 5, 3, 13) == 3);
@@ -107,7 +108,7 @@ if (Args.length > 0 && isTemplate!pred)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     enum bool cmp(alias T, alias U) = T < U;
     static assert(Max!(cmp, 8, 4, 5, 3, 13) == 13);
@@ -179,7 +180,7 @@ if (Tuples.length > 0
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     alias Result1 = ZipWith!(AliasSeq,
                              Tuple!(1, 2),
@@ -231,19 +232,21 @@ pure nothrow @safe @nogc unittest
  *
  * See_Also: $(D_PSYMBOL AliasSeq).
  */
-template Tuple(Args...)
+struct Tuple(Args...)
 {
     /// Elements in this tuple as $(D_PSYMBOL AliasSeq).
     alias Seq = Args;
 
     /// The length of the tuple.
     enum size_t length = Args.length;
+
+    alias Seq this;
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
-    alias A = Tuple!(short);
+    alias A = Tuple!short;
     alias B = Tuple!(3, 8, 9);
     alias C = Tuple!(A, B);
 
@@ -262,24 +265,26 @@ pure nothrow @safe @nogc unittest
 /**
  * Unordered sequence of unique aliases.
  *
- * $(D_PARAM Args) can contain duplicates, but they will be filteredout, so
+ * $(D_PARAM Args) can contain duplicates, but they will be filtered out, so
  * $(D_PSYMBOL Set) contains only unique items. $(D_PSYMBOL isEqual) is used
  * for determining if two items are equal.
  *
  * Params:
  *  Args = Elements of this $(D_PSYMBOL Tuple).
  */
-template Set(Args...)
+struct Set(Args...)
 {
     /// Elements in this set as $(D_PSYMBOL AliasSeq).
     alias Seq = NoDuplicates!Args;
 
     /// The length of the set.
     enum size_t length = Seq.length;
+
+    alias Seq this;
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     alias S1 = Set!(int, 5, 5, int, 4);
     static assert(S1.length == 3);
@@ -314,7 +319,7 @@ if (allSatisfy!(ApplyLeft!(isInstanceOf, Set), Sets))
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     alias S1 = Set!(2, 5, 8, 4);
     alias S2 = Set!(3, 8, 4, 1);
@@ -367,7 +372,7 @@ if (allSatisfy!(ApplyLeft!(isInstanceOf, Set), Sets))
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     alias S1 = Set!(2, 5, 8, 4);
     alias S2 = Set!(3, 8, 4, 1);
@@ -414,7 +419,7 @@ if (isInstanceOf!(Set, S1) && isInstanceOf!(Set, S2))
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     alias S1 = Set!(2, 5, 8, 4);
     alias S2 = Set!(3, 8, 4, 1);
@@ -457,7 +462,7 @@ if (Args.length == 2 && isTemplate!cmp)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     enum bool boolCmp(T, U) = T.sizeof < U.sizeof;
     static assert(isLessEqual!(boolCmp, byte, int));
@@ -504,7 +509,7 @@ if (Args.length == 2 && isTemplate!cmp)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     enum bool boolCmp(T, U) = T.sizeof < U.sizeof;
     static assert(!isGreaterEqual!(boolCmp, byte, int));
@@ -551,7 +556,7 @@ if (Args.length == 2 && isTemplate!cmp)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     enum bool boolCmp(T, U) = T.sizeof < U.sizeof;
     static assert(isLess!(boolCmp, byte, int));
@@ -598,7 +603,7 @@ if (Args.length == 2 && isTemplate!cmp)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     enum bool boolCmp(T, U) = T.sizeof < U.sizeof;
     static assert(!isGreater!(boolCmp, byte, int));
@@ -643,7 +648,7 @@ if (Args.length == 2)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(isEqual!(int, int));
     static assert(isEqual!(8, 8));
@@ -673,7 +678,7 @@ if (Args.length == 2)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(!isNotEqual!(int, int));
     static assert(isNotEqual!(5, int));
@@ -681,7 +686,7 @@ pure nothrow @safe @nogc unittest
 }
 
 /**
- * Instantiates the template $(D_PARAM T) with $(D_PARAM ARGS).
+ * Instantiates the template $(D_PARAM T) with $(D_PARAM Args).
  *
  * Params:
  *  T    = Template.
@@ -692,7 +697,7 @@ pure nothrow @safe @nogc unittest
 alias Instantiate(alias T, Args...) = T!Args;
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     template Template(T)
     {
@@ -707,38 +712,6 @@ pure nothrow @safe @nogc unittest
     static assert(is(Instance2 == float));
 }
 
-version (TanyaPhobos)
-{
-    public import std.meta : Alias,
-                             AliasSeq,
-                             aliasSeqOf,
-                             Erase,
-                             EraseAll,
-                             Filter,
-                             NoDuplicates,
-                             DerivedToFront,
-                             MostDerived,
-                             Repeat,
-                             Replace,
-                             ReplaceAll,
-                             Reverse,
-                             Map = staticMap,
-                             Sort = staticSort,
-                             allSatisfy,
-                             anySatisfy,
-                             staticIndexOf,
-                             templateAnd,
-                             templateNot,
-                             templateOr,
-                             isSorted = staticIsSorted,
-                             ApplyLeft,
-                             ApplyRight;
-}
-else:
-
-import tanya.meta.trait;
-import tanya.meta.transform;
-
 /**
  * Creates an alias for $(D_PARAM T).
  *
@@ -769,7 +742,7 @@ alias Alias(alias T) = T;
 alias Alias(T) = T;
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(Alias!int));
 
@@ -800,7 +773,7 @@ pure nothrow @safe @nogc unittest
 alias AliasSeq(Args...) = Args;
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(typeof({ alias T = AliasSeq!(short, 5); })));
     static assert(is(typeof({ alias T = AliasSeq!(int, short, 5); })));
@@ -848,7 +821,7 @@ if (isTemplate!F)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(allSatisfy!(isSigned, int, short, byte, long));
     static assert(!allSatisfy!(isUnsigned, uint, ushort, float, ulong));
@@ -886,7 +859,7 @@ if (isTemplate!F)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(anySatisfy!(isSigned, int, short, byte, long));
     static assert(anySatisfy!(isUnsigned, uint, ushort, float, ulong));
@@ -916,8 +889,8 @@ if (Args.length > 0)
  * `-1` is returned if $(D_PARAM T) is not found.
  *
  * Params:
- *  T = The type to search for.
+ *  T = The item to search for.
- *  L = Type list.
+ *  L = Symbol sequence.
  *
  * Returns: The index of the first occurrence of $(D_PARAM T) in $(D_PARAM L).
  */
@@ -933,7 +906,7 @@ template staticIndexOf(alias T, L...)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(staticIndexOf!(int) == -1);
     static assert(staticIndexOf!(int, int) == 0);
@@ -941,6 +914,37 @@ pure nothrow @safe @nogc unittest
     static assert(staticIndexOf!(3, () {}, uint, 5, 3) == 3);
 }
 
+/**
+ * Looks for $(D_PARAM T) in $(D_PARAM L) and returns $(D_KEYWORD true) if it
+ * could be found and $(D_KEYWORD false) otherwise.
+ *
+ * Params:
+ *  T = The item to search for.
+ *  L = Symbol sequence.
+ *
+ * Returns: $(D_KEYWORD true) if $(D_PARAM T) can be found in $(D_PARAM L),
+ *          $(D_KEYWORD false) otherwise.
+ */
+template canFind(T, L...)
+{
+    enum bool canFind = indexOf!(0, AliasSeq!(T, L)) != -1;
+}
+
+/// ditto
+template canFind(alias T, L...)
+{
+    enum bool canFind = indexOf!(0, AliasSeq!(T, L)) != -1;
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static assert(!canFind!(int));
+    static assert(canFind!(int, int));
+    static assert(canFind!(int, float, double, int, real));
+    static assert(canFind!(3, () {}, uint, 5, 3));
+}
+
 /**
  * Combines multiple templates with logical AND. So $(D_PSYMBOL templateAnd)
  * evaluates to $(D_INLINECODE Preds[0] && Preds[1] && Preds[2]) and so on.
@@ -973,7 +977,7 @@ if (allSatisfy!(isTemplate, Preds))
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     alias isMutableInt = templateAnd!(isIntegral, isMutable);
     static assert(isMutableInt!int);
@@ -1021,7 +1025,7 @@ if (allSatisfy!(isTemplate, Preds))
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     alias isMutableOrInt = templateOr!(isIntegral, isMutable);
     static assert(isMutableOrInt!int);
@@ -1051,7 +1055,7 @@ if (isTemplate!pred)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     alias isNotIntegral = templateNot!isIntegral;
     static assert(!isNotIntegral!int);
@@ -1095,7 +1099,7 @@ if (isTemplate!cmp)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     enum cmp(T, U) = T.sizeof < U.sizeof;
     static assert(isSorted!(cmp));
@@ -1104,7 +1108,7 @@ pure nothrow @safe @nogc unittest
     static assert(!isSorted!(cmp, long, byte, ubyte, short, uint));
 }
 
-private pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     enum cmp(int x, int y) = x - y;
     static assert(isSorted!(cmp));
@@ -1116,7 +1120,7 @@ private pure nothrow @safe @nogc unittest
     static assert(isSorted!(cmp, 32, 32));
 }
 
-private pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     enum cmp(int x, int y) = x < y;
     static assert(isSorted!(cmp));
@@ -1142,7 +1146,7 @@ template ApplyLeft(alias T, Args...)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     alias allAreIntegral = ApplyLeft!(allSatisfy, isIntegral);
     static assert(allAreIntegral!(int, uint));
@@ -1163,7 +1167,7 @@ template ApplyRight(alias T, Args...)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     alias intIs = ApplyRight!(allSatisfy, int);
     static assert(intIs!(isIntegral));
@@ -1191,7 +1195,7 @@ if (n > 0)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(Repeat!(1, uint, int) == AliasSeq!(uint, int)));
     static assert(is(Repeat!(2, uint, int) == AliasSeq!(uint, int, uint, int)));
@@ -1249,7 +1253,7 @@ template Replace(alias T, alias U, L...)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(Replace!(int, uint, int) == AliasSeq!(uint)));
     static assert(is(Replace!(int, uint, short, int, int, ushort)
@@ -1312,7 +1316,7 @@ template ReplaceAll(alias T, alias U, L...)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(ReplaceAll!(int, uint, int) == AliasSeq!(uint)));
     static assert(is(ReplaceAll!(int, uint, short, int, int, ushort)
@@ -1340,7 +1344,7 @@ template Reverse(L...)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(Reverse!(byte, short, int) == AliasSeq!(int, short, byte)));
 }
@@ -1368,7 +1372,7 @@ if (isTemplate!F)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(Map!(Unqual, const int, immutable short)
                == AliasSeq!(int, short)));
@@ -1429,14 +1433,14 @@ if (isTemplate!cmp)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     enum cmp(T, U) = T.sizeof < U.sizeof;
     static assert(is(Sort!(cmp, long, short, byte, int)
                == AliasSeq!(byte, short, int, long)));
 }
 
-private pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     enum cmp(int T, int U) = T - U;
     static assert(Sort!(cmp, 5, 17, 9, 12, 2, 10, 14)
@@ -1460,7 +1464,7 @@ template DerivedToFront(L...)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     class A
     {
@@ -1501,7 +1505,7 @@ template MostDerived(T, L...)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     class A
     {
@@ -1554,7 +1558,7 @@ template Erase(alias T, L...)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(Erase!(int, short, int, int, uint) == AliasSeq!(short, int, uint)));
     static assert(is(Erase!(int, short, uint) == AliasSeq!(short, uint)));
@@ -1597,7 +1601,7 @@ template EraseAll(alias T, L...)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(EraseAll!(int, short, int, int, uint) == AliasSeq!(short, uint)));
     static assert(is(EraseAll!(int, short, uint) == AliasSeq!(short, uint)));
@@ -1632,9 +1636,10 @@ template Filter(alias pred, L...)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
-    static assert(is(Filter!(isIntegral, real, int, bool, uint) == AliasSeq!(int, uint)));
+    alias Given = AliasSeq!(real, int, bool, uint);
+    static assert(is(Filter!(isIntegral, Given) == AliasSeq!(int, uint)));
 }
 
 /**
@@ -1659,10 +1664,10 @@ template NoDuplicates(L...)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
-    alias Types = AliasSeq!(int, uint, int, short, short, uint);
+    alias Given = AliasSeq!(int, uint, int, short, short, uint);
-    static assert(is(NoDuplicates!Types == AliasSeq!(int, uint, short)));
+    static assert(is(NoDuplicates!Given == AliasSeq!(int, uint, short)));
 }
 
 /**
@@ -1702,7 +1707,7 @@ template aliasSeqOf(alias range)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(aliasSeqOf!([0, 1, 2, 3]) == AliasSeq!(0, 1, 2, 3));
 }
@@ -1735,7 +1740,7 @@ if (n > 0)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(Stride!(3, 1, 2, 3, 4, 5, 6, 7, 8) == AliasSeq!(1, 4, 7));
     static assert(Stride!(2, 1, 2, 3) == AliasSeq!(1, 3));
@@ -1770,7 +1775,7 @@ if (T.length == 2)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(Select!(true, int, float) == int));
     static assert(is(Select!(false, int, float) == float));

source/tanya/meta/package.d

@@ -9,7 +9,7 @@
  * to transform from one type to another. It has also different algorithms for
  * iterating, searching and modifying template arguments.
  *
- * Copyright: Eugene Wissner 2017.
+ * Copyright: Eugene Wissner 2017-2018.
  * 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)

source/tanya/meta/transform.d

@@ -9,7 +9,7 @@
  * types. They take some type as argument and return a different type after
  * perfoming the specified transformation.
  *
- * Copyright: Eugene Wissner 2017.
+ * Copyright: Eugene Wissner 2017-2018.
  * 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)
@@ -18,28 +18,6 @@
  */
 module tanya.meta.transform;
 
-version (TanyaPhobos)
-{
-    public import std.traits : Unqual,
-                               OriginalType,
-                               CopyConstness,
-                               CopyTypeQualifiers,
-                               Unsigned,
-                               Signed,
-                               PointerTarget,
-                               KeyType,
-                               ValueType,
-                               Promoted,
-                               InoutOf,
-                               ConstOf,
-                               SharedOf,
-                               SharedInoutOf,
-                               SharedConstOf,
-                               ImmutableOf,
-                               QualifierOf;
-}
-else:
-
 import tanya.meta.trait;
 
 /**
@@ -82,7 +60,7 @@ template Unqual(T)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(Unqual!bool == bool));
     static assert(is(Unqual!(immutable bool) == bool));
@@ -117,7 +95,7 @@ template OriginalType(T)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     enum E1 : const(int)
     {
@@ -188,7 +166,7 @@ template CopyConstness(From, To)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(CopyConstness!(int, char) == char));
     static assert(is(CopyConstness!(const int, char) == const char));
@@ -267,7 +245,7 @@ template CopyTypeQualifiers(From, To)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(CopyTypeQualifiers!(int, char) == char));
     static assert(is(CopyTypeQualifiers!(const int, char) == const char));
@@ -319,7 +297,7 @@ if (isIntegral!T)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(Unsigned!byte == ubyte));
     static assert(is(Unsigned!short == ushort));
@@ -372,7 +350,7 @@ if (isIntegral!T)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(Signed!ubyte == byte));
     static assert(is(Signed!ushort == short));
@@ -408,7 +386,7 @@ template PointerTarget(T)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(PointerTarget!(bool*) == bool));
     static assert(is(PointerTarget!(const bool*) == const bool));
@@ -435,7 +413,7 @@ template KeyType(T)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(KeyType!(int[string]) == string));
     static assert(!is(KeyType!(int[15])));
@@ -460,7 +438,7 @@ template ValueType(T)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(ValueType!(int[string]) == int));
     static assert(!is(ValueType!(int[15])));
@@ -482,7 +460,7 @@ if (isScalarType!T)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(Promoted!bool == int));
     static assert(is(Promoted!byte == int));
@@ -508,7 +486,7 @@ pure nothrow @safe @nogc unittest
 alias InoutOf(T) = inout(T);
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(InoutOf!int == inout int));
 }
@@ -524,7 +502,7 @@ pure nothrow @safe @nogc unittest
 alias ConstOf(T) = const(T);
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(ConstOf!int == const int));
 }
@@ -540,7 +518,7 @@ pure nothrow @safe @nogc unittest
 alias SharedOf(T) = shared(T);
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(SharedOf!int == shared int));
 }
@@ -556,7 +534,7 @@ pure nothrow @safe @nogc unittest
 alias SharedInoutOf(T) = shared(inout T);
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(SharedInoutOf!int == shared inout int));
 }
@@ -572,7 +550,7 @@ pure nothrow @safe @nogc unittest
 alias SharedConstOf(T) = shared(const T);
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(SharedConstOf!int == shared const int));
 }
@@ -588,7 +566,7 @@ pure nothrow @safe @nogc unittest
 alias ImmutableOf(T) = immutable(T);
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(ImmutableOf!int == immutable int));
 }
@@ -604,7 +582,7 @@ pure nothrow @safe @nogc unittest
 alias InoutConstOf(T) = inout(const T);
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(InoutConstOf!int == inout const int));
 }
@@ -620,7 +598,7 @@ pure nothrow @safe @nogc unittest
 alias SharedInoutConstOf(T) = shared(inout const T);
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     static assert(is(SharedInoutConstOf!int == shared inout const int));
 }
@@ -675,7 +653,7 @@ template QualifierOf(T)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     alias MutableOf = QualifierOf!int;
     static assert(is(MutableOf!uint == uint));
@@ -729,7 +707,7 @@ if (isExpressions!T || isTemplate!T)
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     struct S(T)
     {

source/tanya/net/inet.d

@@ -77,7 +77,7 @@ struct NetworkOrder(uint L)
     {
         assert(value <= pow(2, L * 8) - 1);
     }
-    body
+    do
     {
         this.value = value & StorageType.max;
     }
@@ -92,7 +92,7 @@ struct NetworkOrder(uint L)
     {
         assert(this.length > 0);
     }
-    body
+    do
     {
         return this.value & 0xff;
     }
@@ -107,7 +107,7 @@ struct NetworkOrder(uint L)
     {
         assert(this.length > 0);
     }
-    body
+    do
     {
         return (this.value >> ((this.length - 1) * 8)) & 0xff;
     }
@@ -122,7 +122,7 @@ struct NetworkOrder(uint L)
     {
         assert(this.length > 0);
     }
-    body
+    do
     {
         this.value >>= 8;
         --this.size;
@@ -138,7 +138,7 @@ struct NetworkOrder(uint L)
     {
         assert(this.length > 0);
     }
-    body
+    do
     {
         this.value &= StorageType.max >> ((StorageType.sizeof - this.length) * 8);
         --this.size;

source/tanya/net/uri.d

@@ -17,6 +17,11 @@ module tanya.net.uri;
 import tanya.encoding.ascii;
 import tanya.memory;
 
+version (unittest)
+{
+    import tanya.test.assertion;
+}
+
 /**
  * Thrown if an invalid URI was specified.
  */
@@ -324,7 +329,7 @@ struct URL
 }
 
 ///
-@nogc unittest
+@nogc pure @system unittest
 {
     auto u = URL("example.org");
     assert(u.path == "example.org"); 
@@ -377,7 +382,7 @@ struct URL
     assert(u.fragment == "fragment");
 }
 
-private @nogc unittest
+@nogc pure @system unittest
 {
     auto u = URL("127.0.0.1");
     assert(u.path == "127.0.0.1");
@@ -446,83 +451,17 @@ private @nogc unittest
     assert(u.path == "h_tp:asdf");
 }
 
-private @nogc unittest
+@nogc pure @system unittest
 {
-    URIException exception;
+    assertThrown!URIException(() => URL("http://:80"));
-    try
+    assertThrown!URIException(() => URL(":80"));
-    {
+    assertThrown!URIException(() => URL("http://u1:p1@u2:p2@example.org"));
-        auto u = URL("http://:80");
+    assertThrown!URIException(() => URL("http://blah.com:port"));
-    }
+    assertThrown!URIException(() => URL("http://blah.com:66000"));
-    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("http://blah.com:66000");
-    }
-    catch (URIException e)
-    {
-        exception = e;
-    }
-    assert(exception !is null);
-    defaultAllocator.dispose(exception);
 }
 
 // Issue 254: https://issues.caraus.io/issues/254.
-private @system @nogc unittest
+@nogc pure @system unittest
 {
     auto u = URL("ftp://");
     assert(u.scheme == "ftp");
@@ -554,13 +493,13 @@ if (T == "scheme"
 }
 
 /// ditto
-URL parseURL(const char[] source) @nogc
+URL parseURL(const char[] source) @nogc pure
 {
     return URL(source);
 }
 
 ///
-@nogc unittest
+@nogc pure @system unittest
 {
     auto u = parseURL("http://example.org:5326");
     assert(u.scheme == parseURL!"scheme"("http://example.org:5326"));

source/tanya/network/socket.d

@@ -17,7 +17,7 @@ module tanya.network.socket;
 import core.stdc.errno;
 import core.time;
 import std.algorithm.comparison;
-public import std.socket : SocketOptionLevel, SocketOption;
+public import std.socket : SocketOption, SocketOptionLevel;
 import std.traits;
 import std.typecons;
 import tanya.memory;
@@ -44,50 +44,50 @@ version (Posix)
 }
 else version (Windows)
 {
-    import core.sys.windows.winbase : GetModuleHandle,
+    import core.sys.windows.winbase : ERROR_IO_INCOMPLETE,
-                                      GetProcAddress,
                                       ERROR_IO_PENDING,
-                                      ERROR_IO_INCOMPLETE;
+                                      GetModuleHandle,
-    import core.sys.windows.winsock2 : sockaddr,
+                                      GetProcAddress;
+    import core.sys.windows.winsock2 : accept,
+                                       addrinfo,
+                                       bind,
+                                       closesocket,
+                                       FIONBIO,
                                        freeaddrinfo,
                                        getaddrinfo,
-                                       SD_RECEIVE,
+                                       getsockopt,
-                                       SD_SEND,
+                                       ioctlsocket,
-                                       SD_BOTH,
+                                       listen,
+                                       MSG_DONTROUTE,
                                        MSG_OOB,
                                        MSG_PEEK,
-                                       MSG_DONTROUTE,
+                                       recv,
-                                       socklen_t,
+                                       SD_BOTH,
+                                       SD_RECEIVE,
+                                       SD_SEND,
+                                       send,
+                                       setsockopt,
+                                       shutdown,
                                        SOCKADDR,
-                                       SOCKADDR_STORAGE,
+                                       sockaddr,
-                                       addrinfo,
                                        sockaddr_in,
                                        sockaddr_in6,
-                                       shutdown,
+                                       SOCKADDR_STORAGE,
-                                       closesocket,
-                                       listen,
                                        socket,
-                                       bind,
+                                       socklen_t,
-                                       accept,
-                                       WSAGetLastError,
-                                       recv,
-                                       send,
-                                       getsockopt,
-                                       setsockopt,
-                                       ioctlsocket,
-                                       FIONBIO,
                                        SOL_SOCKET,
-                                       SO_TYPE;
+                                       SO_TYPE,
+                                       WSAGetLastError;
     import tanya.async.iocp;
-    import tanya.sys.windows.error : EWOULDBLOCK = WSAEWOULDBLOCK,
+    import tanya.sys.windows.def;
-                                     ECONNABORTED = WSAECONNABORTED,
+    import tanya.sys.windows.error : ECONNABORTED = WSAECONNABORTED,
                                      ENOBUFS = WSAENOBUFS,
                                      EOPNOTSUPP = WSAEOPNOTSUPP,
                                      EPROTONOSUPPORT = WSAEPROTONOSUPPORT,
                                      EPROTOTYPE = WSAEPROTOTYPE,
+                                     ESOCKTNOSUPPORT = WSAESOCKTNOSUPPORT,
                                      ETIMEDOUT = WSAETIMEDOUT,
-                                     ESOCKTNOSUPPORT = WSAESOCKTNOSUPPORT;
+                                     EWOULDBLOCK = WSAEWOULDBLOCK;
-    import tanya.sys.windows.def;
     public import tanya.sys.windows.winbase;
     public import tanya.sys.windows.winsock2;
 
@@ -185,7 +185,7 @@ else version (Windows)
         {
             assert(count >= 0);
         }
-        body
+        do
         {
             DWORD lpNumber;
             BOOL result = GetOverlappedResult(overlapped.handle,
@@ -259,7 +259,7 @@ else version (Windows)
         {
             assert(count >= 0);
         }
-        body
+        do
         {
             DWORD lpNumber;
             BOOL result = GetOverlappedResult(overlapped.handle,
@@ -720,7 +720,7 @@ abstract class Socket
         assert(handle != SocketType.init);
         assert(handle_ == SocketType.init, "Socket handle cannot be changed");
     }
-    body
+    do
     {
         handle_ = handle;
 
@@ -749,7 +749,7 @@ abstract class Socket
     {
         assert(handle != SocketType.init);
     }
-    body
+    do
     {
         scope (failure)
         {

source/tanya/os/error.d

@@ -5,7 +5,7 @@
 /**
  * This module provides a portable way of using operating system error codes.
  *
- * Copyright: Eugene Wissner 2017.
+ * Copyright: Eugene Wissner 2017-2018.
  * 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)
@@ -14,6 +14,8 @@
  */
 module tanya.os.error;
 
+import tanya.meta.trait;
+
 // Socket API error.
 private template SAError(int posix, int wsa = posix)
 {
@@ -120,7 +122,7 @@ struct ErrorCode
         /// Protocol not available.
         noProtocolOption          = SAError!(92, 42),
 
-        /// The protocol is not implemented orR has not been configured.
+        /// The protocol is not implemented or has not been configured.
         protocolNotSupported      = SAError!(93, 43),
 
         /// The support for the specified socket type does not exist in this
@@ -186,19 +188,66 @@ struct ErrorCode
         cancelled                 = SAError!(125, 103),
     }
 
+    /**
+     * Error descriptions.
+     */
+    private enum ErrorStr : string
+    {
+        success                   = "The operation completed successfully",
+        noPermission              = "Operation not permitted",
+        interrupted               = "Interrupted system call",
+        badDescriptor             = "Bad file descriptor",
+        wouldBlock                = "An operation on a non-blocking socket would block",
+        noMemory                  = "Out of memory",
+        accessDenied              = "Access denied",
+        fault                     = "An invalid pointer address detected",
+        noSuchDevice              = "No such device",
+        invalidArgument           = "An invalid argument was supplied",
+        tooManyDescriptors        = "The limit on the number of open file descriptors",
+        noDescriptors             = "The limit on the number of open file descriptors",
+        brokenPipe                = "Broken pipe",
+        nameTooLong               = "The name was too long",
+        notSocket                 = "A socket operation was attempted on a non-socket",
+        protocolError             = "Protocol error",
+        messageTooLong            = "Message too long",
+        wrongProtocolType         = "Wrong protocol type for socket",
+        noProtocolOption          = "Protocol not available",
+        protocolNotSupported      = "The protocol is not implemented or has not been configured",
+        socketNotSupported        = "Socket type not supported",
+        operationNotSupported     = "The address family is no supported by the protocol family",
+        addressFamilyNotSupported = "Address family specified is not supported",
+        addressInUse              = "Address already in use",
+        networkDown               = "The network is not available",
+        networkUnreachable        = "No route to host",
+        networkReset              = "Network dropped connection because of reset",
+        connectionAborted         = "The connection has been aborted",
+        connectionReset           = "Connection reset by peer",
+        noBufferSpace             = "No free buffer space is available for a socket operation",
+        alreadyConnected          = "Transport endpoint is already connected",
+        notConnected              = "Transport endpoint is not connected",
+        shutdown                  = "Cannot send after transport endpoint shutdown",
+        timedOut                  = "Operation timed out",
+        connectionRefused         = "Connection refused",
+        hostDown                  = "Host is down",
+        hostUnreachable           = "No route to host",
+        alreadyStarted            = "Operation already in progress",
+        inProgress                = "Operation now in progress",
+        cancelled                 = "Operation cancelled",
+    }
+
     /**
      * Constructor.
      *
      * Params:
      *  value = Numeric error code.
      */
-    this(const ErrorNo value) pure nothrow @safe @nogc
+    this(const ErrorNo value) @nogc nothrow pure @safe
     {
         this.value_ = value;
     }
 
     ///
-    pure nothrow @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         ErrorCode ec;
         assert(ec == ErrorCode.success);
@@ -211,13 +260,13 @@ struct ErrorCode
      * Resets this $(D_PSYMBOL ErrorCode) to default
      * ($(D_PSYMBOL ErrorCode.success)).
      */
-    void reset() pure nothrow @safe @nogc
+    void reset() @nogc nothrow pure @safe
     {
         this.value_ = ErrorNo.success;
     }
 
     ///
-    pure nothrow @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         auto ec = ErrorCode(ErrorCode.fault);
         assert(ec == ErrorCode.fault);
@@ -241,7 +290,7 @@ struct ErrorCode
     }
 
     ///
-    pure nothrow @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
     {
         ErrorCode ec = ErrorCode.fault;
         auto errorNo = cast(ErrorCode.ErrorNo) ec;
@@ -258,23 +307,21 @@ struct ErrorCode
      *
      * Returns: $(D_KEYWORD this).
      */
-    ref ErrorCode opAssign(const ErrorNo that) pure nothrow @safe @nogc
+    ref ErrorCode opAssign(const ErrorNo that) @nogc nothrow pure @safe
     {
         this.value_ = that;
         return this;
     }
 
     /// ditto
-    ref ErrorCode opAssign()(auto ref const ErrorCode that)
+    ref ErrorCode opAssign(const ErrorCode that) @nogc nothrow pure @safe
-    pure nothrow @safe @nogc
     {
         this.value_ = that.value_;
         return this;
     }
 
     ///
-    pure nothrow @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
-    {
     {
         ErrorCode ec;
         assert(ec == ErrorCode.success);
@@ -282,6 +329,9 @@ struct ErrorCode
         ec = ErrorCode.fault;
         assert(ec == ErrorCode.fault);
     }
+
+    ///
+    @nogc nothrow pure @safe unittest
     {
         auto ec1 = ErrorCode(ErrorCode.fault);
         ErrorCode ec2;
@@ -290,7 +340,6 @@ struct ErrorCode
         ec2 = ec1;
         assert(ec1 == ec2);
     }
-    }
 
     /**
      * Equality with another error code or error code number.
@@ -300,21 +349,19 @@ struct ErrorCode
      *
      * Returns: Whether $(D_KEYWORD this) and $(D_PARAM that) are equal.
      */
-    bool opEquals(const ErrorNo that) const pure nothrow @safe @nogc
+    bool opEquals(const ErrorNo that) const @nogc nothrow pure @safe
     {
         return this.value_ == that;
     }
 
     /// ditto
-    bool opEquals()(auto ref const ErrorCode that)
+    bool opEquals(const ErrorCode that) const @nogc nothrow pure @safe
-    const pure nothrow @safe @nogc
     {
         return this.value_ == that.value_;
     }
 
     ///
-    pure nothrow @safe @nogc unittest
+    @nogc nothrow pure @safe unittest
-    {
     {
         ErrorCode ec1 = ErrorCode.fault;
         ErrorCode ec2 = ErrorCode.accessDenied;
@@ -323,6 +370,9 @@ struct ErrorCode
         assert(ec1 != ErrorCode.accessDenied);
         assert(ErrorCode.fault != ec2);
     }
+
+    ///
+    @nogc nothrow pure @safe unittest
     {
         ErrorCode ec1 = ErrorCode.fault;
         ErrorCode ec2 = ErrorCode.fault;
@@ -331,6 +381,36 @@ struct ErrorCode
         assert(ec1 == ErrorCode.fault);
         assert(ErrorCode.fault == ec2);
     }
+
+    /**
+     * Returns string describing the error number. If a description for a
+     * specific error number is not available, returns $(D_KEYWORD null).
+     *
+     * Returns: String describing the error number.
+     */
+    string toString() const @nogc nothrow pure @safe
+    {
+        foreach (e; __traits(allMembers, ErrorNo))
+        {
+            if (__traits(getMember, ErrorNo, e) == this.value_)
+            {
+                return __traits(getMember, ErrorStr, e);
+            }
+        }
+        return null;
+    }
+
+    ///
+    @nogc nothrow pure @safe unittest
+    {
+        ErrorCode ec = ErrorCode.fault;
+        assert(ec.toString() == "An invalid pointer address detected");
+    }
+
+    @nogc nothrow pure @safe unittest
+    {
+        ErrorCode ec = cast(ErrorCode.ErrorNo) -1;
+        assert(ec.toString() is null);
     }
 
     private ErrorNo value_ = ErrorNo.success;

source/tanya/range/array.d

@@ -59,13 +59,13 @@ in
 {
     assert(array.length > 0);
 }
-body
+do
 {
     return array[0];
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     string s = "Wenn die Wunde nicht mehr wehtut, schmerzt die Narbe";
     static assert(is(typeof(s.front) == immutable char));
@@ -99,13 +99,13 @@ in
 {
     assert(array.length > 0);
 }
-body
+do
 {
     return array[$ - 1];
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     string s = "Brecht";
     static assert(is(typeof(s.back) == immutable char));
@@ -138,7 +138,7 @@ in
 {
     assert(array.length > 0);
 }
-body
+do
 {
     array = array[1 .. $];
 }
@@ -149,13 +149,13 @@ in
 {
     assert(array.length > 0);
 }
-body
+do
 {
     array = array[0 .. $ - 1];
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     wstring array = "Der finstere Ozean der Metaphysik. Nietzsche";
 
@@ -184,7 +184,7 @@ pure nothrow @safe @nogc unittest
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     int[1] array;
     assert(!array.empty);
@@ -209,7 +209,7 @@ pure nothrow @safe @nogc unittest
 }
 
 ///
-pure nothrow @safe @nogc unittest
+@nogc nothrow pure @safe unittest
 {
     ubyte[8] array;
     auto slice = array.save;

source/tanya/test/assertion.d

@@ -0,0 +1,105 @@
+/* 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/. */
+
+/**
+ * Additional assertions.
+ *
+ * This module provides functions that assert whether a given expression
+ * satisfies some complex condition, that can't be tested with
+ * $(D_KEYWORD assert) in a single line. Internally all the functions
+ * just evaluate the expression and call $(D_KEYWORD assert).
+ *
+ * The functions can cause segmentation fault if the module is compiled
+ * in production mode and the condition fails.
+ *
+ * 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)
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/test/assertion.d,
+ *                 tanya/test/assertion.d)
+ */
+module tanya.test.assertion;
+
+import tanya.memory;
+import tanya.meta.trait;
+
+/**
+ * Asserts whether the function $(D_PARAM expr) throws an exception of type
+ * $(D_PARAM E). If it does, the exception is catched and properly destroyed.
+ * If it doesn't, an assertion error is thrown. If the exception doesn't match
+ * $(D_PARAM E) type, it isn't catched and escapes.
+ *
+ * Params:
+ *  E    = Expected exception type.
+ *  T    = Throwing function type.
+ *  Args = Argument types of the throwing function.
+ *  expr = Throwing function.
+ *  args = Arguments for $(D_PARAM expr).
+ */
+void assertThrown(E : Exception, T, Args...)(T expr, auto ref Args args)
+if (isSomeFunction!T)
+{
+    try
+    {
+        cast(void) expr(args);
+        assert(false, "Expected exception not thrown");
+    }
+    catch (E exception)
+    {
+        defaultAllocator.dispose(exception);
+    }
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    // If you want to test that an expression throws, you can wrap it into an
+    // arrow function.
+    static struct CtorThrows
+    {
+        this(int i) @nogc pure @safe
+        {
+            throw defaultAllocator.make!Exception();
+        }
+    }
+    assertThrown!Exception(() => CtorThrows(8));
+}
+
+/**
+ * Asserts that the function $(D_PARAM expr) doesn't throw.
+ *
+ * If it does, the thrown exception is catched, properly destroyed and an
+ * assertion error is thrown instead.
+ *
+ * Params:
+ *  T    = Tested function type.
+ *  Args = Argument types of $(D_PARAM expr).
+ *  expr = Tested function.
+ *  args = Arguments for $(D_PARAM expr).
+ */
+void assertNotThrown(T, Args...)(T expr, auto ref Args args)
+if (isSomeFunction!T)
+{
+    try
+    {
+        cast(void) expr(args);
+    }
+    catch (Exception exception)
+    {
+        defaultAllocator.dispose(exception);
+        assert(false, "Unexpected exception thrown");
+    }
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    // If you want to test that an expression doesn't throw, you can wrap it
+    // into an arrow function.
+    static struct S
+    {
+    }
+    assertNotThrown(() => S());
+}

source/tanya/test/package.d

@@ -3,15 +3,15 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * This package contains formatting and conversion functions.
+ * Test suite for $(D_KEYWORD unittest)-blocks.
  *
  * 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)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/format/package.d,
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/test/package.d,
- *                 tanya/format/package.d)
+ *                 tanya/test/package.d)
  */
-module tanya.format;
+module tanya.test;
 
-public import tanya.format.conv;
+public import tanya.test.assertion;

source/tanya/typecons.d

@@ -8,7 +8,7 @@
  * This module contains templates that allow to build new types from the
  * available ones.
  *
- * Copyright: Eugene Wissner 2017.
+ * Copyright: Eugene Wissner 2017-2018.
  * 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)
@@ -36,7 +36,7 @@ import tanya.meta.metafunction;
  */
 template Pair(Specs...)
 {
-    template parseSpecs(int fieldCount, Specs...)
+    template parseSpecs(size_t fieldCount, Specs...)
     {
         static if (Specs.length == 0)
         {
@@ -47,13 +47,13 @@ template Pair(Specs...)
             static if (is(typeof(Specs[1]) == string))
             {
                 alias parseSpecs
-                    = AliasSeq!(Specs[0],
+                    = AliasSeq!(Tuple!(Specs[0], Specs[1]),
                                 parseSpecs!(fieldCount + 1, Specs[2 .. $]));
             }
             else
             {
                 alias parseSpecs
-                    = AliasSeq!(Specs[0],
+                    = AliasSeq!(Tuple!(Specs[0]),
                                 parseSpecs!(fieldCount + 1, Specs[1 .. $]));
             }
         }
@@ -63,25 +63,24 @@ template Pair(Specs...)
         }
     }
 
+    alias ChooseType(alias T) = T.Seq[0];
+    alias ParsedSpecs = parseSpecs!(0, Specs);
+
+    static assert(ParsedSpecs.length == 2, "Invalid argument count");
+
     struct Pair
     {
         /// Field types.
-        alias Types = parseSpecs!(0, Specs);
+        alias Types = Map!(ChooseType, ParsedSpecs);
-
-        static assert(Types.length == 2, "Invalid argument count.");
 
         // Create field aliases.
-        static if (is(typeof(Specs[1]) == string))
+        static if (ParsedSpecs[0].length == 2)
         {
-            mixin("alias " ~ Specs[1] ~ " = expand[0];");
+            mixin("alias " ~ ParsedSpecs[0][1] ~ " = expand[0];");
         }
-        static if (is(typeof(Specs[2]) == string))
+        static if (ParsedSpecs[1].length == 2)
         {
-            mixin("alias " ~ Specs[2] ~ " = expand[1];");
+            mixin("alias " ~ ParsedSpecs[1][1] ~ " = 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.
@@ -92,7 +91,16 @@ template Pair(Specs...)
 }
 
 ///
-unittest
+@nogc nothrow pure @safe unittest
+{
+    auto pair = Pair!(int, "first", string, "second")(1, "second");
+    assert(pair.first == 1);
+    assert(pair[0] == 1);
+    assert(pair.second == "second");
+    assert(pair[1] == "second");
+}
+
+@nogc nothrow pure @safe unittest
 {
     static assert(is(Pair!(int, int)));
     static assert(!is(Pair!(int, 5)));